Changeset 7333 for main/waeup.sirp/trunk/src/waeup/sirp/browser

Timestamp:

12 Dec 2011, 07:01:54 (13 years ago)

Author:

Henrik Bettermann

Message:

Rename certificatecontainer, coursecontainer and facultycontainer. Now we have e.g. a container for faculties. Synonyms are 'facultiescontainer', 'faculties', 'academics' or 'Academic Section'. The faculty container is the faculty itself which contains the departments.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/browser

Files:

• breadcrumbs.py (modified) (2 diffs)
• browser.txt (modified) (2 diffs)
• interfaces.py (modified) (1 diff)
• pages.py (modified) (6 diffs)
• templates/facultiescontainermanagepage.pt (moved) (moved from main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultycontainermanagepage.pt)
• viewlets.py (modified) (5 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/browser/breadcrumbs.py

@@ -109 +109 @@
         return (self.context, 'administration')
 
-class FacultyContainerBreadcrumb(Breadcrumb):
+class FacultiesContainerBreadcrumb(Breadcrumb):
     """A breadcrumb for faculty containers.
     """
-    grok.context(interfaces.IFacultyContainer)
+    grok.context(interfaces.IFacultiesContainer)
     title = u'Academics'
 
@@ -179 +179 @@
     grok.context(interfaces.ICertificate)        
 
-class CourseContainerBreadcrumb(Breadcrumb):
+class CoursesContainerBreadcrumb(Breadcrumb):
     """ We don't want course container breadcrumbs.
     """
-    grok.context(interfaces.ICourseContainer)
+    grok.context(interfaces.ICoursesContainer)
     grok.implements(IBreadcrumbIgnorable)
 
-class CertificateContainerBreadcrumb(Breadcrumb):
+class CertificatesContainerBreadcrumb(Breadcrumb):
     """ We don't want course container breadcrumbs.
     """
-    grok.context(interfaces.ICertificateContainer)
+    grok.context(interfaces.ICertificatesContainer)
     grok.implements(IBreadcrumbIgnorable)
 

main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt

@@ -517 +517 @@
 --------------
 
-Courses are stored in :class:`ICourseContainer` instances with their
-code as key. CourseContainers are normally availabe as `course`
+Courses are stored in :class:`ICoursesContainer` instances with their
+code as key. CoursesContainers are normally availabe as `course`
 attribute of :class:`waeup.sirp.university.department.Department`
 instances.
 
 To ease the life of users we do not require to browse the
-coursecontainers (which have a rather flat user interface), but
+coursescontainers (which have a rather flat user interface), but
 provide adding of courses in department views.
 
@@ -728 +728 @@
 -------------------
 
-Certificates are stored in :class:`ICertificateContainer` instances
-with their code as key. CertificateContainers are normally availabe as
+Certificates are stored in :class:`ICertificatesContainer` instances
+with their code as key. CertificatesContainers are normally availabe as
 `certificates` attribute of
 :class:`waeup.sirp.university.department.Department` instances.
 
 To ease the life of users we do not require to browse the
-certificatecontainers (which have in fact no user interface), but
+certificatescontainers (which have in fact no user interface), but
 provide adding of certificates in department views.
 

main/waeup.sirp/trunk/src/waeup/sirp/browser/interfaces.py

@@ -23 +23 @@
     ISIRPObject, IUniversity, IUsersContainer, IDataCenter)
 from waeup.sirp.university.interfaces import (
-    IFacultyContainer, IFaculty, IFacultyAdd, IDepartment, IDepartmentAdd,
-    ICourseContainer, ICourse, ICourseAdd, ICertificateContainer,
+    IFacultiesContainer, IFaculty, IFacultyAdd, IDepartment, IDepartmentAdd,
+    ICoursesContainer, ICourse, ICourseAdd, ICertificatesContainer,
     ICertificate, ICertificateAdd, ICertificateCourse, ICertificateCourseAdd)
 

main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py

@@ -41 +41 @@
     SIRPDisplayFormPage, NullValidator)
 from waeup.sirp.browser.interfaces import (
-    IUniversity, IFacultyContainer, IFaculty, IFacultyAdd,
+    IUniversity, IFacultiesContainer, IFaculty, IFacultyAdd,
     IDepartment, IDepartmentAdd, ICourse, ICourseAdd, ICertificate,
     ICertificateAdd, ICertificateCourse, ICertificateCourseAdd)
@@ -539 +539 @@
     """General search page for the academics section.
     """
-    grok.context(IFacultyContainer)
+    grok.context(IFacultiesContainer)
     grok.name('search')
     grok.template('searchpage')
@@ -1173 +1173 @@
 
 #
-# FacultyContainer pages...
-#
-
-class FacultyContainerPage(SIRPPage):
+# FacultiesContainer pages...
+#
+
+class FacultiesContainerPage(SIRPPage):
     """ Index page for faculty containers.
     """
-    grok.context(IFacultyContainer)
+    grok.context(IFacultiesContainer)
     grok.require('waeup.viewAcademics')
     grok.name('index')
@@ -1187 +1187 @@
     grok.template('facultypage')
 
-class FacultyContainerManageFormPage(SIRPEditFormPage):
+class FacultiesContainerManageFormPage(SIRPEditFormPage):
     """Manage the basic properties of a `Faculty` instance.
     """
-    grok.context(IFacultyContainer)
+    grok.context(IFacultiesContainer)
     grok.name('manage')
     grok.require('waeup.manageUniversity')
-    grok.template('facultycontainermanagepage')
+    grok.template('facultiescontainermanagepage')
     pnav = 1
     taboneactions = ['Add faculty', 'Remove selected','Cancel']
@@ -1206 +1206 @@
         tabs.need()
         warning.need()
-        return super(FacultyContainerManageFormPage, self).update()
+        return super(FacultiesContainerManageFormPage, self).update()
 
     @jsaction('Remove selected')
@@ -1227 +1227 @@
     """ Page form to add a new faculty to a faculty container.
     """
-    grok.context(IFacultyContainer)
+    grok.context(IFacultiesContainer)
     grok.require('waeup.manageUniversity')
     grok.name('add')

main/waeup.sirp/trunk/src/waeup/sirp/browser/viewlets.py

@@ -22 +22 @@
 from zope.traversing.browser import absoluteURL
 from waeup.sirp.browser.pages import (
-    UniversityPage, FacultyContainerPage, DatacenterPage, FacultyPage,
+    UniversityPage, FacultiesContainerPage, DatacenterPage, FacultyPage,
     DepartmentPage, CoursePage, CertificatePage, CertificateCoursePage,
     UsersContainerPage, UserManageFormPage)
 from waeup.sirp.browser.interfaces import (
-    IFacultyContainer, IFaculty, IDepartment, ICourse, ICertificate,
+    IFacultiesContainer, IFaculty, IDepartment, ICourse, ICertificate,
     ICertificateCourse, IBreadcrumbContainer, IUniversity, IUsersContainer)
 from waeup.sirp.interfaces import (ISIRPObject, ISIRPXMLExporter,
@@ -396 +396 @@
     text = 'Edit settings'
 
-class ManageFacultyContainerActionButton(ManageActionButton):
+class ManageFacultiesContainerActionButton(ManageActionButton):
     """ 'Manage settings' button for faculties.
     """
-    grok.context(IFacultyContainer)
-    grok.view(FacultyContainerPage)
+    grok.context(IFacultiesContainer)
+    grok.view(FacultiesContainerPage)
     text = 'Manage academic section'
 
-class SearchFacultyContainerActionButton(ManageActionButton):
+class SearchFacultiesContainerActionButton(ManageActionButton):
     """ 'Manage settings' button for faculties.
     """
-    grok.context(IFacultyContainer)
-    grok.view(FacultyContainerPage)
+    grok.context(IFacultiesContainer)
+    grok.view(FacultiesContainerPage)
     text = 'Search academic section'
     icon = 'actionicon_search.png'
@@ -468 +468 @@
 
 #class AddFacultyActionButton(AddActionButton):
-#    grok.context(IFacultyContainer)
-#    grok.view(FacultyContainerPage)
+#    grok.context(IFacultiesContainer)
+#    grok.view(FacultiesContainerPage)
 #    text = 'Add faculty'
     
@@ -504 +504 @@
 
 #class RemoveFacultyActionButton(RemoveActionButton):
-#    grok.context(IFacultyContainer)
-#    grok.view(FacultyContainerPage)
+#    grok.context(IFacultiesContainer)
+#    grok.view(FacultiesContainerPage)
 #    text = 'Remove faculty'
    
@@ -715 +715 @@
 
 
-class FacultyContainerListHead(grok.Viewlet):
+class FacultiesContainerListHead(grok.Viewlet):
     """The header line of faculty container subobject lists.
     """
     grok.order(1)
     grok.viewletmanager(SubobjectLister)
-    grok.context(IFacultyContainer)
+    grok.context(IFacultiesContainer)
     grok.require('waeup.viewAcademics')