Changeset 11254 for main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/browser_templates

Timestamp:

22 Feb 2014, 15:46:03 (11 years ago)

Author:

uli

Message:

Merge changes from uli-diazo-themed back into trunk. If this works, then a miracle happened.

Location:

main/waeup.kofa/trunk

Files:

• . (modified) (1 prop)
• src/waeup/kofa (modified) (1 prop)
• src/waeup/kofa/accesscodes/browser_templates/batchcontainer.pt (modified) (2 diffs)
• src/waeup/kofa/accesscodes/browser_templates/reimportbatchpage.pt (modified) (2 diffs)
• src/waeup/kofa/accesscodes/browser_templates/searchpage.pt (modified) (3 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/browser_templates/batchcontainer.pt

@@ -3 +3 @@
     The following batches are available:
   </p>
-  <table>
+  <table class="table">
     <thead>
       <tr>
@@ -48 +48 @@
     </tbody>
   </table>
-  <input type="submit" class="btn" name="archive"
+  <input type="submit" class="btn btn-default" name="archive"
       tal:attributes="value view/archive_button" />
-  <input type="submit" class="btn" name="delete"
+  <input type="submit" class="btn btn-default" name="delete"
        tal:attributes="value view/delete_button" />
 </form>

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/browser_templates/reimportbatchpage.pt

@@ -4 +4 @@
 </p>
 <form method="POST" i18n:domain="waeup.kofa">
-  <table>
+  <table class="table">
     <thead>
       <tr>
@@ -25 +25 @@
     </tbody>
   </table>
-  <input type="submit" class="btn primary" name="reimport"
+  <input type="submit" class="btn btn-primary" name="reimport"
       tal:attributes="value view/reimport_button" />
-  <input type="submit" class="btn" name="cancel"
+  <input type="submit" class="btn btn-default" name="cancel"
       tal:attributes="value view/cancel_button" />
 </form>

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/browser_templates/searchpage.pt

@@ -1 @@
-<form method="POST" i18n:domain="waeup.kofa">
+<form method="POST" i18n:domain="waeup.kofa" class="form-inline">
 <br />
-  <input type="submit" class="btn primary" name="search"
-      tal:attributes="value view/search_button" />
+  <div class="form-group">
+    <input type="submit" class="btn btn-primary" name="search"
+        tal:attributes="value view/search_button" />
   <span i18n:translate="">for access codes</span>
-  <select name="searchtype">
-    <option i18n:translate="" value="code">with PIN</option>
-    <option i18n:translate="" value="batch_serial">with serial</option>
-    <option i18n:translate="" value="history">with message term</option>
-  </select>
-  <input type="text" name="searchterm" />
+  </div>
+  <div class="form-group">
+    <select name="searchtype" class="form-control">
+      <option i18n:translate="" value="code">with PIN</option>
+      <option i18n:translate="" value="batch_serial">with serial</option>
+      <option i18n:translate="" value="history">with message term</option>
+    </select>
+  </div>
+  <div class="form-group">
+    <input type="text" class="form-control" name="searchterm" />
+  </div>
   <p>&nbsp;</p>
   <div tal:condition="view/hitlist">
@@ -17 +23 @@
     <input type="hidden" name="old_searchtype"
          tal:attributes="value view/searchtype" />
-    <table class="display dataTableManage">
+    <table class="kofa-data-table dataTableManage">
       <thead>
       <tr>
@@ -43 +49 @@
     </table>
     <div>
-      <input type="submit" class="btn" name="disable"
+      <input type="submit" class="btn btn-default" name="disable"
           tal:attributes="value view/disable_button" />
-      <input type="submit" class="btn" name="enable"
+      <input type="submit" class="btn btn-default" name="enable"
           tal:attributes="value view/enable_button" />
+      <input type="submit" class="btn btn-default" name="cancel"
+          tal:attributes="value view/cancel_button" />
     </div>
-
+  </div>
+  <div tal:condition="not: view/hitlist">
+    <input type="submit" class="btn btn-default" name="cancel"
+        tal:attributes="value view/cancel_button" />
   </div>
 </form>