← Back to branch summary

~azzar1/unity/add-show-desktop-key

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to www/apps/subjects/template.html

Committer: William Grant
Date: 2009-02-02 23:21:34 UTC
mfrom: (1094)
mto: (1092.1.63 setup-stuff) (1099.1.151 new-dispatch)
mto: This revision was merged to the branch mainline in revision 1100.
Revision ID: grantw@unimelb.edu.au-20090202232134-5vt7pq8eva9zfggz

Merge from trunk.

files added:
www/apps/browser/template.html

www/apps/groups/template.html

www/apps/help/template.html

www/apps/logout/template.html

www/apps/settings/template.html

www/apps/subjects/subject_page.html

www/apps/subjects/template.html

www/apps/subjects/toplevel_menu.html

www/apps/tutorial/exercise.html

www/apps/tutorial/subjectmenu.html

www/apps/tutorial/template.html

www/apps/tutorial/toplevel.html

www/apps/tutorial/worksheet.html

www/plugins/console/template.html

files modified:
www/apps/browser/__init__.py

www/apps/groups/__init__.py

www/apps/help/__init__.py

www/apps/logout/__init__.py

www/apps/settings/__init__.py

www/apps/subjects/__init__.py

www/apps/tutorial/__init__.py

www/apps/userservice/__init__.py

www/plugins/console/__init__.py

Show diffs side-by-side

added added

removed removed

www/apps/subjects/template.html

1

<html xmlns="http://www.w3.org/1999/xhtml"

2

xmlns:xi="http://www.w3.org/2001/XInclude"

3

xmlns:py="http://genshi.edgewall.org/" py:strip="">

4

5

<py:choose test="whichpage">

6

<xi:include py:when="'toplevel'" href="toplevel_menu.html" />

7

<xi:include py:when="'subject'" href="subjectmenu.html" />

8

</py:choose>

9

</html>

Older »