Changeset 3326

Timestamp:

12 Mar 2008, 22:28:34 (17 years ago)

Author:

Henrik Bettermann

Message:

some beautifying

Location:

WAeUP_SRP/base

Files:

• WAeUPImport.py (modified) (1 diff)
• WAeUPTool.py (modified) (1 diff)
• skins/waeup_upload/download_errors.py (modified) (1 diff)
• skins/waeup_upload/uploads_form.pt (modified) (4 diffs)

WAeUP_SRP/base/WAeUPImport.py

@@ -103 +103 @@
             info = {}
             info['imported_from'] = ''
-            info['import_line_nr'] = 0
+            info['import_record_no'] = 0
             info['imported_by'] = self.imported_by
             info['import_date'] = self.import_date.strftime("%d/%m/%y %H:%M:%S")

WAeUP_SRP/base/WAeUPTool.py

@@ -1564 +1564 @@
             data_string = ", ".join("%s: %s" % (k,v) for k,v in mapping.items())
             info['error'] = error
-            info['import_line_nr'] = count + 1
+            info['import_record_no'] = count + 1
             mapping.update(info)
             log_list = []

WAeUP_SRP/base/skins/waeup_upload/download_errors.py

@@ -19 +19 @@
 request = context.REQUEST
 setheader = request.RESPONSE.setHeader
-set_trace()
+#set_trace()
 data = context.getContent()['getErrors']()
 filename = context.getId().replace('.csv','_errors.csv')

WAeUP_SRP/base/skins/waeup_upload/uploads_form.pt

@@ -92 +92 @@
                 <td colspan="3" tal:content="python: key[2]" />
               </tr>
+              
+              
+              <tr>
+                <td>&nbsp;</td>
+                <td>&nbsp;</td>
+                <td>&nbsp;</td>
+                <td colspan="3">&nbsp;</td>
+              </tr>              
+              
+              
             </span>
             </table>
           
-          <br />
           
           <font color='red'>Please see error message for further information. If there are errors in the headline of the import file
@@ -180 +189 @@
           <table tal:condition="python: 1" class="contentListing" width="100%" summary="content layout" id="folder_content">      
             <tr>
-              <th>Download</th>
               <th>File in Archive</th>
               <th>Data Layout</th>
@@ -188 +196 @@
               <th>Import Date</th>
               <th>Message</th>
+              <th>Downloads</th>
             </tr>            
             <tr tal:repeat="row info/imported"
                 tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
-              <td> <a href="view" tal:attributes="href string:${row/url}/download_pending">pending</a> <br />
-                              <a href="view" tal:attributes="href string:${row/url}/download_errors">errors</a>  </td>
               <td tal:content="string:${row/id}.done" ></td>
               <td tal:content="row/import_layout"></td>
@@ -200 +207 @@
               <td tal:content="row/import_date" ></td>
               <td tal:content="row/msg"></td>
+              <td nowrap> <a href="view" tal:attributes="href string:${row/url}/download_pending">all pendings</a> <br /><br />
+                              <a href="view" tal:attributes="href string:${row/url}/download_errors">only errors</a>  </td>
             </tr>
           </table>