Changeset 8441

Timestamp:

14 May 2012, 07:55:00 (13 years ago)

Author:

Henrik Bettermann

Message:

Prepare uniben package so that it can be used as a base for further custom packages. Us term 'uniben' or 'Uniben' only if necessary.

Location:

main/waeup.uniben/trunk/src/waeup/uniben

Files:

• applicants/browser_templates/payment_view.pt (modified) (1 diff)
• applicants/export.py (modified) (1 diff)
• browser/resources.py (modified) (1 diff)
• browser/static/custom_theme.css (moved) (moved from main/waeup.uniben/trunk/src/waeup/uniben/browser/static/custom_theme_1.css)
• browser/tests.py (modified) (1 diff)
• browser/theming.py (modified) (1 diff)
• etranzact/browser_templates/enterpin.pt (modified) (1 diff)
• ftesting.zcml (modified) (1 diff)
• interfaces.py (modified) (2 diffs)
• interswitch/browser_templates/applicant_goto_interswitch.pt (modified) (1 diff)
• interswitch/browser_templates/student_goto_interswitch.pt (modified) (1 diff)
• permissions.py (modified) (1 diff)
• students/browser_templates/payment_view.pt (modified) (1 diff)
• students/interfaces.py (modified) (1 diff)
• students/utils.py (modified) (2 diffs)
• testing.py (modified) (1 diff)

main/waeup.uniben/trunk/src/waeup/uniben/applicants/browser_templates/payment_view.pt

@@ -1 @@
-<table class="form-table" i18n:domain="waeup.uniben"
+<table class="form-table" i18n:domain="waeup.custom"
   tal:define="files provider:files">
   <tbody>

main/waeup.uniben/trunk/src/waeup/uniben/applicants/export.py

@@ -24 +24 @@
 
 class CustomApplicantsExporter(ApplicantsExporter):
-    """Exporter for Uniben Applicants.
+    """Exporter for Custom Applicants.
     """
 

main/waeup.uniben/trunk/src/waeup/uniben/browser/resources.py

@@ -21 +21 @@
     )
 
-#: All local resources are registered under the name ``waeup_custom``.
+#: All local resources are registered under the name ``waeup_uniben``.
 waeup_uniben = Library('waeup_uniben', 'static')
 
-custom_theme_1 = ResourceInclusion(
-    waeup_uniben, 'custom_theme_1.css',
+custom_theme = ResourceInclusion(
+    waeup_uniben, 'custom_theme.css',
     depends = [waeup_base_css])
 

main/waeup.uniben/trunk/src/waeup/uniben/browser/tests.py

@@ -52 +52 @@
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
         self.browser.open('http://localhost/app/configuration')
-        self.assertMatches('...Custom Theme 1...', self.browser.contents)
-        self.browser.getControl(name="form.skin").value = ['custom theme 1']
+        self.assertMatches('...Uniben Theme...', self.browser.contents)
+        self.browser.getControl(name="form.skin").value = ['custom theme']
         self.browser.getControl("Save").click()
         self.browser.open('http://localhost/app/configuration')

main/waeup.uniben/trunk/src/waeup/uniben/browser/theming.py

@@ -18 +18 @@
 import grok
 from waeup.kofa.browser.interfaces import ITheme
-from waeup.uniben.browser.resources import custom_theme_1, favicon
+from waeup.uniben.browser.resources import custom_theme, favicon
 
 from waeup.uniben.interfaces import MessageFactory as _
 
-class CustomTheme1(grok.GlobalUtility):
+class CustomTheme(grok.GlobalUtility):
     """A custom theme based on the Kofa base theme.
     """
     grok.implements(ITheme)
-    grok.name('custom theme 1')
+    grok.name('custom theme')
 
-    description = _(u'Custom Theme 1')
+    description = _(u'Uniben Theme')
 
     def getResources(self):
-        return [custom_theme_1, favicon]
+        return [custom_theme, favicon]

main/waeup.uniben/trunk/src/waeup/uniben/etranzact/browser_templates/enterpin.pt

@@ -1 +1 @@
 <form tal:attributes="action view/action"
-    method="POST" i18n:domain="waeup.uniben">
+    method="POST" i18n:domain="waeup.custom">
   <table class="form-table">
     <tbody>

main/waeup.uniben/trunk/src/waeup/uniben/ftesting.zcml

@@ -2 +2 @@
    xmlns="http://namespaces.zope.org/zope"
    xmlns:kofa="http://namespaces.waeup.org/kofa"
-   i18n_domain="waeup.uniben"
+   i18n_domain="waeup.custom"
    package="waeup.uniben"
    >

main/waeup.uniben/trunk/src/waeup/uniben/interfaces.py

@@ -23 +23 @@
 from waeup.uniben.utils.lgas import LGAS
 
-_ = MessageFactory = zope.i18nmessageid.MessageFactory('waeup.uniben')
+_ = MessageFactory = zope.i18nmessageid.MessageFactory('waeup.custom')
 
 high_qual = SimpleKofaVocabulary(
@@ -104 +104 @@
         )
 
-    # Additional fees in waeup.uniben
+    # Additional fees in custom package
 
     maint_fee = schema.Float(

main/waeup.uniben/trunk/src/waeup/uniben/interswitch/browser_templates/applicant_goto_interswitch.pt

@@ -1 @@
-<form i18n:domain="waeup.uniben"
+<form i18n:domain="waeup.custom"
   tal:attributes="action view/action" method="POST">
 

main/waeup.uniben/trunk/src/waeup/uniben/interswitch/browser_templates/student_goto_interswitch.pt

@@ -1 @@
-<form i18n:domain="waeup.uniben"
+<form i18n:domain="waeup.custom"
   tal:attributes="action view/action" method="POST">
 

main/waeup.uniben/trunk/src/waeup/uniben/permissions.py

@@ -20 +20 @@
 
 class CRPUOfficer(grok.Role):
+    """ Permissions of Uniben CRPU members.
+
+    """
+
     grok.name('waeup.CRPUOfficer')
     grok.title(u'Uniben CRPU Officer')

main/waeup.uniben/trunk/src/waeup/uniben/students/browser_templates/payment_view.pt

@@ -1 @@
-<table class="form-table" i18n:domain="waeup.uniben"
+<table class="form-table" i18n:domain="waeup.custom"
   tal:define="files provider:files">
   <tbody>

main/waeup.uniben/trunk/src/waeup/uniben/students/interfaces.py

@@ -337 +337 @@
         )
 
-    uniben_matric = schema.TextLine(
+    former_matric = schema.TextLine(
         title = _(u'If yes, matric number'),
         required = False,

main/waeup.uniben/trunk/src/waeup/uniben/students/utils.py

@@ -130 +130 @@
         }
 
+    # Uniben separators
     SEPARATORS_DICT = {
         'form.fst_sit_fname': _(u'First Sitting Record'),
@@ -138 +139 @@
         'form.nysc_year': _(u'NYSC Information'),
         'form.employer': _(u'Employment History'),
-        'form.uniben_matric': _(u'Former Uniben Student'),
+        'form.former_matric': _(u'Former Uniben Student'),
         }
 
+    # Uniben prefix
     STUDENT_ID_PREFIX = u'B'

main/waeup.uniben/trunk/src/waeup/uniben/testing.py

@@ -16 +16 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##
-"""Testing support for :mod:`waeup.uniben`.
+"""Testing support for custom package.
 """
 import os.path