Changeset 13055 for main/waeup.kofa/trunk/src/waeup/kofa/browser

Timestamp:

16 Jun 2015, 11:28:07 (10 years ago)

Author:

Henrik Bettermann

Message:

Rename student views which are not layout-aware and thus not pages.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/browser

Files:

• layout.py (modified) (2 diffs)
• pages.py (modified) (7 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/browser/layout.py

@@ -167 +167 @@
     grok.baseclass()
 
-class KofaForm(UtilityView,Form):
+class KofaPage(UtilityView,Page):
+    """A megrok.layout page with additional methods.
+    """
+    grok.baseclass()
+
+class KofaFormPage(UtilityView,Form):
     """A megrok.layout.Form with additional methods.
     """
@@ -173 +178 @@
 
     def setUpWidgets(self,ignore_request=False):
-        super(KofaForm,self).setUpWidgets(ignore_request)
+        super(KofaFormPage,self).setUpWidgets(ignore_request)
         # Width parameters will be overridden by Bootstrap
         # so we have to set the css class
         if self.widgets.get('body'):
             self.widgets['body'].height = 10
-
-class KofaPage(UtilityView,Page):
-    """A megrok.layout page with additional methods.
-    """
-    grok.baseclass()
 
 class KofaDisplayFormPage(UtilityView,DisplayForm):

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

@@ -44 +44 @@
 from waeup.kofa.utils.helpers import html2dict
 from waeup.kofa.browser.layout import (
-    KofaPage, KofaForm, KofaEditFormPage, KofaAddFormPage,
+    KofaPage, KofaFormPage, KofaEditFormPage, KofaAddFormPage,
     KofaDisplayFormPage, NullValidator)
 from waeup.kofa.browser.interfaces import (
@@ -415 +415 @@
 #
 
-class ContactAdminForm(KofaForm):
+class ContactAdminFormPage(KofaFormPage):
     grok.name('contactadmin')
     #grok.context(IUniversity)
@@ -424 +424 @@
 
     def update(self):
-        super(ContactAdminForm, self).update()
+        super(ContactAdminFormPage, self).update()
         self.form_fields.get('body').field.default = None
         return
@@ -461 +461 @@
         return
 
-class EnquiriesForm(ContactAdminForm):
+class EnquiriesFormPage(ContactAdminFormPage):
     """Captcha'd page to let anonymous send emails to the administrator.
     """
@@ -471 +471 @@
 
     def update(self):
-        super(EnquiriesForm, self).update()
+        super(EnquiriesFormPage, self).update()
         # Handle captcha
         self.captcha = getUtility(ICaptchaManager).getCaptcha()
@@ -843 +843 @@
         return
 
-class ContactUserForm(ContactAdminForm):
+class ContactUserFormPage(ContactAdminFormPage):
     grok.name('contactuser')
     grok.context(IUserAccount)
@@ -2431 +2431 @@
         return
 
-class ChangePasswordRequestPage(KofaForm):
+class ChangePasswordRequestPage(KofaFormPage):
     """Captcha'd page for all kind of users to request a password change.
     """