Changeset 11015

Timestamp:

31 Jan 2014, 08:50:12 (11 years ago)

Author:

Henrik Bettermann

Message:

Adjust hostels module.

Location:

main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/hostels

Files:

• browser_templates/containermanagepage.pt (modified) (2 diffs)
• browser_templates/containerpage.pt (modified) (1 diff)
• browser_templates/hostelmanagepage.pt (modified) (2 diffs)
• tests.py (modified) (1 diff)

main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/hostels/browser_templates/containermanagepage.pt

@@ -4 +4 @@
 
 
-  <ul class="tabs" data-tabs="tabs">
-    <li tal:attributes="class view/tab1">
-    <a href="#tab-1">
-      <span i18n:translate="">Settings
-      </span></a>
+  <ul class="tabs nav nav-tabs" data-tabs="tabs">
+    <li class="active">
+      <a href="#tab1" data-toggle="tab" i18n:translate="">
+        Settings
+      </a>
     </li>
-    <li tal:attributes="class view/tab2">
-    <a href="#tab-2" i18n:translate="">Hostels</a>
+    <li>
+      <a href="#tab2" data-toggle="tab" i18n:translate="">
+        Hostels
+      </a>
     </li>
   </ul>
 
   <div class="tab-content">
-    <div id="tab-1" tal:attributes="class view/tab1">
+    <div id="tab1" class="active tab-pane">
+      <br />
       <table class="form-table">
         <tbody>
@@ -29 +32 @@
       </div>
     </div>
-    <div id="tab-2" tal:attributes="class view/tab2"> <br />
-      <table class="display dataTableManage">
+    <div id="tab2" class="tab-pane">
+      <br />
+      <table class="dataTableManage">
         <thead>
           <tr>

main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/hostels/browser_templates/containerpage.pt

@@ -16 +16 @@
 </table>
 
-<table i18n:domain="waeup.kofa">
+<table i18n:domain="waeup.kofa" class="table">
   <thead>
     <tr>

main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/hostels/browser_templates/hostelmanagepage.pt

@@ -2 +2 @@
       i18n:domain="waeup.kofa" enctype="multipart/form-data">
 
-  <ul class="tabs" data-tabs="tabs">
-    <li tal:attributes="class view/tab1"><a href="#tab-1">
-      <span i18n:translate="">Hostel Data</span></a>
+  <ul class="tabs nav nav-tabs" data-tabs="tabs">
+    <li class="active">
+      <a href="#tab1" data-toggle="tab">
+        <span i18n:translate="">Hostel Data</span>
+      </a>
     </li>
-    <li tal:attributes="class view/tab2"><a href="#tab-2">
-      <span i18n:translate="">Beds</span></a>
+    <li>
+      <a href="#tab2" data-toggle="tab">
+        <span i18n:translate="">Beds</span>
+      </a>
     </li>
   </ul>
 
   <div class="tab-content">
-    <div id="tab-1" tal:attributes="class view/tab1">
+    <div id="tab1" class="active tab-pane">
+      <br />
       <table class="form-table">
       <tbody>
@@ -37 +42 @@
     </div>
 
-    <div id="tab-2" tal:attributes="class view/tab2">
-      <h3>Beds</h3>
-      <table class="display dataTableManage">
-      <thead>
-        <tr>
-          <th>&nbsp;</th>
-          <th i18n:translate="">Id</th>
-          <th i18n:translate="">Type</th>
-          <th i18n:translate="">Number</th>
-          <th i18n:translate="">Owner</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr tal:repeat="value context/values">
-           <td>
-            <input type="checkbox" name="val_id"
-                  tal:attributes="value value/__name__" />
-          </td>
-          <td tal:content="value/bed_id">ID</td>
-          <td tal:content="value/bed_type">TYPE</td>
-          <td tal:content="value/bed_number">NUMBER</td>
-          <td>
-            <a tal:condition="python: value.owner != view.not_occupied"
-               tal:attributes="href python: '%s/%s/accommodation' %
-                    (view.students_url,value.owner)">
-              <span tal:content="value/owner">OWNER</span>
-            </a>
-            <a tal:condition="python: value.owner == view.not_occupied"
-               tal:attributes="href python: view.url(value)"
-               i18n:translate="">
-            [allocate student]
-            </a>
-          </td>
-        </tr>
-      </tbody>
+    <div id="tab2" class="tab-pane">
+      <br />
+      <table class="dataTableManage">
+        <thead>
+          <tr>
+            <th>&nbsp;</th>
+            <th i18n:translate="">Id</th>
+            <th i18n:translate="">Type</th>
+            <th i18n:translate="">Number</th>
+            <th i18n:translate="">Owner</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr tal:repeat="value context/values">
+             <td>
+              <input type="checkbox" name="val_id"
+                          tal:attributes="value value/__name__" />
+            </td>
+            <td tal:content="value/bed_id">ID</td>
+            <td tal:content="value/bed_type">TYPE</td>
+            <td tal:content="value/bed_number">NUMBER</td>
+            <td>
+              <a tal:condition="python: value.owner != view.not_occupied"
+                 tal:attributes="href python: '%s/%s/accommodation' %
+                      (view.students_url,value.owner)">
+                <span tal:content="value/owner">OWNER</span>
+              </a>
+              <a tal:condition="python: value.owner == view.not_occupied"
+                 tal:attributes="href python: view.url(value)"
+                 i18n:translate="">
+              [allocate student]
+              </a>
+            </td>
+          </tr>
+        </tbody>
       </table>
 

main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/hostels/tests.py

@@ -368 +368 @@
         self.browser.open(self.container_path + '/hall-1/hall-1_A_101_A')
         self.assertEqual(self.browser.url,
-            self.container_path + '/hall-1/@@manage?tab2')
+            self.container_path + '/hall-1/@@manage#tab2')
         # Updating the beds again will not affect the allocation and also
         # the bed numbering remains the same