Changeset 844 for WAeUP_SRP/trunk/skins

Timestamp:

11 Nov 2006, 21:17:26 (18 years ago)

Author:

Henrik Bettermann

Message:

clearance edit form for mamager added
ticket 40 resolved
some text and layout changes
cpsdocument_edit_form only for managers allowed

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_academics/getAcademicsInfo.py (modified) (1 diff)
• waeup_custom/cpsdocument_edit_form.pt (modified) (4 diffs)
• waeup_default/isManager.py (modified) (1 diff)
• waeup_student/clearance_edit.py (modified) (1 diff)
• waeup_student/clearance_edit_form.pt (modified) (1 diff)
• waeup_student/clearance_edit_form_manager.pt (added)
• waeup_student/clearance_edit_manager.py (added)
• waeup_student/clearance_slip.pt (modified) (1 diff)
• waeup_student/layout_clearance_view.pt (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_academics/getAcademicsInfo.py

@@ -1 @@
-## Script (Python) "cpsdocument_edit"
+## Script (Python) "getAcademicsInfo"
 ##bind container=container
 ##bind context=context

WAeUP_SRP/trunk/skins/waeup_custom/cpsdocument_edit_form.pt

@@ -1 +1 @@
 <tal:block define="
+    info context/getStudentInfo;
     rendered_main python:context.getContent().render(layout_mode='edit', 
            cluster=None,
@@ -9 +10 @@
     edition python:True;
     metadata metadata|nothing;
+    is_manager info/is_manager|nothing;
     ">
 <metal:block define-macro="edit_form">
@@ -67 +69 @@
   
   <metal:block fill-slot="header">
+    <span tal:condition="not: is_manager">
+        <metal:block use-macro="here/error_not_found/macros/not_found" />
+    </span>
+    <span tal:condition="is_manager">
     <h3 tal:condition="creation" i18n:translate="">
       Create a document of type
@@ -91 +97 @@
     <br />        
     </span>
+    </span>
   </metal:block>
   
-  
-  
-  <metal:block fill-slot="main">
+ 
+  <metal:block fill-slot="main" tal:condition="is_manager">
     <form action="ACTION" method="post" id="editForm"
           enctype="multipart/form-data" class="workflow"

WAeUP_SRP/trunk/skins/waeup_default/isManager.py

@@ -1 @@
-## Script (Python) "cpsdocument_edit"
+## Script (Python) "isManager"
 ##bind container=container
 ##bind context=context

WAeUP_SRP/trunk/skins/waeup_student/clearance_edit.py

@@ -56 +56 @@
         args = getFormUidUrlArg(REQUEST)
         psm = "Please correct Your errors."
-args['portal_status_message'] = psm
-url = clear.absolute_url() + action + '?' + urlencode(args)
-REQUEST.RESPONSE.redirect(url)
+        args['portal_status_message'] = psm
+if args:
+  url = clear.absolute_url() + action + '?' + urlencode(args)
+else:
+  url = clear.absolute_url() + action
+REQUEST.RESPONSE.redirect(url) 

WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_form.pt

@@ -14 +14 @@
 <metal:block define-macro="edit_form">
 <metal:block use-macro="here/waeup_content_master/macros/master">
-  <metal:block fill-slot="style_slot">
-    <link rel="Stylesheet" type="text/css" href=""
-      tal:attributes="href string:${base_url}document.css" />
-
-    <metal:block define-macro="widgets_javascript">
-    <!-- XXX this has to move to CPSSchemas -->
-    <style type="text/css"
-      tal:content="string:@import url(${base_url}calendar-win2k-1.css);"></style>
-    <script type="text/javascript" src="calendar.js"
-      tal:attributes="src string:${base_url}calendar.js"></script>
-    <script type="text/javascript" src="lang/calendar-en.js"
-      tal:define="local cpsmcat/getSelectedLanguage"
-      tal:attributes="src string:${base_url}lang/calendar-${local}.js"></script>
-    <script type="text/javascript" src="calendar-setup.js"
-      tal:attributes="src string:${base_url}calendar-setup.js"></script>
-    <script type="text/javascript" src="prototype.js"
-      tal:attributes="src string:${base_url}prototype.js"></script>
-    <script type="text/javascript" src="effects.js"
-      tal:attributes="src string:${base_url}effects.js"></script>
-    <script type="text/javascript" src="controls.js"
-      tal:attributes="src string:${base_url}controls.js"></script>
-    <script type="text/javascript" src="cpsdocument.js"
-      tal:attributes="src string:${base_url}cpsdocument.js"></script>
-   </metal:block>
-  </metal:block>
 
   <metal:block fill-slot="header">

WAeUP_SRP/trunk/skins/waeup_student/clearance_slip.pt

@@ -7 +7 @@
       <span tal:condition="info">
             
-        <h3>My Clearance/Eligibility Record</h3>
+        <h3>Clearance/Eligibility Record</h3>
         <br />
         <span tal:omit-tag=""

WAeUP_SRP/trunk/skins/waeup_student/layout_clearance_view.pt

@@ -19 +19 @@
             <tr>                         
             <tal:block condition="widget/label">
-            <td valign="top" nowrap>
+            <td width="180px" valign="top" nowrap>
               <span i18n:translate="" tal:condition="widget/is_i18n">
                   <span tal:content="widget/label" />:</span>