Changeset 13066 for main/waeup.ikoba/trunk/src/waeup/ikoba/browser

Timestamp:

16 Jun 2015, 14:48:55 (10 years ago)

Author:

Henrik Bettermann

Message:

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

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/browser

Files:

• __init__.py (modified) (1 diff)
• layout.py (modified) (2 diffs)
• pages.py (modified) (3 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/browser/__init__.py

@@ -1 +1 @@
 import os
-
-#from waeup.ikoba.browser.layout import (
-#    IkobaPage, IkobaForm, IkobaLayout, IkobaDisplayFormPage, IkobaEditFormPage,
-#    IkobaAddFormPage, NullValidator)
-#from waeup.ikoba.browser.pages import ContactAdminForm
 
 IMAGE_PATH = os.path.join(

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

@@ -166 +166 @@
     grok.baseclass()
 
-class IkobaForm(UtilityView,Form):
+class IkobaPage(UtilityView,Page):
+    """A megrok.layout page with additional methods.
+    """
+    grok.baseclass()
+
+class IkobaFormPage(UtilityView,Form):
     """A megrok.layout.Form with additional methods.
     """
@@ -172 +177 @@
 
     def setUpWidgets(self,ignore_request=False):
-        super(IkobaForm,self).setUpWidgets(ignore_request)
+        super(IkobaFormPage,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 IkobaPage(UtilityView,Page):
-    """A megrok.layout page with additional methods.
-    """
-    grok.baseclass()
 
 class IkobaDisplayFormPage(UtilityView,DisplayForm):

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

@@ -44 +44 @@
 from waeup.ikoba.utils.helpers import html2dict
 from waeup.ikoba.browser.layout import (
-    IkobaPage, IkobaForm, IkobaEditFormPage, IkobaAddFormPage,
+    IkobaPage, IkobaFormPage, IkobaEditFormPage, IkobaAddFormPage,
     IkobaDisplayFormPage, NullValidator)
 from waeup.ikoba.browser.interfaces import (
@@ -361 +361 @@
 #
 
-class ContactAdminForm(IkobaForm):
+class ContactAdminForm(IkobaFormPage):
     grok.name('contactadmin')
     #grok.context(ICompany)
@@ -1515 +1515 @@
         return result
 
-class ChangePasswordRequestPage(IkobaForm):
+class ChangePasswordRequestPage(IkobaFormPage):
     """Captcha'd page for all kind of users to request a password change.
     """