Changeset 7368

Timestamp:

18 Dec 2011, 08:16:16 (13 years ago)

Author:

Henrik Bettermann

Message:

Change label and title of registration page.

Check if application has started or ended.

Rename login icon.

Location:

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

Files:

• applicants/browser.py (modified) (5 diffs)
• applicants/browser_templates/applicantregister.pt (modified) (2 diffs)
• browser/static/actionicon_login.png (moved) (moved from main/waeup.sirp/trunk/src/waeup/sirp/browser/static/login.png)
• utils/utils.py (modified) (1 diff)

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

@@ -305 +305 @@
     text = 'Manage applicants container'
 
+class ApplicantRegisterActionButton(ManageActionButton):
+    grok.order(2)
+    grok.context(IApplicantsContainer)
+    grok.view(ApplicantsContainerPage)
+    grok.require('waeup.Anonymous')
+    icon = 'actionicon_login.png'
+    text = 'Register for application'
+    target = 'register'
+
 class ApplicantsContainerManageFormPage(SIRPEditFormPage):
     grok.context(IApplicantsContainer)
@@ -408 +417 @@
         'firstname', 'middlename', 'lastname',
         'email', 'phone')
-    title = 'Applicants'
     label = 'Add applicant'
     pnav = 3
@@ -1096 +1104 @@
     grok.require('waeup.Public')
     grok.template('applicantregister')
-    label = 'Applicant Registration'
-    title = label
     form_fields = grok.AutoFields(IApplicantEdit).select(
         'firstname', 'middlename', 'lastname', 'email', 'phone')
     form_fields['phone'].custom_widget = PhoneWidget
 
+    @property
+    def title(self):
+        return "Applicants Container: %s" % self.context.title
+
+    @property
+    def label(self):
+        return "Register for %s Application" % self.context.title
+
     def update(self):
-        # handle captcha
+        # Check if application has started ...
+        if not self.context.startdate or self.context.startdate > date.today():
+            self.flash('Application has not yet started.')
+            self.redirect(self.url(self.context))
+            return
+        # ... or ended
+        if not self.context.enddate or self.context.enddate < date.today():
+            self.flash('Application has ended.')
+            self.redirect(self.url(self.context))
+            return
+        # Handle captcha
         self.captcha = getUtility(ICaptchaManager).getCaptcha()
         self.captcha_result = self.captcha.verify(self.request)
@@ -1109 +1133 @@
         return
 
-    @grok.action('Register')
+    @grok.action('Send login credentials')
     def register(self, **data):
         if not self.captcha_result.is_valid:
@@ -1132 +1156 @@
             pwd,login_url,email_to,subject)
         if success:
-            self.flash('An email with your user name and password' +
+            self.flash('An email with your user name and password ' +
                 'has been sent to %s.' % email_to)
         else:

main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantregister.pt

@@ -50 +50 @@
     </tbody>
   </table>
-
+  <p> An account will be created for you and an email with your login credentials
+  will be sent to the address provided.
+  </p>
   <div class="actionButtons" tal:condition="view/availableActions">
     <input tal:repeat="action view/actions"
@@ -56 +58 @@
            />
   </div>
-
-
 </form>

main/waeup.sirp/trunk/src/waeup/sirp/utils/utils.py

@@ -77 +77 @@
 %s
 Student Registration and Information Portal of
-%s
+%s.
 
-Your user name is: %s
-Your password is: %s
+Your user name: %s
+Your password: %s
 Login page: %s