Index: /main/waeup.kofa/branches/uli-diazo-themed/layout/theme.html
===================================================================
--- /main/waeup.kofa/branches/uli-diazo-themed/layout/theme.html	(revision 10994)
+++ /main/waeup.kofa/branches/uli-diazo-themed/layout/theme.html	(revision 10995)
@@ -13,8 +13,6 @@
     <link href="bootstrap/css/bootstrap-theme.min.css"
           rel="stylesheet">
-
     <link href="static/css/jquery.dataTables.css"
           rel="stylesheet">
-
     <link href="static/css/base.css" rel="stylesheet">
 
@@ -105,5 +103,5 @@
                 <li><a href="#">Personal Data</a></li>
                 <li><a href="#">Study Course</a></li>
-                <li><a href="#"">Payments</a></li>
+                <li><a href="#">Payments</a></li>
                 <li><a href="#">Accommodation</a></li>
                 <li><a href="#">History</a></li>
@@ -124,4 +122,5 @@
           </div> <!-- /well -->
         </div> <!-- /kofa-sidebar -->
+
         <div class="col-md-10 content kofa-content-narrow">
           <div class="well">
@@ -149,7 +148,9 @@
               </div>
               <h1>WAeUP.Kofa Theme</h1>
-              <p class="kofa-content-desc">A sample Diazo theme for WAeUP.Kofa
-              <br>
-              Fusce dapibus, tellus ac cursus commodo.
+
+              <p class="kofa-content-desc">
+                A sample Diazo theme for WAeUP.Kofa
+                <br />
+                Fusce dapibus, tellus ac cursus commodo.
               </p>
               <p>
@@ -161,4 +162,53 @@
               </p>
               <img src="static/img/bg.png" />
+
+              <!-- Tabs... -->
+              <br /><br />
+              <h3>Sample Tabs</h3>
+              <ul id="tabs" class="tabs nav nav-tabs" data-tabs="tabs">
+                <li class="active">
+                  <a href="#tab-1" data-toggle="tab">Tab 1</a>
+                </li>
+                <li class="">
+                  <a href="#tab-2" data-toggle="tab">Tab 2</a>
+                </li>
+                <li class="">
+                  <a href="#tab-3" data-toggle="tab">Tab 3</a>
+                </li>
+              </ul>
+              <div class="tab-content">
+                <div id="tab-1" class="tab-pane active">
+                  <br />
+                  <p>
+                    Tab 1 content...<br />  Donec id elit non mi porta
+                    gravida at eget metus. Fusce dapibus, tellus ac
+                    cursus commodo.
+                  </p>
+                </div>
+                <div id="tab-2" class="tab-pane">
+                  <br />
+                  <p>
+                    Tab 2 content...<br />  Tortor mauris condimentum
+                    nibh, ut fermentum massa justo sit amet
+                    risus. Etiam porta sem malesuada.
+                  </p>
+                </div>
+                <div id="tab-3" class="tab-pane">
+                  <br />
+                  <p>
+                    Tab 3 content...<br /> Magna mollis euismod. Donec
+                    sed odio dui.
+                  </p>
+                </div>
+              </div><!-- /tab-content -->
+
+              <script type="text/javascript" 
+                      class="kofa-script kofa-script-tabs">
+                $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
+                console.log('showing tab ' + e.target); // Active Tab
+                console.log('showing tab ' + e.relatedTarget); // Previous Tab
+                });
+              </script>
+
             </div> <!-- /kofa-content -->
           </div> <!-- /well -->
@@ -402,4 +452,7 @@
       		"aoColumnDefs":[{ "bSortable": false, "aTargets": [ 0 ] }]
       	} );
+
+        //* activate current tab, if any... */
+        $('a[href="' + window.location.hash + '"]').trigger('click');
       });
     </script>
Index: /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/pages.py
===================================================================
--- /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/pages.py	(revision 10994)
+++ /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/pages.py	(revision 10995)
@@ -86,5 +86,5 @@
     if user is None or localrole is None:
         view.flash('No user selected.')
-        view.redirect(view.url(view.context, '@@manage')+'?tab%s' % tab)
+        view.redirect(view.url(view.context, '@@manage')+'#tab%s' % tab)
         return
     role_manager = IPrincipalRoleManager(view.context)
@@ -94,5 +94,5 @@
     grok.getSite().logger.info(
         '%s - added: %s|%s' % (ob_class, user, localrole))
-    view.redirect(view.url(view.context, u'@@manage')+'?tab%s' % tab)
+    view.redirect(view.url(view.context, u'@@manage')+'#tab%s' % tab)
     return
 
@@ -101,5 +101,5 @@
     if child_ids is None:
         view.flash(_('No local role selected.'))
-        view.redirect(view.url(view.context, '@@manage')+'?tab%s' % tab)
+        view.redirect(view.url(view.context, '@@manage')+'#tab%s' % tab)
         return
     if not isinstance(child_ids, list):
@@ -125,5 +125,5 @@
         grok.getSite().logger.info(
             '%s - removed: %s' % (ob_class, ', '.join(deleted)))
-    view.redirect(view.url(view.context, u'@@manage')+'?tab%s' % tab)
+    view.redirect(view.url(view.context, u'@@manage')+'#tab%s' % tab)
     return
 
@@ -135,5 +135,5 @@
         view.flash(_('No item selected.'))
         if tab:
-            view.redirect(view.url(view.context, redirect)+'?tab%s' % tab)
+            view.redirect(view.url(view.context, redirect)+'#tab%s' % tab)
         else:
             view.redirect(view.url(view.context, redirect))
@@ -160,5 +160,5 @@
             '%s - removed: %s' % (ob_class, ', '.join(deleted)))
     if tab:
-        view.redirect(view.url(view.context, redirect)+'?tab%s' % tab)
+        view.redirect(view.url(view.context, redirect)+'#tab%s' % tab)
     else:
         view.redirect(view.url(view.context, redirect))
@@ -770,4 +770,5 @@
     form_fields['frontpage'].custom_widget = HTMLDisplayWidget
 
+
 class ConfigurationContainerManageFormPage(KofaEditFormPage):
     """Manage page of the configuration container. We always use the
@@ -784,13 +785,8 @@
         _('Add session configuration'),
         _('Remove selected')]
-    form_fields = grok.AutoFields(IConfigurationContainer).omit('frontpage_dict')
+    form_fields = grok.AutoFields(IConfigurationContainer).omit(
+        'frontpage_dict')
 
     def update(self):
-        tabs.need()
-        self.tab1 = self.tab2 = ''
-        qs = self.request.get('QUERY_STRING', '')
-        if not qs:
-            qs = 'tab1'
-        setattr(self, qs, 'active')
         datatable.need()
         warning.need()
@@ -859,10 +855,10 @@
             self.flash(_('The session chosen already exists.'))
             return
-        self.redirect(self.url(self.context, '@@index')+'?tab2')
+        self.redirect(self.url(self.context, '@@index')+'#tab2')
         return
 
     @action(_('Cancel'), validator=NullValidator)
     def cancel(self):
-        self.redirect(self.url(self.context, '@@index')+'?tab2')
+        self.redirect(self.url(self.context, '@@index')+'#tab2')
         return
 
@@ -885,10 +881,10 @@
     def save(self, **data):
         msave(self, **data)
-        self.redirect(self.url(self.context.__parent__, '@@index')+'?tab2')
+        self.redirect(self.url(self.context.__parent__, '@@index')+'#tab2')
         return
 
     @action(_('Cancel'), validator=NullValidator)
     def cancel(self):
-        self.redirect(self.url(self.context.__parent__, '@@index')+'?tab2')
+        self.redirect(self.url(self.context.__parent__, '@@index')+'#tab2')
         return
 
@@ -1763,5 +1759,5 @@
         self.context.__parent__.logger.info(
             '%s - added: %s' % (ob_class, faculty.code))
-        self.redirect(self.url(self.context, u'@@manage')+'?tab1')
+        self.redirect(self.url(self.context, u'@@manage')+'#tab1')
         return
 
@@ -1807,10 +1803,4 @@
 
     def update(self):
-        tabs.need()
-        self.tab1 = self.tab2 = self.tab3 = ''
-        qs = self.request.get('QUERY_STRING', '')
-        if not qs:
-            qs = 'tab1'
-        setattr(self, qs, 'active')
         warning.need()
         datatable.need()
@@ -1921,5 +1911,5 @@
         self.context.__parent__.__parent__.logger.info(
             '%s - added: %s' % (ob_class, data['code']))
-        self.redirect(self.url(self.context, u'@@manage')+'?tab2')
+        self.redirect(self.url(self.context, u'@@manage')+'#tab2')
         return
 
@@ -1942,5 +1932,4 @@
 
     def update(self):
-        tabs.need()
         datatable.need()
         super(DepartmentPage, self).update()
@@ -1998,10 +1987,4 @@
 
     def update(self):
-        tabs.need()
-        self.tab1 = self.tab2 = self.tab3 = self.tab4 = ''
-        qs = self.request.get('QUERY_STRING', '')
-        if not qs:
-            qs = 'tab1'
-        setattr(self, qs, 'active')
         warning.need()
         datatable.need()
@@ -2084,5 +2067,5 @@
         self.context.__parent__.__parent__.__parent__.logger.info(
             '%s - added: %s' % (ob_class, data['code']))
-        self.redirect(self.url(self.context, u'@@manage')+'?tab2')
+        self.redirect(self.url(self.context, u'@@manage')+'#tab2')
         return
 
@@ -2125,5 +2108,5 @@
         self.context.__parent__.__parent__.__parent__.logger.info(
             '%s - added: %s' % (ob_class, data['code']))
-        self.redirect(self.url(self.context, u'@@manage')+'?tab3')
+        self.redirect(self.url(self.context, u'@@manage')+'#tab3')
         return
 
@@ -2166,10 +2149,4 @@
 
     def update(self):
-        tabs.need()
-        self.tab1 = self.tab2 = ''
-        qs = self.request.get('QUERY_STRING', '')
-        if not qs:
-            qs = 'tab1'
-        setattr(self, qs, 'active')
         warning.need()
         datatable.need()
@@ -2239,10 +2216,4 @@
 
     def update(self):
-        tabs.need()
-        self.tab1 = self.tab2 = self.tab3 = ''
-        qs = self.request.get('QUERY_STRING', '')
-        if not qs:
-            qs = 'tab1'
-        setattr(self, qs, 'active')
         warning.need()
         datatable.need()
@@ -2301,5 +2272,5 @@
         ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
         grok.getSite().logger.info('%s - added: %s' % (ob_class, code))
-        self.redirect(self.url(self.context, u'@@manage')+'?tab2')
+        self.redirect(self.url(self.context, u'@@manage')+'#tab2')
         return
 
Index: /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/certificatemanagepage.pt
===================================================================
--- /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/certificatemanagepage.pt	(revision 10994)
+++ /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/certificatemanagepage.pt	(revision 10995)
@@ -2,26 +2,33 @@
       enctype="multipart/form-data" i18n:domain="waeup.kofa">
 
-  <ul class="tabs" data-tabs="tabs">
-    <li tal:attributes="class view/tab1"><a href="#tab-1" i18n:translate="">Settings</a></li>
-    <li tal:attributes="class view/tab2"><a href="#tab-2" i18n:translate="">Certificate Courses</a></li>
-    <li tal:attributes="class view/tab3"><a href="#tab-3" i18n:translate="">Local Roles</a></li>
+  <ul class="tabs nav nav-tabs" data-tabs="tabs">
+    <li class="active">
+      <a href="#tab1" data-toggle="tab" i18n:translate="">Settings</a>
+    </li>
+    <li>
+      <a href="#tab2" data-toggle="tab"
+         i18n:translate="">Certificate Courses</a>
+    </li>
+    <li>
+      <a href="#tab3" data-toggle="tab" i18n:translate="">Local Roles</a>
+    </li>
   </ul>
 
   <div class="tab-content">
-    <div id="tab-1" tal:attributes="class view/tab1">
-    <table class="form-table">
-      <tbody>
-        <tal:widgets content="structure provider:widgets" />
-      </tbody>
-    </table>
-    <div tal:condition="view/availableActions">
-      <span tal:repeat="action view/actions"
-            tal:omit-tag="">
-        <input tal:condition="python:action.label in view.taboneactions"
-               tal:replace="structure action/render"/>
-      </span>
+    <div id="tab1" class="active tab-pane">
+      <table class="form-table">
+        <tbody>
+          <tal:widgets content="structure provider:widgets" />
+        </tbody>
+      </table>
+      <div tal:condition="view/availableActions">
+        <span tal:repeat="action view/actions"
+              tal:omit-tag="">
+          <input tal:condition="python:action.label in view.taboneactions"
+                 tal:replace="structure action/render"/>
+        </span>
+      </div>
     </div>
-    </div>
-    <div id="tab-2" tal:attributes="class view/tab2">
+    <div id="tab2" class="tab-pane">
       <h3>
         <span tal:content="context/__name__">Code</span>
@@ -42,11 +49,11 @@
         <tbody>
           <tr tal:repeat="cc context/values" class="gradeC">
-             <td>
+            <td>
               <input type="checkbox" name="val_id"
-        		 tal:attributes="value cc/__name__" />
+                     tal:attributes="value cc/__name__" />
             </td>
-             <td>
+            <td>
               <span tal:content="cc/level">
-        	   LEVEL
+                LEVEL
               </span>
             </td>
@@ -54,5 +61,5 @@
             <td>
               <a tal:attributes="href python: view.url(cc)"
-        	     tal:content="cc/__name__">
+                 tal:content="cc/__name__">
             	REFERRER CODE
               </a>
@@ -60,5 +67,5 @@
             <td>
               <a tal:attributes="href python:view.url(cc.course)"
-        	     tal:content="cc/course/code">
+                 tal:content="cc/course/code">
             	COURSE CODE
               </a>
@@ -66,10 +73,10 @@
             <td>
               <span tal:content="cc/course/title">
-        	   COURSE TITLE
+                COURSE TITLE
               </span>
             </td>
             <td>
               <span tal:content="cc/mandatory">
-        	   REQUIRED
+                REQUIRED
               </span>
             </td>
@@ -85,5 +92,6 @@
       </div>
     </div>
-    <div id="tab-3" tal:attributes="class view/tab3"> <br />
+    <div id="tab3" class="tab-pane">
+      <br />
       <table class="display dataTableManage">
         <thead>
@@ -101,6 +109,6 @@
         <tbody>
           <tr tal:repeat="entry view/getUsersWithLocalRoles" class="gradeC"> <td>
-              <input type="checkbox" name="role_id"
-                tal:attributes="value python: entry['user_name']+'|'+entry['local_role']" /> </td>
+            <input type="checkbox" name="role_id"
+                   tal:attributes="value python: entry['user_name']+'|'+entry['local_role']" /> </td>
             <td tal:content="entry/user_name"> USERNAME </td>
             <td tal:content="entry/user_title"> USERTITLE </td>
@@ -112,35 +120,33 @@
         <span tal:repeat="action view/actions" tal:omit-tag="">
           <input tal:condition="python:action.label in view.tabthreeactions1"
-            tal:replace="structure action/render"/>
+                 tal:replace="structure action/render"/>
         </span>
-      </div><br /><br />
-      <table class="form-table">
-        <tr> <td>
+        </div><br /><br />
+        <table class="form-table">
+          <tr> <td>
             <select id="user" name="user">
               <option tal:repeat="user view/getUsers"
-                tal:attributes="value user/name">
-              <span tal:replace="user/val/title">USERTITLE
-              </span>
+                      tal:attributes="value user/name">
+                <span tal:replace="user/val/title">USERTITLE
+                </span>
               </option>
-            </select> </td> <td>
-            <select id="local_role" name="local_role">
-              <option tal:repeat="localrole view/getLocalRoles"
-                tal:attributes="value localrole/name">
-              <span tal:replace="localrole/title">LOCALROLETITLE
-              </span>
-              </option>
-            </select> </td> <td>
-            <div tal:condition="view/availableActions">
-              <span tal:repeat="action view/actions" tal:omit-tag="">
-                <input tal:condition="python:action.label in view.tabthreeactions2"
-                  tal:replace="structure action/render"/>
-              </span>
-            </div> </td>
-        </tr>
-      </table>
+              </select> </td> <td>
+              <select id="local_role" name="local_role">
+                <option tal:repeat="localrole view/getLocalRoles"
+                        tal:attributes="value localrole/name">
+                  <span tal:replace="localrole/title">LOCALROLETITLE
+                  </span>
+                </option>
+                </select> </td> <td>
+                <div tal:condition="view/availableActions">
+                  <span tal:repeat="action view/actions" tal:omit-tag="">
+                    <input tal:condition="python:action.label in view.tabthreeactions2"
+                           tal:replace="structure action/render"/>
+                  </span>
+                </div>
+              </td>
+          </tr>
+        </table>
     </div>
   </div>
 </form>
-
-
-
Index: /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/configurationmanagepage.pt
===================================================================
--- /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/configurationmanagepage.pt	(revision 10994)
+++ /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/configurationmanagepage.pt	(revision 10995)
@@ -1,14 +1,16 @@
 <form action="." tal:attributes="action request/URL" method="POST"
-  enctype="multipart/form-data" i18n:domain="waeup.kofa">
-    <ul class="tabs" data-tabs="tabs">
-      <li tal:attributes="class view/tab1">
-      <a href="#tab-1" i18n:translate="">Site Settings</a>
-      </li>
-      <li tal:attributes="class view/tab2">
-      <a href="#tab-2" i18n:translate="">Session Configurations</a>
-      </li>
-    </ul>
-    <div class="tab-content">
-    <div id="tab-1" tal:attributes="class view/tab1">
+      enctype="multipart/form-data" i18n:domain="waeup.kofa">
+  <ul class="tabs nav nav-tabs" data-tabs="tabs">
+    <li class="active">
+      <a href="#tab1" data-toggle="tab"
+         i18n:translate="">Site Settings</a>
+    </li>
+    <li>
+      <a href="#tab2"  data-toggle="tab"
+         i18n:translate="">Session Configurations</a>
+    </li>
+  </ul>
+  <div class="tab-content">
+    <div id="tab1" class="active tab-pane">
       <table class="form-table">
         <tbody>
@@ -23,5 +25,6 @@
       </div>
     </div>
-    <div id="tab-2" tal:attributes="class view/tab2"> <br />
+    <div id="tab2" class="tab-pane">
+      <br />
       <table class="display dataTableManage">
         <thead>
@@ -34,7 +37,10 @@
         </thead>
         <tbody>
-          <tr tal:repeat="entry view/getSessionConfigurations" class="gradeC"> <td>
-              <input type="checkbox" name="val_id" tal:attributes="value entry/name" /> </td> <td>
-              <a href="" tal:attributes="href entry/url" tal:content="entry/title">Name</a> </td>
+          <tr tal:repeat="entry view/getSessionConfigurations"
+              class="gradeC"> <td>
+            <input type="checkbox" name="val_id"
+                   tal:attributes="value entry/name" /> </td> <td>
+            <a href="" tal:attributes="href entry/url"
+               tal:content="entry/title">Name</a> </td>
           </tr>
         </tbody>
@@ -43,8 +49,8 @@
         <span tal:repeat="action view/actions" tal:omit-tag="">
           <input tal:condition="python:action.label in view.tabtwoactions"
-            tal:replace="structure action/render"/>
+                 tal:replace="structure action/render"/>
         </span>
       </div>
-    </div>
-  </div>
+    </div><!-- /tab2 -->
+  </div><!-- /tab-content -->
 </form>
Index: /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/coursemanagepage.pt
===================================================================
--- /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/coursemanagepage.pt	(revision 10994)
+++ /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/coursemanagepage.pt	(revision 10995)
@@ -2,25 +2,30 @@
       enctype="multipart/form-data" i18n:domain="waeup.kofa">
 
-  <ul class="tabs" data-tabs="tabs">
-    <li tal:attributes="class view/tab1"><a href="#tab-1" i18n:translate="">Settings</a></li>
-    <li tal:attributes="class view/tab2"><a href="#tab-3" i18n:translate="">Local Roles</a></li>
+  <ul class="tabs nav nav-tabs" data-tabs="tabs">
+    <li class="active">
+      <a href="#tab1" data-toggle="tab" i18n:translate="">Settings</a>
+    </li>
+    <li>
+      <a href="#tab3" data-toggle="tab" i18n:translate="">Local Roles</a>
+    </li>
   </ul>
 
   <div class="tab-content">
-    <div id="tab-1" tal:attributes="class view/tab1">
-    <table class="form-table">
-      <tbody>
-        <tal:widgets content="structure provider:widgets" />
-      </tbody>
-    </table>
-    <div tal:condition="view/availableActions">
-      <span tal:repeat="action view/actions"
-            tal:omit-tag="">
-        <input tal:condition="python:action.label in view.taboneactions"
-               tal:replace="structure action/render"/>
-      </span>
+    <div id="tab1" class="tab-pane active">
+      <table class="form-table">
+        <tbody>
+          <tal:widgets content="structure provider:widgets" />
+        </tbody>
+      </table>
+      <div tal:condition="view/availableActions">
+        <span tal:repeat="action view/actions"
+              tal:omit-tag="">
+          <input tal:condition="python:action.label in view.taboneactions"
+                 tal:replace="structure action/render"/>
+        </span>
+      </div>
     </div>
-    </div>
-    <div id="tab-3" tal:attributes="class view/tab2"> <br />
+    <div id="tab3" class="tab-pane">
+      <br />
       <table class="display dataTableManage">
         <thead>
@@ -38,6 +43,6 @@
         <tbody>
           <tr tal:repeat="entry view/getUsersWithLocalRoles" class="gradeC"> <td>
-              <input type="checkbox" name="role_id"
-                tal:attributes="value python: entry['user_name']+'|'+entry['local_role']" /> </td>
+            <input type="checkbox" name="role_id"
+                   tal:attributes="value python: entry['user_name']+'|'+entry['local_role']" /> </td>
             <td tal:content="entry/user_name"> USERNAME </td>
             <td tal:content="entry/user_title"> USERTITLE </td>
@@ -49,35 +54,32 @@
         <span tal:repeat="action view/actions" tal:omit-tag="">
           <input tal:condition="python:action.label in view.tabtwoactions1"
-            tal:replace="structure action/render"/>
+                 tal:replace="structure action/render"/>
         </span>
-      </div><br /><br />
-      <table class="form-table">
-        <tr> <td>
+        </div><br /><br />
+        <table class="form-table">
+          <tr> <td>
             <select id="user" name="user">
               <option tal:repeat="user view/getUsers"
-                tal:attributes="value user/name">
-              <span tal:replace="user/val/title">USERTITLE
-              </span>
+                      tal:attributes="value user/name">
+                <span tal:replace="user/val/title">USERTITLE
+                </span>
               </option>
-            </select> </td> <td>
-            <select id="local_role" name="local_role">
-              <option tal:repeat="localrole view/getLocalRoles"
-                tal:attributes="value localrole/name">
-              <span tal:replace="localrole/title">LOCALROLETITLE
-              </span>
-              </option>
-            </select> </td> <td>
-            <div tal:condition="view/availableActions">
-              <span tal:repeat="action view/actions" tal:omit-tag="">
-                <input tal:condition="python:action.label in view.tabtwoactions2"
-                  tal:replace="structure action/render"/>
-              </span>
-            </div> </td>
-        </tr>
-      </table>
+              </select> </td> <td>
+              <select id="local_role" name="local_role">
+                <option tal:repeat="localrole view/getLocalRoles"
+                        tal:attributes="value localrole/name">
+                  <span tal:replace="localrole/title">LOCALROLETITLE
+                  </span>
+                </option>
+                </select> </td> <td>
+                <div tal:condition="view/availableActions">
+                  <span tal:repeat="action view/actions" tal:omit-tag="">
+                    <input tal:condition="python:action.label in view.tabtwoactions2"
+                           tal:replace="structure action/render"/>
+                  </span>
+                </div> </td>
+          </tr>
+        </table>
     </div>
   </div>
 </form>
-
-
-
Index: /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/departmentmanagepage.pt
===================================================================
--- /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/departmentmanagepage.pt	(revision 10994)
+++ /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/departmentmanagepage.pt	(revision 10995)
@@ -1,22 +1,21 @@
 <form action="." tal:attributes="action request/URL" method="POST"
-  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="">Settings
-      </span></a>
+      i18n:domain="waeup.kofa" enctype="multipart/form-data">
+  <ul class="tabs nav nav-tabs" data-tabs="tabs">
+    <li class="active">
+      <a href="#tab1" data-toggle="tab">
+      <span i18n:translate="">Settings</span></a>
     </li>
-    <li tal:attributes="class view/tab2">
-    <a href="#tab-2" i18n:translate="">Courses</a>
+    <li>
+      <a href="#tab2"  data-toggle="tab" i18n:translate="">Courses</a>
     </li>
-    <li tal:attributes="class view/tab3">
-    <a href="#tab-3" i18n:translate="">Certificates</a>
+    <li>
+      <a href="#tab3"  data-toggle="tab" i18n:translate="">Certificates</a>
     </li>
-    <li tal:attributes="class view/tab4">
-    <a href="#tab-4" i18n:translate="">Local Roles</a>
+    <li>
+      <a href="#tab4"  data-toggle="tab" i18n:translate="">Local Roles</a>
     </li>
   </ul>
   <div class="tab-content">
-    <div id="tab-1" tal:attributes="class view/tab1">
+    <div id="tab1" class="active tab-pane">
       <table class="form-table">
         <tbody>
@@ -27,9 +26,10 @@
         <span tal:repeat="action view/actions" tal:omit-tag="">
           <input tal:condition="python:action.label in view.taboneactions"
-            tal:replace="structure action/render"/>
+                 tal:replace="structure action/render"/>
         </span>
       </div>
     </div>
-    <div id="tab-2" tal:attributes="class view/tab2"> <br />
+    <div id="tab2" class="tab-pane">
+      <br />
       <table class="display dataTableManage">
         <thead>
@@ -45,8 +45,8 @@
         <tbody>
           <tr tal:repeat="entry view/getCourses" class="gradeC"> <td>
-              <input type="checkbox" name="val_id"
-                tal:attributes="value entry/name" /> </td> <td>
-              <a href="" tal:attributes="href entry/url"
-                tal:content="entry/name">Name</a> </td>
+            <input type="checkbox" name="val_id"
+                   tal:attributes="value entry/name" /> </td> <td>
+            <a href="" tal:attributes="href entry/url"
+               tal:content="entry/name">Name</a> </td>
             <td tal:content="entry/container/title"> Title </td>
           </tr>
@@ -56,9 +56,10 @@
         <span tal:repeat="action view/actions" tal:omit-tag="">
           <input tal:condition="python:action.label in view.tabtwoactions"
-            tal:replace="structure action/render"/>
+                 tal:replace="structure action/render"/>
         </span>
       </div>
     </div>
-    <div id="tab-3" tal:attributes="class view/tab3"> <br />
+    <div id="tab3" class="tab-pane">
+      <br />
       <table class="display dataTableManage">
         <thead>
@@ -74,8 +75,8 @@
         <tbody>
           <tr tal:repeat="entry view/getCertificates" class="gradeC"> <td>
-              <input type="checkbox" name="val_id"
-                tal:attributes="value entry/name" /> </td> <td>
-              <a href="" tal:attributes="href entry/url"
-                tal:content="entry/name">Name</a> </td>
+            <input type="checkbox" name="val_id"
+                   tal:attributes="value entry/name" /> </td> <td>
+            <a href="" tal:attributes="href entry/url"
+               tal:content="entry/name">Name</a> </td>
             <td tal:content="entry/container/title"> Title  </td>
           </tr>
@@ -85,59 +86,60 @@
         <span tal:repeat="action view/actions" tal:omit-tag="">
           <input tal:condition="python:action.label in view.tabthreeactions"
-            tal:replace="structure action/render"/>
+                 tal:replace="structure action/render"/>
         </span>
       </div>
     </div>
-    <div id="tab-4" tal:attributes="class view/tab4"> <br />
-      <table class="display dataTableManage">
-        <thead>
-          <tr>
-            <th>&nbsp;
-            </th>
-            <th i18n:translate="">User Id
-            </th>
-            <th i18n:translate="">Name
-            </th>
-            <th i18n:translate="">Local Role
-            </th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr tal:repeat="entry view/getUsersWithLocalRoles" class="gradeC">
-            <td> <input type="checkbox" name="role_id"
-                tal:attributes="value python: entry['user_name']+'|'+entry['local_role']" /> </td>
-            <td tal:content="entry/user_name"> USERNAME </td>
-            <td tal:content="entry/user_title"> USERTITLE </td>
-            <td tal:content="entry/local_role_title"> LOCAL ROLE </td>
-          </tr>
-        </tbody>
-      </table>
-      <div tal:condition="view/availableActions">
-        <span tal:repeat="action view/actions" tal:omit-tag="">
-          <input tal:condition="python:action.label in view.tabfouractions1"
-            tal:replace="structure action/render"/>
-        </span>
+    <div id="tab4" class="tab-pane"> <br />
+    <table class="display dataTableManage">
+      <thead>
+        <tr>
+          <th>&nbsp;
+          </th>
+          <th i18n:translate="">User Id
+          </th>
+          <th i18n:translate="">Name
+          </th>
+          <th i18n:translate="">Local Role
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr tal:repeat="entry view/getUsersWithLocalRoles" class="gradeC">
+          <td> <input type="checkbox" name="role_id"
+          tal:attributes="value python: entry['user_name']+'|'+entry['local_role']" /> </td>
+          <td tal:content="entry/user_name"> USERNAME </td>
+          <td tal:content="entry/user_title"> USERTITLE </td>
+          <td tal:content="entry/local_role_title"> LOCAL ROLE </td>
+        </tr>
+      </tbody>
+    </table>
+    <div tal:condition="view/availableActions">
+      <span tal:repeat="action view/actions" tal:omit-tag="">
+        <input tal:condition="python:action.label in view.tabfouractions1"
+               tal:replace="structure action/render"/>
+      </span>
       </div> <br /><br />
       <table class="form-table">
         <tr> <td>
-            <select id="user" name="user">
-              <option tal:attributes="value user/name" tal:repeat="user view/getUsers">
+          <select id="user" name="user">
+            <option tal:attributes="value user/name" tal:repeat="user view/getUsers">
               <span tal:replace="user/val/title">USERTITLE
               </span>
-              </option>
+            </option>
             </select> </td> <td>
             <select id="local_role" name="local_role">
               <option tal:attributes="value localrole/name"
-                tal:repeat="localrole view/getLocalRoles">
-              <span tal:replace="localrole/title">LOCALROLETITLE
-              </span>
+                      tal:repeat="localrole view/getLocalRoles">
+                <span tal:replace="localrole/title">LOCALROLETITLE
+                </span>
               </option>
-            </select> </td> <td>
-            <div tal:condition="view/availableActions">
-              <span tal:repeat="action view/actions" tal:omit-tag="">
-                <input tal:condition="python:action.label in view.tabfouractions2"
-                  tal:replace="structure action/render"/>
-              </span>
-            </div> </td>
+              </select> </td> <td>
+              <div tal:condition="view/availableActions">
+                <span tal:repeat="action view/actions" tal:omit-tag="">
+                  <input tal:condition="python:action.label in view.tabfouractions2"
+                         tal:replace="structure action/render"/>
+                </span>
+              </div>
+            </td>
         </tr>
       </table>
Index: /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/departmentpage.pt
===================================================================
--- /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/departmentpage.pt	(revision 10994)
+++ /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/departmentpage.pt	(revision 10995)
@@ -1,12 +1,12 @@
-<ul i18n:domain="waeup.kofa" class="tabs" data-tabs="tabs">
-  <li class="active"><a href="#tab-1">
-   <span i18n:translate="">Courses</span></a>
+<ul i18n:domain="waeup.kofa" class="tabs nav nav-tabs" data-tabs="tabs">
+  <li class="active"><a href="#tab1" data-toggle="tab">
+    <span i18n:translate="">Courses</span></a>
   </li>
-  <li><a href="#tab-2">
+  <li><a href="#tab2" data-toggle="tab">
     <span i18n:translate="">Certificates</span></a>
   </li>
 </ul>
-<div  i18n:domain="waeup.kofa" class="tab-content">
-    <div id="tab-1" class="active">
+<div i18n:domain="waeup.kofa" class="tab-content">
+  <div id="tab1" class="active tab-pane">
     <br />
     <table class="display dataTable">
@@ -20,16 +20,16 @@
         <tr tal:repeat="entry view/getCourses" class="gradeC">
           <td>
-        	<a href=""
-        	   tal:attributes="href entry/url"
-        	   tal:content="entry/name">Name</a>
+            <a href=""
+               tal:attributes="href entry/url"
+               tal:content="entry/name">Name</a>
           </td>
           <td tal:content="entry/container/title">
-    	       Title
+            Title
           </td>
         </tr>
       </tbody>
     </table>
-    </div>
-    <div id="tab-2">
+  </div>
+  <div id="tab2" class="tab-pane">
     <br />
     <table class="display dataTable">
@@ -43,14 +43,14 @@
         <tr tal:repeat="entry view/getCertificates" class="gradeC">
           <td>
-        	<a href=""
-        	   tal:attributes="href entry/url"
-        	   tal:content="entry/name">Name</a>
+            <a href=""
+               tal:attributes="href entry/url"
+               tal:content="entry/name">Name</a>
           </td>
           <td tal:content="entry/container/title">
-    	       Title
+            Title
           </td>
         </tr>
       </tbody>
     </table>
-    </div>
+  </div>
 </div>
Index: /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/facultymanagepage.pt
===================================================================
--- /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/facultymanagepage.pt	(revision 10994)
+++ /main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/browser/templates/facultymanagepage.pt	(revision 10995)
@@ -1,17 +1,17 @@
 <form action="." tal:attributes="action request/URL"
   i18n:domain="waeup.kofa" method="POST" enctype="multipart/form-data">
-  <ul class="tabs" data-tabs="tabs">
-    <li tal:attributes="class view/tab1">
-    <a href="#tab-1">
+  <ul class="tabs nav nav-tabs" data-tabs="tabs">
+    <li class="active">
+    <a href="#tab1" data-toggle="tab">
       <span i18n:translate="">Settings
       </span></a>
     </li>
-    <li tal:attributes="class view/tab2">
-    <a href="#tab-2">
+    <li>
+    <a href="#tab2" data-toggle="tab">
       <span tal:content="view/subunits">CONTENTS
       </span> </a>
     </li>
-    <li tal:attributes="class view/tab3">
-    <a href="#tab-3">
+    <li>
+    <a href="#tab3" data-toggle="tab">
       <span i18n:translate="">Local Roles
       </span></a>
@@ -19,5 +19,5 @@
   </ul>
   <div class="tab-content">
-    <div id="tab-1" tal:attributes="class view/tab1">
+    <div id="tab1" class="active tab-pane">
       <table class="form-table">
         <tbody>
@@ -32,5 +32,5 @@
       </div>
     </div>
-    <div id="tab-2" tal:attributes="class view/tab2">
+    <div id="tab2" class="tab-pane">
       <h3 tal:content="view/subunits">DEPARTMENTS</h3>
       <table>
@@ -63,5 +63,5 @@
       </div>
     </div>
-    <div id="tab-3" tal:attributes="class view/tab3"> <br />
+    <div id="tab3" class="tab-pane"> <br />
       <table class="display dataTableManage">
         <thead>
@@ -78,5 +78,6 @@
         </thead>
         <tbody>
-          <tr tal:repeat="entry view/getUsersWithLocalRoles" class="gradeC"> <td>
+          <tr tal:repeat="entry view/getUsersWithLocalRoles" class="gradeC">
+            <td>
               <input type="checkbox" name="role_id"
               tal:attributes="value python: entry['user_name']+'|'+entry['local_role']" /> </td>
@@ -96,5 +97,6 @@
         <tr> <td>
             <select id="user" name="user">
-              <option tal:repeat="user view/getUsers" tal:attributes="value user/name">
+              <option tal:repeat="user view/getUsers"
+                      tal:attributes="value user/name">
               <span tal:replace="user/val/title">USERTITLE
               </span>
@@ -113,5 +115,6 @@
                        tal:replace="structure action/render"/>
               </span>
-            </div> </td>
+            </div>
+          </td>
         </tr>
       </table>
