Changeset 11023 for main/waeup.kofa/branches

Timestamp:

31 Jan 2014, 18:19:16 (11 years ago)

Author:

Henrik Bettermann

Message:

Make 'My Data' dropdown menu work.

Location:

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

Files:

• layout/theme.html (modified) (2 diffs)
• src/waeup/kofa/students/browser_templates/mydatadropdowntabs.pt (modified) (1 diff)
• src/waeup/kofa/students/tests/test_browser.py (modified) (1 diff)

main/waeup.kofa/branches/uli-diazo-themed/layout/theme.html

@@ -51 +51 @@
           <li><a href="#contact">Students</a></li>
           <li><a href="#contact">Hostels</a></li>
+          <li class="dropdown">
+            <a href="#" class="dropdown-toggle"
+               data-toggle="dropdown">My Data
+               <b class="caret"></b>
+            <ul class="dropdown-menu">
+              <li><a href="#">Base Data</a></li>
+              <li><a href="#">Clearance Data</a></li>
+              <li><a href="#">Personal Data</a></li>
+              <li><a href="#">History</a></li>
+            </ul>
+          </li>
         </ul>
 
@@ -61 +72 @@
                <img src="static/img/earth.png" />
             <ul class="dropdown-menu">
-              <li class="kofa-language"><a href="#">en</a></li>
-              <li class="kofa-language"><a href="#">fr</a></li>
-              <li class="kofa-language"><a href="#">de</a></li>
-              <li class="kofa-language"><a href="#">ha</a></li>
-              <li class="kofa-language"><a href="#">yo</a></li>
-              <li class="kofa-language"><a href="#">ig</a></li>
+              <li class="kofa-language"><a href="#">English</a></li>
+              <li class="kofa-language"><a href="#">Français</a></li>
+              <li class="kofa-language"><a href="#">Deutsch</a></li>
+              <li class="kofa-language"><a href="#">Hausa</a></li>
+              <li class="kofa-language"><a href="#">Yoruba</a></li>
+              <li class="kofa-language"><a href="#">Igbo</a></li>
             </ul>
           </li>

main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/students/browser_templates/mydatadropdowntabs.pt

@@ -1 @@
-<li tal:attributes="class viewlet/active" data-dropdown="dropdown" >
+<li  tal:attributes="class viewlet/active">
   <a href="#" class="dropdown-toggle"
-    tal:content="viewlet/tab_title">Tab Title</a>
+     data-toggle="dropdown">
+     <span tal:replace="viewlet/tab_title">My Data</span>
+     <b class="caret"></b>
+  </a>
   <ul class="dropdown-menu">
     <li tal:repeat="target viewlet/targets">

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

@@ -1958 +1958 @@
         # We are logged in as student and can see the 'My Data' tab
         self.assertMatches(
-            '...<a href="#" class="dropdown-toggle">My Data</a>...',
+            '...<a href="#" class="dropdown-toggle" data-toggle="dropdown">...',
+            self.browser.contents)
+        self.assertMatches(
+            '...My Data...',
             self.browser.contents)
         self.browser.getLink("Logout").click()