Changeset 8406 for main/waeup.kofa/trunk/src

Timestamp:

10 May 2012, 07:04:55 (13 years ago)

Author:

Henrik Bettermann

Message:

Go directly to ApplicantsContainerManageFormPage? when clicking container link on ApplicantsRootManageFormPage?.

Hide Manage button on ApplicantsContainerPage?.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/applicants

Files:

• browser_templates/applicantscontainerpage.pt (modified) (1 diff)
• browser_templates/applicantsrootmanagepage.pt (modified) (2 diffs)
• tests/test_browser.py (modified) (1 diff)
• viewlets.py (modified) (3 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicantscontainerpage.pt

@@ -1 +1 @@
 <span tal:condition="view/introduction" tal:omit-tag="">
-  <span tal:content="structure view/introduction">INTRODUCTION</span>
-  <br />
+  <p tal:content="structure view/introduction">INTRODUCTION</p>
 </span>
 

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicantsrootmanagepage.pt

@@ -35 +35 @@
     <div id="tab-2" tal:attributes="class view/tab2">
       <h3 tal:content="view/subunits">SUBUNITS</h3>
+
+      <p i18n:translate="note_armp">
+        Please note that containers will be opened in manage mode here.
+        All application record links will be loaded into your browser which
+        can take a considerable time depending on your bandwidth.
+        Please be patient until all records have been loaded.
+      </p>
+
       <table class="display dataTableManage">
         <thead>
@@ -54 +62 @@
             <td tal:content="entry/year">YEAR</td> <td>
               <a href=""
-                tal:attributes="href python:view.url(entry)"
+                tal:attributes="href python:view.url(entry) + '/manage'"
                 tal:content="entry/__name__">CODE</a> </td>
             <td tal:content="entry/title">TITLE</td>

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py

@@ -305 +305 @@
         self.assertTrue('Added:' in self.browser.contents)
         self.browser.getLink("app2010").click()
-        self.assertTrue('<h1>General Studies 2010/2011</h1>'
+        self.assertTrue('Manage applicants container'
             in self.browser.contents)
         self.browser.open(self.add_container_path)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/viewlets.py

@@ -82 +82 @@
         return self.view.application_url() + rel_link
 
-class SearchApplicantsActionButton(ManageActionButton):
+class ApplicantsRootSearchActionButton(ManageActionButton):
     grok.order(1)
     grok.context(IApplicantsRoot)
@@ -91 +91 @@
     target = '@@search'
 
-class ManageApplicantsRootActionButton(ManageActionButton):
+class ApplicantsRootManageActionButton(ManageActionButton):
     grok.order(2)
     grok.context(IApplicantsRoot)
@@ -98 +98 @@
     text = _('Manage application section')
 
-class ApplicantsContainerManageActionButton(ManageActionButton):
-    grok.order(1)
-    grok.context(IApplicantsContainer)
-    grok.view(ApplicantsContainerPage)
-    grok.require('waeup.manageApplication')
-    text = _('Manage applicants container')
+#class ApplicantsContainerManageActionButton(ManageActionButton):
+#    grok.order(1)
+#    grok.context(IApplicantsContainer)
+#    grok.view(ApplicantsContainerPage)
+#    grok.require('waeup.manageApplication')
+#    text = _('Manage application records')
 
 class ApplicantRegisterActionButton(ManageActionButton):