← 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 ivle/webapp/admin/subject.py

Committer: William Grant
Date: 2009-07-30 08:15:07 UTC
mfrom: (1294.3.2 object-publishing)
mto: (1294.4.2 ui-the-third)
mto: This revision was merged to the branch mainline in revision 1353.
Revision ID: grantw@unimelb.edu.au-20090730081507-llvpf6xuvmhmirop

Merge from object-publishing.

files renamed:
ivle/webapp/admin/traversal.py => ivle/webapp/admin/publishing.py

ivle/webapp/routing/ => ivle/webapp/publisher/

ivle/webapp/routing/test_router.py => ivle/webapp/publisher/test_publisher.py

ivle/webapp/tutorial/traversal.py => ivle/webapp/tutorial/publishing.py

files modified:
ivle/dispatch/__init__.py

ivle/webapp/admin/subject.py

ivle/webapp/admin/user.py

ivle/webapp/base/xhtml.py

ivle/webapp/filesystem/__init__.py

ivle/webapp/media.py

ivle/webapp/publisher/__init__.py

ivle/webapp/publisher/decorators.py

ivle/webapp/tutorial/__init__.py

Show diffs side-by-side

added added

removed removed

ivle/webapp/admin/subject.py

46

46

from ivle.webapp.admin.projectservice import ProjectSetRESTView,\

47

47

ProjectRESTView

48

48

from ivle.webapp.admin.offeringservice import OfferingRESTView

49

from ivle.webapp.admin.traversal import (root_to_subject,

49

from ivle.webapp.admin.publishing import (root_to_subject,

50

50

subject_to_offering, offering_to_projectset, offering_to_project,

51

51

subject_url, offering_url, projectset_url, project_url)

52

52

from ivle.webapp.admin.breadcrumbs import (SubjectBreadcrumb,

Older »