Changeset 2400

Timestamp:

19 Oct 2007, 15:36:36 (17 years ago)

Author:

Henrik Bettermann

Message:

some fixes and beautifications

Location:

WAeUP_SRP/base/skins/waeup_utilities

Files:

• remove_students.py (modified) (3 diffs)
• remove_students_form.pt (modified) (4 diffs)

WAeUP_SRP/base/skins/waeup_utilities/remove_students.py

@@ -38 +38 @@
 students = []
 #set_trace()
-psm = 'nothing done'
+psm = ''
 deleted_list = []
 if delete:
     if not ids:
-        psm = "nothing checked"
+        psm = "Nothing selected!"
     else:
         for student_id in ids:
@@ -52 +52 @@
                 logger.info("No student object for %s" % (student_id))
                 continue
+            deleted_list.append(student_id)
             # remove from directory
             if hasattr(stdir, student_id):
@@ -60 +61 @@
                 continue
             context.waeup_tool.removePictureFolder(student_id)
-            deleted_list.append(student_id)
             
-        psm = "%s deleted" % ' '.join(deleted_list)
+
+        psm = "%s removed" % ' '.join(deleted_list)
 if student_ids:
     brains = aq_students(In('id',student_ids))

WAeUP_SRP/base/skins/waeup_utilities/remove_students_form.pt

@@ -11 +11 @@
     </span>
     <span tal:condition="allowed" tal:omit-tag="">
-      <h3> Remove Student Section</h3><br />
+      <h3> Remove Student Records</h3><br />
       You are logged in as member <span tal:replace="info/member|nothing" /> 
+      <br /><br />
       <form action="remove_students" method="post"
             enctype="multipart/form-data" class="workflow">
@@ -23 +24 @@
                        id="widget__search_string_widget">
                     <div class="label">
-                      <label for="search_string">provide a list of student ids  to remove</label>
+                      <label for="search_string">Student Ids to be removed</label> (space-separated list)
                     </div>
                     <div class="field">
@@ -40 +41 @@
           </div>        
         </div>
+        <br /><br />
         <span tal:condition="students">
           <span
@@ -98 +100 @@
                 </span>
               </span>
-              <tr>
-                <td align="left" valign="top" rowspan="3"></td>
-                <td align="left" valign="top">
-                  <span tal:condition="is_so">
-                    <input type="button" value="button_select_all" class="context"
-                           onclick="someJavaScriptFunctionThatWillBeReplaced"
-                           i18n:attributes="value"
-                           tal:attributes="onclick python:'toggleSelect(this, \'%s\', \'%s\')'
-                           % (cpsmcat('button_select_all'), cpsmcat('button_deselect_all'))"
-                           />
-                    <input type="submit" name="delete" value="Delete checked"
-                           class="destructive"
-                           tal:attributes="onclick python:'return window.confirm(\'%s\')' %
-                           (cpsmcat('description_confirm_delete'), )" 
-                           />
-                  </span>
-                </td>
-              </tr>
             </table>
+            
+            <br />
+
+            <div tal:condition="is_so">
+              <input type="button" value="button_select_all" class="context"
+                     onclick="someJavaScriptFunctionThatWillBeReplaced"
+                     i18n:attributes="value"
+                     tal:attributes="onclick python:'toggleSelect(this, \'%s\', \'%s\')'
+                     % (cpsmcat('button_select_all'), cpsmcat('button_deselect_all'))"
+                     />
+              <input type="submit" name="delete" value="Remove selected"
+                     class="destructive"
+                     tal:attributes="onclick python:'return window.confirm(\'%s\')' %
+                     (cpsmcat('description_confirm_delete'), )" 
+                     />
+            </div>
+
             <tal:block condition="python:batch_info and batch_info['nb_pages'] > 1">
               <div class="pageNavigationLayout">