Changeset 543

Timestamp:

24 Sep 2006, 07:44:32 (18 years ago)

Author:

Henrik Bettermann

Message:

reorganisation part 2
themes modification will follow

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/actionicons.xml (modified) (1 diff)
• profiles/default/actions.xml (modified) (4 diffs)
• skins/waeup_default/campus_index.py (modified) (3 diffs)
• skins/waeup_default/index_html.py (modified) (1 diff)
• skins/waeup_default/login_staff.pt (modified) (1 diff)
• skins/waeup_default/portlet_waeup_status_display.pt (modified) (1 diff)
• skins/waeup_pins/batch_index_html.pt (modified) (2 diffs)
• skins/waeup_pins/pins_index_html.pt (modified) (1 diff)
• skins/waeup_student/apply_admission.py (modified) (2 diffs)
• skins/waeup_student/students_index.py (modified) (2 diffs)
• skins/waeup_student/students_manager_view.pt (modified) (1 diff)

WAeUP_SRP/trunk/profiles/default/actionicons.xml

@@ -156 +156 @@
               title="Members" priority="4"
               icon_expr="blank.gif"/>
+ <action-icon category="navigation" action_id="view_pins"
+              title="PINs" priority="5"
+              icon_expr="blank.gif"/>              
  <action-icon category="navigation" action_id="home"
               title="Home" priority="0"

WAeUP_SRP/trunk/profiles/default/actions.xml

@@ -2 +2 @@
 <object name="portal_actions" meta_type="CMF Actions Tool">
  <action-provider name="portal_membership">
-  <action title="Login" action_id="login" category="user"
+  <action title="Staff Login" action_id="login_staff" category="user"
      condition_expr="not: member"
-     url_expr="python:&quot;%s/login_form?%s&quot; % (portal_url, modules[&quot;urllib&quot;].urlencode({&quot;came_from&quot;: request.URL}))"
+     url_expr="python:&quot;%s/login_staff?%s&quot; % (portal_url, modules[&quot;urllib&quot;].urlencode({&quot;came_from&quot;: request.URL}))"
      visible="True">
    <permission>View</permission>
@@ -32 +32 @@
    <permission>View</permission>
   </action>
-  <action title="Login" action_id="login_student" category="student"
+  <action title="Student Login" action_id="login_student" category="student"
      condition_expr="not:member"
      url_expr="python:&quot;%s/login_student?%s&quot; % (portal_url, modules[&quot;urllib&quot;].urlencode({&quot;came_from&quot;: request.URL}))"
@@ -118 +118 @@
    <permission>Modify portal content</permission>
   </action>
+  <action title="PINs" action_id="view_pins" category="navigation"
+     condition_expr="member" url_expr="string:${portal_url}/campus/pins"
+     visible="True">
+   <permission>Modify portal content</permission>
+  </action>  
   <action title="Unchecked Items" action_id="unchecked" category="object"
      condition_expr="member" url_expr="string:./unchecked" visible="True">
@@ -128 +133 @@
   <action title="Apply for PUME" action_id="apply_admission"
      category="student" condition_expr="not:member"
-     url_expr="string:${portal_url}/campus/students/apply_admission"
+     url_expr="string:${portal_url}/apply_admission"
      visible="True">
    <permission>View</permission>

WAeUP_SRP/trunk/skins/waeup_default/campus_index.py

@@ -1 @@
-## Script (Python) "home_index"
+## Script (Python) "campus_index"
 ##bind container=container
 ##bind context=context
@@ -19 +19 @@
 
 if pm.isAnonymousUser():
-    return redirect("%s/campus_anonymous_view" % request.get('URL1')) 
+    return redirect("%s/campus_anonymous_view" % request.get('URL1'))
 
 campus = context.portal_catalog(meta_type = "University")[-1].getObject()
@@ -29 +29 @@
 if isManager:
     return redirect("%s/campus_manager_view" % campus.absolute_url())
-   
+
 if isStudent:
     return redirect("%s/students_index" % campus.students.absolute_url())

WAeUP_SRP/trunk/skins/waeup_default/index_html.py

@@ -27 +27 @@
 
 if isManager:
-    return redirect("%s/srp_manager_view" % absolute_url())
+    return redirect("%s/srp_manager_view" % context.absolute_url())
 
 if isStudent:
-    return redirect("%s/srp_anonymous_view" % absolute_url())
+    return redirect("%s/srp_anonymous_view" % context.absolute_url())
 

WAeUP_SRP/trunk/skins/waeup_default/login_staff.pt

@@ -6 +6 @@
       tal:define="username request/username | request/__ac_name | nothing">
 
-  <h3 i18n:translate="">Student Login</h3>
+  <h3 i18n:translate="">Staff Login</h3>
 
   <form id="" action="" method="post"
         tal:attributes="action string:${base_url}logged_in">
-        
-
-  <p>This is the frontpage of Uniben's Student Registration Portal (SRP) which is part of the West African e-University Project. For further information see 
-  <a href="" tal:attributes="href string:http://waeup.org">waeup.org</a>. </p>
   
   <p>You've chosen the portal's 'back entrance' to log in. This entrance is dedicated to university staff members to maintain the portal's database.</p>

WAeUP_SRP/trunk/skins/waeup_default/portlet_waeup_status_display.pt

@@ -1 +1 @@
 <tal:block define="item nocall:options/context_obj;
                    info item/getContentInfo;
-                   base_url python: request.get('cpsskins_base_url');">
+                   base_url python: request.get('cpsskins_base_url');
+                   status_list python: ['checked', 'unchecked', 'opened', 'closed', 
+                                        'created', 'admission_pin_entered', 'admission_applied'];">
 
-<span tal:condition="python:path('info/review_state')!='work'">
+<span tal:condition="python:path('info/review_state') in status_list ">
   Status: <span tal:content="info/review_state" />
 </ span>

WAeUP_SRP/trunk/skins/waeup_pins/batch_index_html.pt

@@ -7 +7 @@
       </span>
       <span tal:condition="python:not isAnon and info">
-        <h3 tal:content="info/review_state|nothing"></h3>
+
+        <h3>Unused PINs</h3>
+        <br />
         <span tal:omit-tag="" 
               tal:content="structure python: info['batch_doc'].render(proxy=info['batch_doc'],
@@ -13 +15 @@
               )" 
               />
+        <br />
+        <table>
+          <tr tal:repeat="pin info/unused">
+            <td tal:content="pin/serial" />
+            <td tal:content="pin/pin" />
+          </tr>
+        </table>
+      
       </span>
-      <table>
-        <tr tal:repeat="pin info/unused">
-          <td tal:content="pin/serial" />
-          <td tal:content="pin/pin" />
-        </tr>
-      </table>
+
     </metal:main>
   </metal:body>

WAeUP_SRP/trunk/skins/waeup_pins/pins_index_html.pt

@@ -5 +5 @@
       </span>  
       <span tal:condition="not:isAnon">
+        <h3>PIN Batches</h3>
+        <br />
         <table tal:define="batches python: context.objectValues()">
           <tr tal:repeat="batch batches">

WAeUP_SRP/trunk/skins/waeup_student/apply_admission.py

@@ -48 +48 @@
     return context.REQUEST.RESPONSE.redirect("%s/logged_in?__ac_name=%s&__ac_password=%s&pin=%s"
           % (context.absolute_url(),s_id,pin.split('-')[2],pin))
-    
+
 ##    jamb_id = ds.get('jamb_reg_no')
 ##    student = context.getContent().getStudentByRegNo(jamb_id)
@@ -68 +68 @@
 
 # now display the passport form with jamb-data readonly
-return context.REQUEST.RESPONSE.redirect("%s/application_form" % (student.application.absolute_url()))
-return student.application_form()
+##return context.REQUEST.RESPONSE.redirect("%s/application_form" % (student.application.absolute_url()))
+##return student.application_form()
+
+return
 
 

WAeUP_SRP/trunk/skins/waeup_student/students_index.py

@@ -19 +19 @@
 
 if pm.isAnonymousUser():
-    return redirect("%s/campus_anonymous_view" % context.campus.absolute_url())
+    return redirect("%s/srp_anonymous_view" % context.absolute_url())
 
 
@@ -29 +29 @@
 
 if isManager:
-    return redirect("%s/academics_contents" % campus.students.absolute_url())
+    return redirect("%s/students_manager_view" % campus.students.absolute_url())
 if isStudent:
     info = context.getStudentInfo()

WAeUP_SRP/trunk/skins/waeup_student/students_manager_view.pt

@@ -9 +9 @@
       </span>
       <span tal:condition="isManager">
+      <h3>All Students</h3>
+        <br />
         <table tal:define="students python: context.objectValues()">
           <tr tal:repeat="student students">