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

Timestamp:

4 Feb 2010, 11:54:20 (15 years ago)

Author:

uli

Message:

Fix references to academics stuff interfaces. This is the first step to make academics stuff pluggable.

Location:

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

Files:

• breadcrumbs.py (modified) (1 diff)
• interfaces.py (modified) (1 diff)
• pages.py (modified) (1 diff)
• viewlets.py (modified) (1 diff)

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

@@ -6 +6 @@
 from zope.publisher.browser import TestRequest
 
-from waeup.sirp import interfaces
+from waeup.sirp.browser import interfaces
 from waeup.sirp.browser.interfaces import (IBreadcrumb, IBreadcrumbIgnorable,
                                       IBreadcrumbContainer)

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

@@ -3 +3 @@
 from zope import schema
 from zope.interface import Interface, Attribute
-
+from waeup.sirp.interfaces import (
+    IWAeUPObject, IUniversity, IUserContainer, IDataCenter)
+from waeup.sirp.university.interfaces import (
+    IFacultyContainer, IFaculty, IDepartment, ICourseContainer, ICourse,
+    ICertificateContainer, ICertificate, ICertificateCourse)
 
 class IBreadcrumb(Interface):

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

@@ -10 +10 @@
 from hurry import yui
 from hurry.workflow.interfaces import NoTransitionAvailableError
-from waeup.sirp.browser import (WAeUPPage, WAeUPEditFormPage, WAeUPAddFormPage,
-                           WAeUPDisplayFormPage, NullValidator)
+from waeup.sirp.browser import (
+    WAeUPPage, WAeUPEditFormPage, WAeUPAddFormPage,
+    WAeUPDisplayFormPage, NullValidator)
+from waeup.sirp.browser.interfaces import (
+    IUniversity, IFacultyContainer, IFaculty, IDepartment, ICourse,
+    ICertificate, ICertificateCourse)
 from waeup.sirp.catalog import search, search_context
-from waeup.sirp.interfaces import (IUniversity, IWAeUPObject, IUserContainer,
-                              IUserAccount, IFacultyContainer, IDataCenter,
-                              IFaculty, IDepartment, ICourse, ICertificate,
-                              ICertificateCourse, IWAeUPXMLImporter,
-                              IWAeUPXMLExporter)
+from waeup.sirp.interfaces import(
+    IWAeUPObject, IUserContainer, IUserAccount, IDataCenter,
+    IWAeUPXMLImporter, IWAeUPXMLExporter)
 from waeup.sirp.widgets.interfaces import ITableProvider
 from waeup.sirp.utils.helpers import getName
 from zope import schema
-from zope.app.security.interfaces import (IAuthentication,
-                                          IUnauthenticatedPrincipal,
-                                          ILogout)
+from zope.app.security.interfaces import (
+    IAuthentication, IUnauthenticatedPrincipal, ILogout)
 from zope.component import getUtility, createObject
 from zope.component.interfaces import Invalid

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

@@ -6 +6 @@
 from zope.component import getMultiAdapter
 from zope.location.interfaces import ISite
-from waeup.sirp.browser.pages import (UniversityPage, FacultyContainerPage,
-                                 DatacenterPage, FacultyPage, DepartmentPage,
-                                 CoursePage, CertificatePage,
-                                 CertificateCoursePage)
-from waeup.sirp.browser.interfaces import IBreadcrumbContainer
-from waeup.sirp.interfaces import (IUniversity, IWAeUPObject, IWAeUPXMLExporter,
-                              IWAeUPXMLImporter, IFacultyContainer, IFaculty,
-                              IDepartment, ICourse, ICertificate,
-                              ICertificateCourse, IDataCenter)
+from waeup.sirp.browser.pages import (
+    UniversityPage, FacultyContainerPage, DatacenterPage, FacultyPage,
+    DepartmentPage, CoursePage, CertificatePage, CertificateCoursePage)
+from waeup.sirp.browser.interfaces import (
+    IFacultyContainer, IFaculty, IDepartment, ICourse, ICertificate,
+    ICertificateCourse, IBreadcrumbContainer, IUniversity)
+from waeup.sirp.interfaces import (IWAeUPObject, IWAeUPXMLExporter,
+                                   IWAeUPXMLImporter, IDataCenter)
 
 grok.templatedir('templates')