Changeset 3318

Timestamp:

11 Mar 2008, 15:39:04 (17 years ago)

Author:

Henrik Bettermann

Message:

form beautyfied

Location:

WAeUP_SRP/base

Files:

• WAeUPImport.py (modified) (1 diff)
• skins/waeup_upload/uploads_form.pt (modified) (5 diffs)

WAeUP_SRP/base/WAeUPImport.py

@@ -172 +172 @@
             for k in import_keys:
                 if k in singels:
-                    keys += (k,'DUP_%s' % k,values[i],'duplicate'),
+                    keys += (k,'%s' % k,values[i],'(duplicate)'),
                     msg += ("duplicate %s," % k)
-                    keys[singels.index(k)] = (k,'DUP_%s' % k,values[singels.index(k)],'duplicate')
+                    keys[singels.index(k)] = (k,'%s' % k,values[singels.index(k)],'(duplicate)')
                 elif k in invalid_keys and not k.startswith(IGNORE):
-                    keys += (k,NO_KEY,values[i],'invalid'),
+                    keys += (k,NO_KEY,values[i],'(invalid)'),
                 else:
                     keys += (k,k,values[i],''),

WAeUP_SRP/base/skins/waeup_upload/uploads_form.pt

@@ -28 +28 @@
                tal:attributes="action info/action"
                >
-          <table tal:condition="python: 1" class="contentListing" width="100%" summary="content layout" id="folder_content">      
+          <table tal:condition="python: 1" class="contentListing" width="100%" summary="content layout" id="folder_content" border=0>      
             <tr>
               <th></th>
               <th>Filename</th>
               <th>Data Layout</th>
-              <th>By</th>
+              <th>Uploaded By</th>
               <th>Upload Date</th>
               <th>Error Message</th>
@@ -61 +61 @@
                 <td tal:content="row/msg" ></td>
               </tr>
+              
               <tr>
-                <th>Current</th>
-                <th>Possible</th>
-                <th>Value from 1. record</th>
+                <td>&nbsp;</td>
+                <td>&nbsp;</td>
+                <td>&nbsp;</td>
+                <td colspan="3">&nbsp;</td>
+              </tr>
+              <tr>
+                <th></th>
+                <th>Current Column Heading</th>
+                <th>Possible Field Names</th>
+                <th colspan="3">First Record (Example)</th>
               </tr>
               <tr tal:repeat="key row/fields">
+                <td />
                 <td colspan="1"> 
                   <font tal:attributes="color python: test(key[3],'red','black')">
-                    <span tal:content="python: key[1]" tal:omit-tag=""/> 
+                    <span tal:content="python: key[0]" tal:omit-tag=""/> 
                     <span tal:condition="python: key[3]" tal:content="python: key[3]" tal:omit-tag=""/> 
                   </font>
@@ -81 +90 @@
                   </select><br />
                 </td>
-                <td colspan="1" tal:content="python: key[2]" />
+                <td colspan="3" tal:content="python: key[2]" />
               </tr>
             </span>
@@ -120 +129 @@
               <th>Filename</th>
               <th>Data Layout</th>
-              <th>By</th>
+              <th>Uploaded By</th>
               <th>Upload Date</th>
             </tr>            
@@ -154 +163 @@
                  (cpsmcat('description_confirm_delete'), )" 
                  />
-          <input type="submit" name="goto_edit" value="Edit again"
+          <input type="submit" name="goto_edit" value="Re-edit"
                  class="destructive" i18n:attributes="value"
                  />