Changeset 789 for WAeUP_SRP

Timestamp:

8 Nov 2006, 10:50:36 (18 years ago)

Author:

joachim

Message:

first modifications according to email

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• admission_accept_form.pt (moved) (moved from WAeUP_SRP/trunk/skins/waeup_student/defer_view.pt)
• clearance_edit.py (modified) (1 diff)
• clearance_edit_form.pt (moved) (moved from WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_view.pt) (4 diffs)
• layout_clearance_edit.pt (modified) (3 diffs)
• student_index.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_student/clearance_edit.py

@@ -41 +41 @@
 psm = ""
 args = {}
-action = "/clearance_edit_view"
+action = "/clearance_edit_form"
 if cpsdocument_edit_button:
     if is_valid:

WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_form.pt

@@ -5 +5 @@
                                                schema_id='student_clearance',
                                                layout_id='student_clearance_fe',
-                                               layout_mode='edit',);
+                                               layout_mode='edit',
+                                               use_session=True);
            form_action string:clearance_edit;
            edition python:True;
@@ -12 +13 @@
     ">
 <metal:block define-macro="edit_form">
-<metal:block use-macro="here/content_lib_master/macros/master">
+<metal:block use-macro="here/waeup_content_master/macros/master">
   <metal:block fill-slot="style_slot">
     <link rel="Stylesheet" type="text/css" href=""
@@ -36 +37 @@
     <script type="text/javascript" src="cpsdocument.js"
       tal:attributes="src string:${base_url}cpsdocument.js"></script>
-    <tal:block condition="python:modules['Products.CPSUtil.integration'].isProductPresent('Products.FCKeditor')">
-      <script type="text/javascript">
-        var popup_editor_form = 'popup_fckeditor_form';
-        var width = 640;
-        var height = 520;
-      </script>
-    </tal:block>
-    <tal:block condition="python:modules['Products.CPSUtil.integration'].isProductPresent('Products.Epoz')">
-      <script type="text/javascript">
-        var popup_editor_form = 'popup_rte_form';
-        var width = 640;
-        var height = 480;
-      </script>
-    </tal:block>
-    <script type="text/javascript">
-     function popup_rte(input_id, label_edit) {
-       var args, value;
-       value = document.getElementById(input_id).value;
-       args = '?input_id='+input_id+'&amp;label_edit='+escape(label_edit);
-       str_window_features = 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=1,dependent=1,width=' + width + ',height=' + height;
-       popup = window.open(popup_editor_form + args, input_id, str_window_features);
-       if (!popup.opener) {
-         popup.opener = window;
-       }
-       return false;
-     }
-   </script>
    </metal:block>
   </metal:block>
 
-    <h1> Edit your clearance Data</h1>
+  <metal:block fill-slot="header">
+    <metal:block define-slot="header">
+        <h3> Edit your clearance Data</h3>
+    </metal:block>
+  </metal:block>
+
 
   <metal:block fill-slot="main">
@@ -81 +60 @@
           </div>
         </div>
-        <metal:block use-macro="here/cpsdocument_edit_buttons/macros/buttons"/>
       </div>
+   <input type="submit" class="standalone" name="cpsdocument_edit_button"
+         value="Save" 
+         id="cpsdocument_edit_button"
+         tal:condition="not:creation" />
     </form>
     <div id="ajax_psm" style="display:none">

WAeUP_SRP/trunk/skins/waeup_student/layout_clearance_edit.pt

@@ -14 +14 @@
   widgets python:context.getRenderedWidgets(layout);
   ">
-  <form action="" id="editForm" method="post" 
-        enctype="multipart/form-data" class="workflow"
-        tal:attributes="action formaction"
-        >
   <table class="layoutDefault" summary="Form layout"
          tal:condition="layout/rows">
     <span tal:repeat="row python: layout['rows']" valign="top" >
       <span tal:repeat="cell row">
-        <tr tal:define="widget cell/widget;
+        <span tal:define="widget cell/widget;
               wid widget/getWidgetId;
               err python:ds.getError(wid);
@@ -32 +28 @@
               tal:condition="python: wid != 'passport'"
               >
+        <tr tal:condition="widget/description|nothing" class="even ajaxtd">
+          <th colspan="5" align="center"><h3 tal:replace="widget/description" /></th>
+        </tr>
+        <tr>
           <div tal:attributes="class widget_css_class;
           id python:widget.getHtmlWidgetId()+'_widget';"
@@ -67 +67 @@
         </tr>
       </span>
+      </span>
     </span>
   </table>
-  <br />
-  <input type="submit" class="standalone" name="cpsdocument_edit_button"
-         value="Save" 
-         id="cpsdocument_edit_button"
-         tal:condition="not:creation" />
-  <input type="submit" class="standalone" name="proceed"
-         value="apply for admission"
-         id="cpsdocument_edit_and_view_button"
-         tal:condition="proceed" 
-         tal:attributes="value proceed"/>
-  <input type="submit" 
-         class="standalone" 
-         name="cpsdocument_create_button"
-         value="apply"
-         tal:attributes="value options/button"
-         tal:condition="creation" />
-
-</form>
 </metal:block>

WAeUP_SRP/trunk/skins/waeup_student/student_index.py

@@ -35 +35 @@
         return redirect("%s/application_edit" % info['app'].absolute_url())
     elif state in ('admitted',):
-        return redirect("%s/defer_view" % student.absolute_url())
+        return redirect("%s/accept_aadmission_form" % student.absolute_url())
     elif state == 'clearance_pin_entered':
         return redirect("%s/student_view" % info['clear'].absolute_url())