Changeset 9034 for main/waeup.kofa/trunk/src/waeup

Timestamp:

21 Jul 2012, 09:31:09 (12 years ago)

Author:

Henrik Bettermann

Message:

Use different columns for different field types.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/browser

Files:

• templates/datacenteruploadpage.pt (modified) (2 diffs)
• tests/test_browser.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenteruploadpage.pt

@@ -18 +18 @@
     <tr>
       <th i18n:translate="">Processor</th>
-      <th i18n:translate="">Available Fields</th>
+      <th i18n:translate="">Required Schema Fields</th>
+      <th i18n:translate="">Optional Schema Fields</th>
+      <th i18n:translate="">Non-Schema Fields</th>
       <th i18n:translate="">CSV Skeleton File</th>
     </tr>
@@ -24 +26 @@
   <tr tal:repeat="importer view/getImporters">
     <td tal:content="importer/title"></td>
-    <td>
-        <span tal:repeat="field importer/fields">
-            <tal:schemafield condition="field/f_type">
-              <tal:notrequired condition="not:field/f_required">
-                <span tal:replace="field/f_name"></span>
-                (<span tal:replace="field/f_type"></span>)
-              </tal:notrequired>
-              <tal:required condition="field/f_required">
-                <strong>
-                  <span tal:replace="field/f_name"></span>
-                  (<span tal:replace="field/f_type"></span>)
-                </strong>
-              </tal:required>
-            </tal:schemafield>
-            <tal:extrafield condition="not:field/f_type">
-              <i tal:content="field/f_name"></i>
-            </tal:extrafield>,
-        </span>
+    <td nowrap>
+      <span tal:repeat="field importer/fields">
+          <tal:schemafield condition="field/f_type">
+            <tal:required condition="field/f_required">
+              <span tal:replace="field/f_name"></span>
+              (<span tal:replace="field/f_type"></span>)
+              <br />
+            </tal:required>
+          </tal:schemafield>
+      </span>
+    </td>
+    <td nowrap>
+      <span tal:repeat="field importer/fields">
+          <tal:schemafield condition="field/f_type">
+            <tal:notrequired condition="not:field/f_required">
+              <span tal:replace="field/f_name"></span>
+              (<span tal:replace="field/f_type"></span>)
+              <br />
+            </tal:notrequired>
+          </tal:schemafield>
+      </span>
     </td>
     <td>
-      <a tal:attributes="href python: 'skeleton?name=' + importer['name']"
-         tal:content="python: importer['name'].replace('processor', 'import') + '_000.csv'">
-         FILENAME</a>
+      <span tal:repeat="field importer/fields">
+          <tal:extrafield condition="not:field/f_type">
+            <span tal:replace="field/f_name"></span>
+            <br />
+          </tal:extrafield>
+      </span>
+    </td>
+
+    <td>
+      <a i18n:translate=""
+         tal:attributes="href python: 'skeleton?name=' + importer['name']">Download</a>
     </td>
   </tr>

main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py

@@ -177 +177 @@
         self.browser.getLink("Upload data").click()
         self.assertTrue(
-            '<a href="skeleton?name=facultyprocessor">facultyimport_000.csv</a>'
+            '<a href="skeleton?name=facultyprocessor">Download</a>'
             in self.browser.contents)
-        self.browser.getLink('facultyimport_000.csv').click()
+        self.browser.getLink(url='skeleton?name=facultyprocessor').click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.headers['Content-Type'],