Changeset 169

Timestamp:

13 Nov 2005, 22:23:03 (19 years ago)

Author:

Henrik Bettermann

Message:

temporary views modified

Location:

waeup_product/trunk

Files:

• Extensions/install.py (modified) (3 diffs)
• skins/waeup_default/getWAeUPLayouts.py (modified) (3 diffs)
• skins/waeup_default/getWAeUPTypes.py (modified) (4 diffs)
• skins/waeup_default/student_view_all_form.pt (added)
• skins/waeup_default/student_view_student_form.pt (added)
• skins/waeup_default/temporary_view_all.py (modified) (3 diffs)
• skins/waeup_default/temporary_view_all_form.pt (modified) (1 diff)
• skins/waeup_student/check_admission_form.pt (modified) (1 diff)
• skins/waeup_student/clearence_form.pt (modified) (1 diff)

waeup_product/trunk/Extensions/install.py

@@ -196 +196 @@
                         'action'    : "python: portal.portal_url.getUrlFromRpath('sections/demouni/academics')",
                         #'action'    : 'string:${portal_url}/academics',
-                        'permission': (View ),
+                        'permission': (UniversityManage),
                         'category'  : 'main_tabs',
                         'visible'   : 1,
@@ -205 +205 @@
                         'action'    : "python: portal.portal_url.getUrlFromRpath('sections/demouni/accommodation')",
                         #'action'    : 'string:${portal_url}/accommodation',
-                        'permissions': (View),
+                        'permissions': (UniversityManage),
                         #'permissions': (ModifyPortalContent,UniversityManage,StudentManage),
                         'category'  : 'main_tabs',
@@ -584 +584 @@
             content.edit(mapping={'Title': heading})
     return '\n'.join(log)
-                
-###)
-
+
+###)
+

waeup_product/trunk/skins/waeup_default/getWAeUPLayouts.py

@@ -791 +791 @@
     },
     'layout': {
-        'style_prefix': 'layout_default_',
+        'style_prefix': 'layout_waeup_',
         'flexible_widgets': (),
         'ncols': 1,
@@ -1091 +1091 @@
     },
    'layout': {
-        'style_prefix': 'layout_default_',
+        'style_prefix': 'layout_waeup_',
         'flexible_widgets': (),
         'ncols': 1,
@@ -1834 +1834 @@
     },
    'layout': {
-        'style_prefix': 'layout_default_',
+        'style_prefix': 'layout_waeup_',
         'flexible_widgets': (),
         'ncols': 1,

waeup_product/trunk/skins/waeup_default/getWAeUPTypes.py

@@ -95 +95 @@
     'actions': ({'id': 'view',
                  'name': 'Standard View',
-                 #'action': 'students_folder_view',
                  'action': 'temporary_view_all',
-                 #'condition': "python:member and 'Manager' in member.getRoles()",
                  'permissions': (View,)},
 ##                {
@@ -273 +271 @@
           #'action': 'string:${object_url}/student_index_html',
           'action': 'string:${object_url}/temporary_view_all',
-          'condition':  'python:object.getContent().memberIsOwner()',
+          'condition':  "python:object.getContent().memberIsOwner() or 'UniversityManager'in member.getRoles()",
           'permission': (View,),
           'category': 'object',
@@ -306 +304 @@
           {
           'id'        : 'DOCUMENTS',
-          'name'      : 'upload Documents',
+          'name'      : 'Upload Documents',
           'action'    : 'string:${object/absolute_url}/DOCUMENTS',
           'condition':  "python: object.getContent().memberIsOwner() and getattr(object,'PERSONAL',None)",
@@ -463 +461 @@
     'actions': (
          {'id': 'view',
-          'name': 'View',
+          'name': 'Standard View',
           'action': 'string:${object_url}/temporary_view_all',
           'permission': (View),

waeup_product/trunk/skins/waeup_default/temporary_view_all.py

@@ -2 +2 @@
 # $Id$
 
-"""Default view for the forum. If post_id is not None, post with id = <post_id>
-will be displayed, otherwise first post will be displayed."""
+"""
+"""
 
 member = context.portal_membership.getAuthenticatedMember()
@@ -13 +13 @@
 #return context.temporary_view_all_form(psm=psm)
 if context.portal_membership.isAnonymousUser():
-    return context.temporary_view_all_form(psm=psm)
+    return context.students.student_view_all_form(psm=psm)
 else:
     if url0.find(uname) > 0 or 'UniversityManager' in roles or 'Manager' in roles:
@@ -21 +21 @@
         for r in res:
             if r.getPath().endswith("students/%s" % uname):
-                return r.getObject().temporary_view_all_form(psm=psm)
-        return context.temporary_view_all_form(psm=psm)
+                return r.getObject().student_view_student_form(psm=psm)
+        return context.students.student_view_all_form(psm=psm)

waeup_product/trunk/skins/waeup_default/temporary_view_all_form.pt

@@ -39 +39 @@
             <td>
               <i>
-                <a href="xxx" tal:condition="backend" 
+                <a href="xxx"  
                    tal:attributes="href item/absolute_url"
                    tal:content="item/title_or_id"></a>
-                <span tal:condition="frontend" tal:content="item/title_or_id"/>
               </i>
             </td>

waeup_product/trunk/skins/waeup_student/check_admission_form.pt

@@ -18 +18 @@
           Instructions :<br />
           <ul>
-            <li>Enter the scratch card PIN for admission check </li> 
-            <li>Print the Admission Slip which is displayed if you are admitted by the School </li>
-            <li>Buy a Clearance card </li> 
+            <li>Buy an Admission Check Scratch Card </li> 
+            <li>Enter the PIN here </li> 
+            <li>Print the Admission Slip which is displayed if you are admitted by the Univesity</li>
+            <li>Buy a Clearance Scratch Card </li> 
             <li>Proceed to the Clearance Eligibility Online Form and fill your O/L details </li> 
-            <li>Proceed to the School with all original documents for Clearance to finalize the clearance process </li>
+            <li>Proceed to the Univesity with all original documents for clearance to finalize the clearance process </li>
           </ul>
       </metal:block>

waeup_product/trunk/skins/waeup_student/clearence_form.pt

@@ -18 +18 @@
           Instructions :<br />
           <ul>
-            <li>Buy a Clearance card </li> 
+            <li>Buy a Clearance Scratch Card </li> 
             <li>Enter the PIN here </li> 
             <li>Proceed to the Clearance Eligibility Online Form and fill your O/L details </li> 
-            <li>Proceed to the School with all original documents for Clearance to finalize the clearance process</li>
+            <li>Proceed to the Univesity with all original documents for clearance to finalize the clearance process</li>
           </ul>
       </metal:block>