Changeset 6465 for main/waeup.sirp/trunk/src/waeup

Timestamp:

23 Jun 2011, 09:43:06 (14 years ago)

Author:

Henrik Bettermann

Message:

Show access code in headline of left sidebar of applicants. Show 'Your Application' in title of form.

Fix contact form.

Location:

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

Files:

• applicants/authentication.py (modified) (1 diff)
• applicants/browser.py (modified) (2 diffs)
• browser/layout.py (modified) (1 diff)
• browser/pages.py (modified) (1 diff)
• browser/templates/contactadminform.pt (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/authentication.py

@@ -68 +68 @@
         if prefix is not None:
             self.id = '%s.%s' % (prefix, self.id)
-        self.title = u'My Application'
+        self.title = u'Applicant'
         self.description = u'An applicant'
         self.groups = []

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

@@ -546 +546 @@
     @property
     def title(self):
+        if self.request.principal.title == 'Applicant':
+            return u'Your Application Record'
         return '%s' % self.context.access_code
 
@@ -749 +751 @@
     grok.template('form_edit')
     manage_applications = False
+    title = u'Your Application Form'
 
 

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

@@ -142 +142 @@
         if usertitle == 'Unauthenticated User':
             return u'Anonymous User'
+        elif usertitle == 'Applicant':
+            return self.request.principal.id
         return usertitle
 

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

@@ -375 +375 @@
         return tt
 
+    @property
+    def namefield_label(self):
+        if self.request.principal.title == 'Applicant':
+            return 'Access Code'
+        else:
+            return 'Full Name'
+
     def update(self, *args, **kw):
         form = self.request.form

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/contactadminform.pt

@@ -5 +5 @@
 <tr>
   <td width="150px">
-     <strong>Full Name: </strong>
+     <strong><span tal:replace="view/namefield_label" />: </strong>
   </td>
   <td tal:condition="not:layout/isAuthenticated">
-     <input name="fullname" type="text" id="fullname" tal:attributes="value view/fullname|nothing" />
+     <input name="fullname" type="text" id="fullname"/>
   </td>
   <td tal:condition="layout/isAuthenticated"> 
@@ -29 +29 @@
   </td>
   <td>
-     <textarea name="descr" rows="10" cols="60" id="descr"><span tal:replace="view/descr|nothing" /></textarea>
-     
+     <textarea name="descr" rows="10" cols="60" id="descr"></textarea>
   </td>
 </tr>