Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/actionbutton.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/actionbutton.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/actionbutton.pt	(revision 11254)
@@ -1,3 +1,3 @@
-<a class="btn actionbar" tal:condition="viewlet/target_url"
+<a class="btn btn-default" tal:condition="viewlet/target_url"
    tal:attributes="href viewlet/target_url; onclick viewlet/onclick">
   <img src="" alt="edit"
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/breadcrumbs.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/breadcrumbs.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/breadcrumbs.pt	(revision 11254)
@@ -1,8 +1,5 @@
-<span tal:repeat="item viewlet/getEntries">
-  <li>
-    <a href="#" tal:attributes="href item/url">
-      <span tal:content="item/title">Entry</span>
-    </a>
-    <span tal:condition="not: repeat/item/end" class="divider">/</span>
-  </li>
-</span>
+<li tal:repeat="item viewlet/getEntries">
+  <a href="#" tal:attributes="href item/url">
+    <span tal:replace="item/title">Entry</span>
+  </a>
+</li>
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/certificatemanagepage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/certificatemanagepage.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/certificatemanagepage.pt	(revision 11254)
@@ -2,31 +2,35 @@
       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">
-      <h3>
-        <span tal:content="context/__name__">Code</span>
-        <span i18n:domain="waeup.kofa" i18n:translate="">Courses</span>
-      </h3>
-      <table class="display dataTableManage">
+    <div id="tab2" class="tab-pane">
+      <br />
+      <table class="kofa-data-table dataTableManage">
         <thead>
           <tr>
@@ -41,12 +45,12 @@
         </thead>
         <tbody>
-          <tr tal:repeat="cc context/values" class="gradeC">
-             <td>
+          <tr tal:repeat="cc context/values">
+            <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 +58,5 @@
             <td>
               <a tal:attributes="href python: view.url(cc)"
-        	     tal:content="cc/__name__">
+                 tal:content="cc/__name__">
             	REFERRER CODE
               </a>
@@ -60,5 +64,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 +70,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,6 +89,7 @@
       </div>
     </div>
-    <div id="tab-3" tal:attributes="class view/tab3"> <br />
-      <table class="display dataTableManage">
+    <div id="tab3" class="tab-pane">
+      <br />
+      <table class="kofa-data-table dataTableManage">
         <thead>
           <tr>
@@ -100,7 +105,7 @@
         </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>
+          <tr tal:repeat="entry view/getUsersWithLocalRoles"> <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 +117,37 @@
         <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>
-            <select id="user" name="user">
-              <option tal:repeat="user view/getUsers"
-                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>
+      <div class="form-inline">
+        <br />
+        <div class="form-group">
+          <select id="user" name="user" class="form-control">
+            <option tal:repeat="user view/getUsers"
+                    tal:attributes="value user/name">
+            <span tal:replace="user/val/title">USERTITLE
+            </span>
+            </option>
+          </select>
+        </div>
+        <div class="form-group">
+          <select id="local_role" name="local_role" class="form-control">
+            <option tal:repeat="localrole view/getLocalRoles"
+                    tal:attributes="value localrole/name">
+            <span tal:replace="localrole/title">LOCALROLETITLE
+            </span>
+            </option>
+          </select>
+        </div>
+        <div class="form-group">
+          <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>
+        </div>
+      </div>
     </div>
   </div>
 </form>
-
-
-
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/certificatepage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/certificatepage.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/certificatepage.pt	(revision 11254)
@@ -23,5 +23,5 @@
 </h3>
 <br />
-<table i18n:domain="waeup.kofa" class="display dataTable">
+<table i18n:domain="waeup.kofa" class="kofa-data-table dataTable">
 <thead>
   <tr>
@@ -35,5 +35,5 @@
 </thead>
 <tbody>
-  <tr tal:repeat="cc context/values" class="gradeC">
+  <tr tal:repeat="cc context/values">
      <td>
       <span tal:content="cc/level">
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/configurationmanagepage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/configurationmanagepage.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/configurationmanagepage.pt	(revision 11254)
@@ -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,6 +25,7 @@
       </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="kofa-data-table dataTableManage">
         <thead>
           <tr>
@@ -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">
+            <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/trunk/src/waeup/kofa/browser/templates/coursemanagepage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/coursemanagepage.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/coursemanagepage.pt	(revision 11254)
@@ -2,26 +2,31 @@
       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 />
-      <table class="display dataTableManage">
+    <div id="tab3" class="tab-pane">
+      <br />
+      <table class="kofa-data-table dataTableManage">
         <thead>
           <tr>
@@ -37,7 +42,7 @@
         </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>
+          <tr tal:repeat="entry view/getUsersWithLocalRoles"> <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,37 @@
         <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>
-            <select id="user" name="user">
-              <option tal:repeat="user view/getUsers"
-                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>
+      <div class="form-inline">
+        <br />
+        <div class="form-group">
+          <select id="user" name="user" class="form-control">
+            <option tal:repeat="user view/getUsers"
+                    tal:attributes="value user/name">
+            <span tal:replace="user/val/title">USERTITLE
+            </span>
+            </option>
+          </select>
+        </div>
+        <div class="form-group">
+          <select id="local_role" name="local_role" class="form-control">
+            <option tal:repeat="localrole view/getLocalRoles"
+                    tal:attributes="value localrole/name">
+            <span tal:replace="localrole/title">LOCALROLETITLE
+            </span>
+            </option>
+          </select>
+        </div>
+        <div class="form-group">
+          <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>
+        </div>
+      </div>
     </div>
   </div>
 </form>
-
-
-
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterexportpage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterexportpage.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterexportpage.pt	(revision 11254)
@@ -8,10 +8,10 @@
 <br />
 
-<form  method="POST">
+<form  method="POST" class="form-inline">
   <label for="exporter">
     Exporter (Data Type):
   </label>
-  <div class="input">
-    <select name="exporter">
+  <div class="form-group">
+    <select name="exporter" class="form-control half">
       <span tal:repeat="items view/getExporters" tal:omit-tag="">
         <option tal:define="name python: items[1]; title python: items[0]"
@@ -23,8 +23,11 @@
     </select>
   </div>
-  <br />
-  <div class="input">
-    <input i18n:translate="" type="submit" class="btn primary"
+  <div class="form-group">
+    <input i18n:translate="" type="submit" class="btn btn-primary"
       name="CREATE" tal:attributes="value view/export_button" />
+  </div>
+  <div class="form-group">
+  <input type="submit" name="CANCEL" class="btn btn-default"
+      tal:attributes="value view/cancel_button" />
   </div>
 </form>
@@ -39,5 +42,5 @@
 <br /><br />
 
-<table i18n:domain="waeup.kofa">
+<table i18n:domain="waeup.kofa" class="table table-condensed table-hover">
   <thead>
     <tr>
@@ -65,5 +68,5 @@
         <span tal:replace="job/creator">CREATOR</span>
       </td>
-      <td nowrap>
+      <td>
         <span tal:replace="job/start_time">DATETIME</span>
       </td>
@@ -72,18 +75,17 @@
       </td>
       <td nowrap>
-        <a href="" class="btn small" i18n:translate=""
+        <a href="" class="btn btn-default btn-xs" i18n:translate=""
            tal:condition="job/show_refresh_button">
-          <img tal:attributes="src static/actionicon_reload.png" />
+          <img src="/static/img/actionicon_reload.png" />
           Reload
         </a>
         <form method="POST">
-          <a href="" class="btn primary small"
+          <a href="" class="btn btn-primary btn-xs"
                  tal:attributes="href job/download_url"
                  tal:condition="job/show_download_button">
             Download</a>
-
           <input type="hidden" name="job_id"
                  tal:attributes="value job/job" />
-          <input type="submit" class="btn small"
+          <input type="submit" class="btn btn-default btn-xs"
                  name="DISCARD" value="Discard"
                  tal:condition="job/show_discard_button" />
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterfinishedpage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterfinishedpage.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterfinishedpage.pt	(revision 11254)
@@ -4,5 +4,5 @@
   imports. The files contain the imported datasets.
 </p>
-<table i18n:domain="waeup.kofa" class="display dataTableFiles">
+<table i18n:domain="waeup.kofa" class="kofa-data-table dataTableFiles">
   <thead>
     <tr>
@@ -13,5 +13,5 @@
   </thead>
   <tbody>
-    <tr tal:repeat="file context/getFinishedFiles" class="gradeC">
+    <tr tal:repeat="file context/getFinishedFiles">
       <td><a tal:attributes="href python: 'download?filename=' + file.rel_path"
              tal:content="file/name">FILENAME</a></td>
@@ -21,2 +21,6 @@
   </tbody>
 </table>
+<form method="POST">
+  <input i18n:translate="" type="submit" class="btn btn-default" name="CANCEL"
+      tal:attributes="value view/cancel_button"/>
+</form>
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterimport1page.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterimport1page.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterimport1page.pt	(revision 11254)
@@ -8,5 +8,5 @@
 </p>
 <form i18n:domain="waeup.kofa" method="POST">
-  <table>
+  <table class="table">
     <thead>
       <th />
@@ -20,5 +20,5 @@
         <td>
           <button i18n:translate=""
-            type="submit" name="select" class="btn primary"
+            type="submit" name="select" class="btn btn-primary"
             tal:attributes="value file/name">Select</button>
         </td>
@@ -30,5 +30,5 @@
     </tbody>
   </table>
-  <input type="submit" name="cancel" class="btn"
+  <input type="submit" name="cancel" class="btn btn-default"
       tal:attributes="value view/cancel_button" />
 </form>
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterimport2page.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterimport2page.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterimport2page.pt	(revision 11254)
@@ -9,25 +9,23 @@
     Please select a file-processor and a processing-mode from the selections below.
   </p>
-  <div>
-    <table tal:define="prev_table view/getPreviewTable;">
-      <thead>
-        <tr>
-          <th i18n:translate="">Header</th>
-          <th i18n:translate="">Sample Record 1</th>
-          <th i18n:translate="">Sample Record 2</th>
-          <th i18n:translate="">Sample Record 3</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr tal:repeat="row prev_table">
-          <td tal:repeat="value row"
-              tal:content="value"> value
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
+  <table tal:define="prev_table view/getPreviewTable;" class="table table-condensed">
+    <thead>
+      <tr>
+        <th i18n:translate="">Header</th>
+        <th i18n:translate="">Sample Record 1</th>
+        <th i18n:translate="">Sample Record 2</th>
+        <th i18n:translate="">Sample Record 3</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr tal:repeat="row prev_table">
+        <td tal:repeat="value row"
+            tal:content="value"> value
+        </td>
+      </tr>
+    </tbody>
+  </table>
   <div> <b i18n:translate="">Processor:</b>
-    <select name="importer">
+    <select name="importer" class="form-control">
       <option tal:repeat="importer view/getImporters"
           tal:attributes="value importer/name;
@@ -55,7 +53,7 @@
     </p>
   </div>
-  <input class="btn" type="submit" name="cancel" tal:attributes="value view/cancel_button" />
-  <input class="btn danger" type="submit" name="back1" tal:attributes="value view/back_button" />
-  <input class="btn primary"
+  <input class="btn btn-default" type="submit" name="cancel" tal:attributes="value view/cancel_button" />
+  <input class="btn btn-danger" type="submit" name="back1" tal:attributes="value view/back_button" />
+  <input class="btn btn-primary"
     tal:attributes="disabled python: view.getWarnings() and 'disabled' or ''; value view/proceed_button"
     type="submit" name="proceed" />
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterimport3page.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterimport3page.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterimport3page.pt	(revision 11254)
@@ -1,4 +1,4 @@
 <div i18n:domain="waeup.kofa" i18n:translate=""
-  class="alert-message success" tal:condition="not: view/getWarnings">
+  class="alert alert-success" tal:condition="not: view/getWarnings">
   Header fields OK
 </div>
@@ -29,8 +29,7 @@
 
   <div>
-
-
     <table tal:define="prev_table view/getPreviewTable;
-                       headers view/headerfields;">
+                       headers view/headerfields;"
+            class="table">
       <thead>
         <tr>
@@ -45,5 +44,5 @@
           </td>
           <td>
-            <select class="span4" name="headerfield">
+            <select name="headerfield" class="form-control">
               <option tal:repeat="opt view/getPossibleHeaders"
                 tal:attributes="value opt/value;
@@ -62,14 +61,14 @@
   </div>
 
-  <input class="btn" type="submit" name="cancel"
+  <input class="btn btn-default" type="submit" name="cancel"
     tal:attributes="value view/cancel_button" />
-  <input class="btn" type="reset" name="reset"
+  <input class="btn btn-default" type="reset" name="reset"
     tal:attributes="value view/reset_button" />
-  <input class="btn" type="submit" name="update"
+  <input class="btn btn-default" type="submit" name="update"
     tal:attributes="value view/update_button" />
   <br /><br />
-  <input class="btn danger" type="submit" name="back2"
+  <input class="btn btn-danger" type="submit" name="back2"
     tal:attributes="value view/back_button" />
-  <input class="btn primary"
+  <input class="btn btn-primary"
     tal:attributes="disabled python: view.getWarnings() and 'disabled' or ''; value view/proceed_button"
     type="submit" name="proceed"/>
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterimport4page.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterimport4page.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterimport4page.pt	(revision 11254)
@@ -15,5 +15,5 @@
 </p>
 <form method="POST" i18n:domain="waeup.kofa">
-  <input class="btn primary" type="submit" name="finish"
+  <input class="btn btn-primary" type="submit" name="finish"
     tal:attributes="value view/back_button" />
 </form>
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterlogspage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterlogspage.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterlogspage.pt	(revision 11254)
@@ -3,5 +3,5 @@
   Currently no log files are available.
   </p>
-  <table tal:condition="files" class="table condensed-table">
+  <table tal:condition="files" class="table">
     <thead>
       <tr>
@@ -17,12 +17,11 @@
     </thead>
     <tbody>
-      <tr tal:repeat="file files"
-          tal:attributes="class python: repeat['file'].odd() and 'odd' or 'even'">
-        <td class="text-center">
+      <tr tal:repeat="file files">
+        <td>
           <form method="POST" action="@@show">
-            <input i18n:translate="" type="submit" class="btn primary"
-		   name="show" tal:attributes="value view/show_button" />
+            <input i18n:translate="" type="submit" class="btn btn-primary"
+                   name="show" tal:attributes="value view/show_button" />
             <input type="hidden" name="logname"
-		   tal:attributes="value file/name" />
+                   tal:attributes="value file/name" />
           </form></td>
         <td tal:content="file/name">file.name</td>
@@ -33,8 +32,5 @@
   </table>
   <form method="POST">
-    <button class="btn primary">
-      <span i18n:translate="">Reload page</span>
-    </button>
-    <input i18n:translate="" type="submit" class="btn" name="back"
+    <input i18n:translate="" type="submit" class="btn btn-default" name="back"
         tal:attributes="value view/back_button"/>
   </form>
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterlogsshowfilepage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterlogsshowfilepage.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterlogsshowfilepage.pt	(revision 11254)
@@ -1,8 +1,8 @@
 <form method="post" class="form-horizontal">
-  <input type="text" name="query"
+  <input type="text" name="query" class="form-control"
 	 tal:attributes="value view/query; placeholder view/placeholder" />
-  <input class="btn primary" type="submit" name="search"
+  <input class="btn btn-primary" type="submit" name="search"
 	 tal:attributes="value view/search_button" />
-  <input class="btn" type="submit" name="back"
+  <input class="btn btn-default" type="submit" name="back"
 	 tal:attributes="value view/back_button" />
   <input type="hidden" name="logname"
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacentermanagepage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacentermanagepage.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacentermanagepage.pt	(revision 11254)
@@ -1,24 +1,30 @@
 <form  i18n:domain="waeup.kofa" method="POST">
-  <div>
-    <span  i18n:translate="">Storage path:</span>
-    <input type="text" name="newpath"
-     tal:attributes="value context/storage" />
-    <br /><br />
-    <span  i18n:translate="">
-    Copy existing data to new storage?
-    </span>&nbsp;&nbsp;
-    <input type="checkbox" name="move" checked="checked" />
-    <br /><br />
-    <span  i18n:translate="">
-    Overwrite contents in new location?
-    </span>&nbsp;&nbsp;
-    <input type="checkbox" name="overwrite" checked="no" />
-    <br /><br />
-    <input class="btn primary" type="submit" name="save"
-        tal:attributes="value view/save_button" />
-    <input class="btn" type="reset" name="reset"
-        tal:attributes="value view/reset_button" />
-    <input class="btn" type="submit" name="cancel"
-        tal:attributes="value view/cancel_button" />
+
+  <br />
+  <div class="form-group">
+    <label i18n:translate="">Storage path</label>
+        <input type="text" name="newpath" class="form-control"
+               tal:attributes="value context/storage" />
   </div>
+
+  <div class="checkbox">
+    <label>
+      <input type="checkbox" name="move"  checked="checked">
+      Copy existing data to new storage?
+    </label>
+  </div>
+
+  <div class="checkbox">
+    <label>
+      <input type="checkbox" name="overwrite">
+      Overwrite contents in new location?
+    </label>
+  </div>
+
+  <input class="btn btn-primary" type="submit" name="save"
+      tal:attributes="value view/save_button" />
+  <input class="btn btn-default" type="reset" name="reset"
+      tal:attributes="value view/reset_button" />
+  <input class="btn btn-default" type="submit" name="cancel"
+      tal:attributes="value view/cancel_button" />
 </form>
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterpage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterpage.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterpage.pt	(revision 11254)
@@ -11,5 +11,5 @@
 <form action="." tal:attributes="action request/URL" method="post"
       i18n:domain="waeup.kofa" enctype="multipart/form-data">
-    <table i18n:domain="waeup.kofa" class="display dataTableManageFiles">
+    <table i18n:domain="waeup.kofa" class="kofa-data-table dataTableManageFiles">
       <thead>
         <tr>
@@ -21,5 +21,5 @@
       </thead>
       <tbody>
-        <tr tal:repeat="file context/getPendingFiles" class="gradeC">
+        <tr tal:repeat="file context/getPendingFiles">
           <td>
             <input type="checkbox" name="val_id"
@@ -33,8 +33,8 @@
       </tbody>
     </table>
-      <div tal:condition="view/availableActions">
-        <span tal:repeat="action view/actions" tal:omit-tag="">
-          <input tal:replace="structure action/render"/>
-        </span>
-      </div>
+    <div tal:condition="view/availableActions">
+      <span tal:repeat="action view/actions" tal:omit-tag="">
+        <input tal:replace="structure action/render"/>
+      </span>
+    </div>
 </form>
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenteruploadpage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenteruploadpage.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenteruploadpage.pt	(revision 11254)
@@ -24,5 +24,5 @@
       </td>
       <td>
-        <select name="importer">
+        <select name="importer" class="form-control half">
           <option tal:repeat="importer view/getImporters"
               tal:attributes="value importer/title"
@@ -37,5 +37,5 @@
       </td>
       <td>
-        <select name="import_mode">
+        <select name="import_mode" class="form-control half">
           <option value='Create'>Create</option>
           <option value='Update'>Update</option>
@@ -44,17 +44,12 @@
       </td>
     </tr>
-    <tr>
-      <td>
-        <input class="btn primary" type="submit" name="SUBMIT"
-            tal:attributes="value view/upload_button" />
-        <input class="btn" type="submit" name="CANCEL"
-            tal:attributes="value view/cancel_button"/>
-      </td>
-      <td>
-      </td>
-    </tr>
   </table>
+  <br />
+  <input class="btn btn-primary" type="submit" name="SUBMIT"
+      tal:attributes="value view/upload_button" />
+  <input class="btn btn-default" type="submit" name="CANCEL"
+      tal:attributes="value view/cancel_button"/>
 </form>
-
+<br />
 <p i18n:translate="">
     Import managers will be automatically informed by email after file upload.
@@ -67,5 +62,5 @@
 <h2 i18n:translate="">Available Processors (Importers)</h2>
 
-<table i18n:domain="waeup.kofa">
+<table i18n:domain="waeup.kofa" class="table table-condensed">
   <thead>
     <tr>
@@ -74,9 +69,14 @@
       <th i18n:translate="">Optional Schema Fields</th>
       <th i18n:translate="">Non-Schema Fields</th>
-      <th i18n:translate="">CSV Skeleton File</th>
     </tr>
   </thead>
   <tr tal:repeat="importer view/getImporters">
-    <td tal:content="importer/title"></td>
+    <td>
+      <span tal:content="importer/title">TITLE</span><br /><br />
+      <a i18n:translate="" class="btn btn-primary btn-xs"
+         tal:attributes="href python: 'skeleton?name=' + importer['name']">
+         Download CSV Skeleton File
+      </a>
+    </td>
     <td nowrap>
       <span tal:repeat="field importer/fields">
@@ -110,8 +110,4 @@
     </td>
 
-    <td>
-      <a i18n:translate=""
-         tal:attributes="href python: 'skeleton?name=' + importer['name']">Download</a>
-    </td>
   </tr>
 </table>
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/departmentmanagepage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/departmentmanagepage.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/departmentmanagepage.pt	(revision 11254)
@@ -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,10 +26,11 @@
         <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 />
-      <table class="display dataTableManage">
+    <div id="tab2" class="tab-pane">
+      <br />
+      <table class="kofa-data-table dataTableManage">
         <thead>
           <tr>
@@ -44,9 +44,9 @@
         </thead>
         <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>
+          <tr tal:repeat="entry view/getCourses"> <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,10 +56,11 @@
         <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 />
-      <table class="display dataTableManage">
+    <div id="tab3" class="tab-pane">
+      <br />
+      <table class="kofa-data-table dataTableManage">
         <thead>
           <tr>
@@ -73,9 +74,9 @@
         </thead>
         <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>
+          <tr tal:repeat="entry view/getCertificates"> <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,10 +86,10 @@
         <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">
+    <div id="tab4" class="tab-pane"> <br />
+      <table class="kofa-data-table dataTableManage">
         <thead>
           <tr>
@@ -104,7 +105,7 @@
         </thead>
         <tbody>
-          <tr tal:repeat="entry view/getUsersWithLocalRoles" class="gradeC">
+          <tr tal:repeat="entry view/getUsersWithLocalRoles">
             <td> <input type="checkbox" name="role_id"
-                tal:attributes="value python: entry['user_name']+'|'+entry['local_role']" /> </td>
+            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>
@@ -116,30 +117,36 @@
         <span tal:repeat="action view/actions" tal:omit-tag="">
           <input tal:condition="python:action.label in view.tabfouractions1"
-            tal:replace="structure action/render"/>
+                 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">
-              <span tal:replace="user/val/title">USERTITLE
-              </span>
-              </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>
-              </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>
-        </tr>
-      </table>
+      <div class="form-inline">
+        <br />
+        <div class="form-group">
+          <select class="form-control" id="user" name="user">
+            <option tal:repeat="user view/getUsers"
+                    tal:attributes="value user/name">
+            <span tal:replace="user/val/title">USERTITLE
+            </span>
+            </option>
+          </select>
+        </div>
+        <div class="form-group">
+          <select class="form-control" 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>
+        </div>
+        <div class="form-group">
+          <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>
+        </div>
+      </div>
     </div>
   </div>
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/departmentpage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/departmentpage.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/departmentpage.pt	(revision 11254)
@@ -1,14 +1,14 @@
-<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">
+    <table class="kofa-data-table dataTable">
       <thead>
         <tr>
@@ -18,20 +18,20 @@
       </thead>
       <tbody>
-        <tr tal:repeat="entry view/getCourses" class="gradeC">
+        <tr tal:repeat="entry view/getCourses">
           <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">
+    <table class="kofa-data-table dataTable">
       <thead>
         <tr>
@@ -41,16 +41,16 @@
       </thead>
       <tbody>
-        <tr tal:repeat="entry view/getCertificates" class="gradeC">
+        <tr tal:repeat="entry view/getCertificates">
           <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/trunk/src/waeup/kofa/browser/templates/facultiescontainermanagepage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/facultiescontainermanagepage.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/facultiescontainermanagepage.pt	(revision 11254)
@@ -2,5 +2,5 @@
       enctype="multipart/form-data">
 
-  <table>
+  <table class="table table-hover">
     <thead>
       <tr>
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/facultymanagepage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/facultymanagepage.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/facultymanagepage.pt	(revision 11254)
@@ -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,7 +32,7 @@
       </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>
+      <table class="table table-hover">
         <thead>
           <tr>
@@ -63,6 +63,6 @@
       </div>
     </div>
-    <div id="tab-3" tal:attributes="class view/tab3"> <br />
-      <table class="display dataTableManage">
+    <div id="tab3" class="tab-pane"> <br />
+      <table class="kofa-data-table dataTableManage">
         <thead>
           <tr>
@@ -78,5 +78,6 @@
         </thead>
         <tbody>
-          <tr tal:repeat="entry view/getUsersWithLocalRoles" class="gradeC"> <td>
+          <tr tal:repeat="entry view/getUsersWithLocalRoles">
+            <td>
               <input type="checkbox" name="role_id"
               tal:attributes="value python: entry['user_name']+'|'+entry['local_role']" /> </td>
@@ -93,27 +94,32 @@
         </span>
       </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>
-              </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>
+      <div class="form-inline">
+        <br />
+        <div class="form-group">
+          <select id="user" name="user" class="form-control">
+            <option tal:repeat="user view/getUsers"
+                    tal:attributes="value user/name">
+            <span tal:replace="user/val/title">USERTITLE
+            </span>
+            </option>
+          </select>
+        </div>
+        <div class="form-group">
+          <select id="local_role" name="local_role" class="form-control">
+            <option tal:repeat="localrole view/getLocalRoles"
+                    tal:attributes="value localrole/name">
+            <span tal:replace="localrole/title">LOCALROLETITLE
+            </span>
+            </option>
+          </select>
+        </div>
+        <div class="form-group" 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>
+      </div>
+
     </div>
   </div>
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/facultypage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/facultypage.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/facultypage.pt	(revision 11254)
@@ -3,5 +3,5 @@
 </div>
 
-<table i18n:domain="waeup.kofa">
+<table class="table table-hover" i18n:domain="waeup.kofa">
   <thead>
     <tr>
@@ -12,5 +12,5 @@
   <tbody>
     <tr tal:repeat="value context/values">
-      <td> <a tal:attributes="href value/__name__">
+      <td> <a tal:attributes="href python: view.url(value)">
           <span tal:content="value/code">Name</span></a></td>
       <td tal:content="value/longtitle">Title</td>
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/filedisplay.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/filedisplay.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/filedisplay.pt	(revision 11254)
@@ -4,5 +4,5 @@
   </td>
   <td>
-    <a tal:attributes="href viewlet/download_name"
+    <a tal:attributes="href python: view.url(context, viewlet.download_name)"
        tal:content="viewlet/download_name"
        target="image">
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/fileupload.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/fileupload.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/fileupload.pt	(revision 11254)
@@ -5,5 +5,5 @@
   <td>
     <tal:file tal:condition="viewlet/file_exists">
-      <a tal:attributes="href viewlet/download_name"
+      <a tal:attributes="href python: view.url(context, viewlet.download_name)"
          tal:content="viewlet/title"
          target="image">
@@ -11,17 +11,16 @@
       </a>
     </tal:file>
+    <input type="file" tal:attributes="name viewlet/input_name"/>
     <br />
-    <input type="file" tal:attributes="name viewlet/input_name"/>
-    <br /><br />
     <input type="submit" tal:condition="viewlet/file_exists"
            tal:attributes="id python:('delete_%s' % viewlet.input_name);
               name python:('delete_%s' % viewlet.input_name);
               value viewlet/delete_button"
-           class="btn error" />
+           class="btn btn-danger" />
     <input type="submit"
              tal:attributes="id python:('upload_%s' % viewlet.input_name);
                 name python:('upload_%s' % viewlet.input_name);
                 value viewlet/upload_button"
-             class="btn primary" />
+             class="btn btn-primary" />
     <span i18n:translate="">
       Max. file size:
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/findstudentspage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/findstudentspage.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/findstudentspage.pt	(revision 11254)
@@ -1,50 +1,53 @@
-<form method="POST" i18n:domain="waeup.kofa">
+<form method="POST" i18n:domain="waeup.kofa" class="form-inline">
 <br />
-  <input class="btn primary" type="submit" name="search"
-    tal:attributes="value view/search_button" />
-
-  <select name="searchtype">
-    <option i18n:translate="" value="student_id">with id</option>
-    <option i18n:translate="" value="fullname">with name</option>
-    <option i18n:translate="" value="reg_number">with registration number</option>
-    <option i18n:translate="" value="matric_number">with matriculation number</option>
-  </select>
-
-  <input type="text" name="searchterm" />
-
-  <p>&nbsp;</p>
-  <div tal:condition="view/hitlist">
-    <h3 i18n:translate="">Search Results</h3>
-    <input type="hidden" name="old_searchterm"
-         tal:attributes="value view/searchterm" />
-    <input type="hidden" name="old_searchtype"
-         tal:attributes="value view/searchtype" />
-    <table class="display dataTable">
-      <thead>
-      <tr>
-        <th i18n:translate="">Student Id</th>
-        <th i18n:translate="">Reg. Number</th>
-        <th i18n:translate="">Matric. Number</th>
-        <th i18n:translate="">State</th>
-        <th i18n:translate="">Full Name</th>
-      </tr>
-      </thead>
-      <tbody>
-      <tr tal:repeat="item view/hitlist" class="gradeC">
-        <td> <a tal:attributes="href item/url">
-          <span tal:content="item/student_id">A123456</span></a>
-        </td>
-        <td class="center"> <a tal:attributes="href item/url">
-          <span tal:content="item/reg_number">9999999</span></a>
-        </td>
-        <td class="center"> <a tal:attributes="href item/url">
-          <span tal:content="item/matric_number">9999999</span></a>
-        </td>
-        <td tal:content="item/state">admitted</td>
-        <td tal:content="item/display_fullname">Bob</td>
-      </tr>
-      </tbody>
-    </table>
-    <br />
+  <div class="form-group">
+    <input class="btn btn-primary" type="submit" name="search"
+      tal:attributes="value view/search_button" />
+  </div>
+  <div class="form-group">
+    <select name="searchtype" class="form-control">
+      <option i18n:translate="" value="student_id">with id</option>
+      <option i18n:translate="" value="fullname">with name</option>
+      <option i18n:translate="" value="reg_number">with registration number</option>
+      <option i18n:translate="" value="matric_number">with matriculation number</option>
+    </select>
+  </div>
+  <div class="form-group">
+    <input type="text" class="form-control" name="searchterm" />
   </div>
 </form>
+
+<p>&nbsp;</p>
+<div tal:condition="view/hitlist">
+  <h3 i18n:translate="">Search Results</h3>
+  <input type="hidden" name="old_searchterm"
+       tal:attributes="value view/searchterm" />
+  <input type="hidden" name="old_searchtype"
+       tal:attributes="value view/searchtype" />
+  <table class="kofa-data-table dataTable">
+    <thead>
+    <tr>
+      <th i18n:translate="">Student Id</th>
+      <th i18n:translate="">Reg. Number</th>
+      <th i18n:translate="">Matric. Number</th>
+      <th i18n:translate="">State</th>
+      <th i18n:translate="">Full Name</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr tal:repeat="item view/hitlist">
+      <td> <a tal:attributes="href item/url">
+        <span tal:content="item/student_id">A123456</span></a>
+      </td>
+      <td class="center"> <a tal:attributes="href item/url">
+        <span tal:content="item/reg_number">9999999</span></a>
+      </td>
+      <td class="center"> <a tal:attributes="href item/url">
+        <span tal:content="item/matric_number">9999999</span></a>
+      </td>
+      <td tal:content="item/state">admitted</td>
+      <td tal:content="item/display_fullname">Bob</td>
+    </tr>
+    </tbody>
+  </table>
+</div>
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/loginpage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/loginpage.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/loginpage.pt	(revision 11254)
@@ -1,37 +1,21 @@
-<form i18n:domain="waeup.kofa" method="post">
-  <table id="login" class="form-table" summary="Table for entering login information">
-    <tbody>
-      <tr>
-        <td i18n:translate="" class="fieldname">
-          User Name or Id:
-        </td>
-        <td>
-          <input type="text" id="login" name="form.login" size="20" />
-        </td>
-      </tr>
-      <tr>
-        <td i18n:translate="" class="fieldname">
-          Password:
-        </td>
-        <td>
-          <input type="password" id="password" name="form.password"  size="20" value="" />
-          &nbsp;&nbsp;
-          </td>
-      </tr>
-      <tr>
-        <td>&nbsp;</td>
-        <td>
-          <font  i18n:translate="" color="red"> Notice: User names, Ids and passwords are case sensitive.</font>
-        </td>
-      </tr>
-    </tbody>
-  </table>
+<form i18n:domain="waeup.kofa" method="post" class="form-horizontal">
+  <br />
+  <div class="form-group">
+    <label i18n:translate="" class="col-sm-2 control-label">User Name or Id</label>
+    <div class="col-sm-10">
+      <input name="form.login" type="text" class="form-control" id="login">
+    </div>
+  </div>
+  <div class="form-group">
+    <label i18n:translate="" class="col-sm-2 control-label">Password</label>
+    <div class="col-sm-10">
+      <input name="form.password" type="password" class="form-control" id="password">
+      <font  i18n:translate="" color="red"> Notice: User names, Ids and passwords are case sensitive.</font>
+    </div>
+  </div>
   <input type="hidden" name="camefrom"   tal:attributes="value view/camefrom" />
-  <input class="btn primary" type="submit" name="SUBMIT"
+  <input class="btn btn-primary" type="submit" name="SUBMIT"
     tal:attributes="value view/login_button" />
-
-
   <br /><br /><br />
-
   <p  i18n:translate="login_trouble1">Don't forget to logout or exit your browser when you're done.
     If you are having trouble logging in, make sure to enable  cookies in your web browser.
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/reportscontainercreate.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/reportscontainercreate.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/reportscontainercreate.pt	(revision 11254)
@@ -8,25 +8,20 @@
   </p>
   <br />
-  <div class="clearfix">
-    <label for="generator">Report Type:</label>
-    <div class="input">
-      <select name="generator">
-        <span tal:repeat="items view/creators" tal:omit-tag="">
-          <option
-              tal:define="name python: items[1]; title python: items[0]"
-              tal:attributes="value name">
-            <span tal:replace="title">TITLE</span>
-          </option>
-        </span>
-      </select>
-      <div class="help-inline" i18n:translate="">
-        Type of report to create
-      </div>
-    </div>
+  <div class="form-group">
+    <label for="generator">Report Type</label>
+    <select name="generator" class="form-control half">
+      <span tal:repeat="items view/creators" tal:omit-tag="">
+        <option
+            tal:define="name python: items[1]; title python: items[0]"
+            tal:attributes="value name">
+          <span tal:replace="title">TITLE</span>
+        </option>
+      </span>
+    </select>
   </div>
-  <div class="input">
-    <input i18n:translate="" type="submit" class="btn primary"
+  <div class="form-group">
+    <input i18n:translate="" type="submit" class="btn btn-primary"
            name="START_GENERATOR" value="Configure" />
-    <a class="btn secondary" href=""
+    <a class="btn btn-default" href=""
        tal:attributes="href python:view.url(context)">Cancel</a>
   </div>
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/reportscontainerpage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/reportscontainerpage.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/reportscontainerpage.pt	(revision 11254)
@@ -1,3 +1,3 @@
-<table i18n:domain="waeup.kofa">
+<table i18n:domain="waeup.kofa" class="table">
   <thead>
     <tr>
@@ -31,13 +31,13 @@
           <input type="hidden" name="job_id"
                  tal:attributes="value python: entry[0]" />
-          <input type="submit" class="btn small primary"
+          <input type="submit" class="btn btn-sm btn-primary"
                  name="DOWNLOAD" value="Download"
                  tal:condition="python: entry[4]" />
-          <input type="submit" class="btn small secondary"
+          <input type="submit" class="btn btn-sm btn-default"
                  name="DISCARD" value="Discard"
                  tal:condition="python: entry[3]" />
-          <a href="" class="btn" i18n:translate=""
+          <a href="" class="btn btn-sm btn-default" i18n:translate=""
              tal:condition="python: entry[5]">
-            <img tal:attributes="src static/actionicon_reload.png" />
+            <img src="/static/img/actionicon_reload.png" />
             Reload
           </a>
@@ -48,8 +48,7 @@
 </table>
 <form method="POST" i18n:domain="waeup.kofa">
-  <div class="span12">
-    <a href="create" class="btn primary" i18n:translate="">
-      Create new report
-    </a>
-  </div>
+  <a tal:attributes="href python:view.url(context, 'create')"
+     class="btn btn-primary" i18n:translate="">
+    Create new report
+  </a>
 </form>
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/searchpage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/searchpage.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/searchpage.pt	(revision 11254)
@@ -1,12 +1,17 @@
-<form method="post">
-  <input type="text" name="query"
-	 tal:attributes="value view/query" />
-    <input class="btn primary" type="submit" name="SUBMIT"
+<form method="POST" class="form-inline">
+<br />
+  <div class="form-group">
+      <input type="text" name="query" class="form-control"
+    	 tal:attributes="value view/query" />
+  </div>
+  <div class="form-group">
+    <input class="btn btn-primary" type="submit" name="SUBMIT"
       tal:attributes="value view/search_button"/>
+  </div>
 </form>
 <br />
 <span  i18n:domain="waeup.kofa" tal:condition="view/hitlist">
     <h3 i18n:translate="">Search Results</h3>
-    <table class="display dataTable">
+    <table class="kofa-data-table dataTable">
         <thead>
             <tr>
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/staffsitelayout.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/staffsitelayout.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/staffsitelayout.pt	(revision 11254)
@@ -2,7 +2,11 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" i18n:domain="waeup.kofa">
   <head>
+
+    <!-- Diazo element-->
     <title i18n:translate="">
       WAeUP.Kofa - Student Management System
-    </title>
+    </title>  
+    <!-- /Diazo element-->
+
     <!--base href="http://localhost:8080/app/@@page"
      tal:attributes="href python: view.url(layout.site)" / -->
@@ -14,121 +18,130 @@
             href python: view.url(layout.site, 'feed.rss')" />
   </head>
-  <body>
-    <div class="topbar" data-scrollspy="scrollspy" >
-      <div class="topbar-inner">
-        <div class="container-fluid">
-          <a class="brand" href="#"
-              tal:attributes="href python: view.url(layout.site)"
-              tal:content="layout/getAppAcronym">ACRONYM</a>
-          <ul class="nav kofa-navbar-left">
-            <tal:primary_nav content="structure provider:primary_nav" />
-          </ul>
-          <ul class="nav secondary-nav kofa-navbar-right">
-            <li tal:condition="not: layout/isAuthenticated">
-            <a href="#" i18n:translate=""
-                tal:attributes="href python: view.url(layout.site, 'login')">
-                Login
-            </a>
-            </li>
-            <li tal:condition="layout/isAuthenticated">
-            <a href="#" i18n:translate=""
-               tal:attributes="href python: view.url(layout.site, '@@contactadmin')">
-               Contact
-            </a>
-            </li>
-            <li tal:condition="layout/isAuthenticated">
-            <a href="#" i18n:translate=""
-               tal:attributes="href python: view.url(context, '@@logout')">
-               Logout
-            </a>
-            </li>
-          </ul>
-          <span class="language"
-                tal:define="langs provider:languages"
-                tal:condition="langs">
-            <tal:languages
-                  tal:content="structure langs" /> |
-          </span>
-        </div>
-      </div>
-    </div>
 
+  <!-- Diazo element-->
+  <body class="kofa-body">
+
+    <!-- Diazo element-->
+    <a class="kofa-brand-link" href="#"
+        tal:attributes="href python: view.url(layout.site)"
+        tal:content="layout/getAppAcronym">ACRONYM
+    </a>
+    <!-- /Diazo element-->
+
+    <!-- Diazo element-->
+    <ul class="nav kofa-navbar-left"> 
+      <tal:primary_nav content="structure provider:primary_nav" />
+    </ul>
+    <!-- /Diazo element-->
+
+    <!-- Diazo element-->
+    <ul class="nav secondary-nav kofa-navbar-right">
+      <li tal:condition="not: layout/isAuthenticated">
+      <a href="#" i18n:translate=""
+          tal:attributes="href python: view.url(layout.site, 'login')">
+          Login
+      </a>
+      </li>
+      <li tal:condition="layout/isAuthenticated">
+      <a href="#" i18n:translate=""
+         tal:attributes="href python: view.url(layout.site, '@@contactadmin')">
+         Contact
+      </a>
+      </li>
+      <li tal:condition="layout/isAuthenticated">
+      <a href="#" i18n:translate=""
+         tal:attributes="href python: view.url(context, '@@logout')">
+         Logout
+      </a>
+      </li>
+    </ul>
+    <!-- /Diazo element-->
+
+    <span tal:define="langs provider:languages"
+          tal:condition="langs"
+          class="language">
+      <tal:languages tal:content="structure langs" /> |
+    </span>
+
+    <!-- Diazo element-->
     <ul class="breadcrumb">
       <tal:breadcrumbs
             tal:condition="python: layout.isAuthenticated()"
             tal:content="structure provider:breadcrumbs" />
-      <span
-        tal:condition="layout/getStudentName" class="wfstatus">
-          <span i18n:translate="">Student Id:</span>
-          <span tal:replace="python:context.student.student_id">
-            ID
-          </span>&nbsp;&nbsp;
-          <span i18n:translate="">State:</span>
-          <span tal:replace="python:context.student.translated_state">
-            STATE
-          </span>
-      </span>
     </ul>
+    <!-- /Diazo element-->
 
-    <div class="container-fluid">
-      <div class="sidebar">
-        <div class="well">
-          <div tal:condition="layout/getStudentName">
-            <h5 tal:content="layout/getStudentName">STUDENTNAME</h5>
-            <ul>
-              <tal:left content="structure provider:left_studentmanage" />
-            </ul>
-          </div>
-          <div tal:condition="layout/isAuthenticated">
-            <h5 tal:content="layout/getUserTitle">USERNAME</h5>
-            <ul>
-              <tal:left content="structure provider:left_manage" />
-            </ul>
-          </div>
+    <!-- Diazo element-->
+    <span tal:condition="layout/getStudentName">
+      <div class="wfstatus">
+            <span tal:replace="python:context.student.student_id">
+              Id
+            </span>
+            &bull;
+            <span tal:replace="python:context.student.translated_state">
+              State
+            </span>
+      </div>
+    </span>
+    <!-- /Diazo element-->
+
+    <!-- Diazo element-->
+    <div class="sidebar well">
+        <div tal:condition="layout/getStudentName">
+          <div class="kofa-sidebar-title" tal:content="layout/getStudentName">STUDENTNAME</div>
+          <ul class="nav">
+            <tal:left content="structure provider:left_studentmanage" />
+          </ul>
+        </div>
+        <div tal:condition="layout/isAuthenticated">
+          <div class="kofa-sidebar-title" tal:content="layout/getUserTitle">USERNAME</div>
+          <ul class="nav">
+            <tal:left content="structure provider:left_manage" />
+          </ul>
+      </div>
+    </div>
+    <!-- /Diazo element-->
+
+    <!-- Diazo element-->
+    <div class="kofa-content">
+      <div class="actionbar" tal:condition="provider:actionbar">
+        <tal:actionbar content="structure provider:actionbar" />&nbsp;
+      </div>
+      <div
+          tal:define="message context/@@messages"
+          tal:condition="python: len(message)>11">
+        <div tal:content="structure message">
         </div>
       </div>
-      <div class="span13 content">
-        <div class="actionbar" tal:condition="provider:actionbar">
-          <tal:actionbar content="structure provider:actionbar" />&nbsp;
-        </div>
-        <div
-            tal:define="message context/@@messages"
-            tal:condition="python: len(message)>11">
-          <div tal:content="structure message">
-          </div>
-        </div>
-        <div class="alert-message error"
-          tal:define="status view/status|nothing"
-          tal:condition="status">
-          <span tal:content="view/status">
-            FORM STATUS SUMMARY
-          </span>:
-          <ul id="alert-error" tal:condition="view/errors">
-            <li tal:repeat="error view/error_views">
-               <span tal:replace="structure error">Error Type</span>
-            </li>
-          </ul>
-        </div>
-        <div class="pull-right">
-          <a i18n:translate="" href="#footer">Back to bottom</a>
-        </div>
-        <h1 class="kofa-content-label"
-            tal:condition="view/label|nothing"
-            tal:content="structure view/label">LABEL</h1>
-        <div tal:content="structure view/content"> THE CONTENT
-        </div>
-        <div id="footer" class="footer">
-          <div class="pull-right">
-            <a i18n:translate="" href="#">Back to top</a>
-          </div>
-          <div i18n:translate="">
-            Kofa - Student Management System
-          </div>
-          <div i18n:translate="">
-            Copyright &copy; WAeUP Group 2008-2014
-          </div>
-        </div>
+      <div class="alert alert-danger"
+        tal:define="status view/status|nothing"
+        tal:condition="status">
+        <span tal:content="view/status">
+          FORM STATUS SUMMARY
+        </span>:
+        <ul id="alert-error" tal:condition="view/errors">
+          <li tal:repeat="error view/error_views">
+             <span tal:replace="structure error">Error Type</span>
+          </li>
+        </ul>
       </div>
+      <div class="pull-right">
+        <a i18n:translate="" href="#bottom">Back to bottom</a>
+      </div>
+      <h1 class="kofa-content-label"
+          tal:condition="view/label|nothing"
+          tal:content="structure view/label">LABEL</h1>
+      <div tal:content="structure view/content"> THE CONTENT
+      </div>
+      <div id="bottom" class="pull-right">
+        <a i18n:translate="" href="#">Back to top</a>
+      </div>
+      <br />
+
     </div>
+    <!-- /Diazo element-->
+
   </body>
+  <!-- /Diazo element-->
+
 </html>
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/studentsitelayout.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/studentsitelayout.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/studentsitelayout.pt	(revision 11254)
@@ -17,103 +17,112 @@
             href python: view.url(layout.site, 'feed.rss')" />
   </head>
-  <body>
-    <div class="topbar" data-scrollspy="scrollspy" >
-      <div class="topbar-inner">
-        <div  class="container">
-          <a class="brand" href="#"
-              tal:attributes="href python: view.url(layout.site)"
-              tal:content="layout/getAppAcronym">ACRONYM</a>
-          <ul class="nav kofa-navbar-left">
-              <tal:primary_nav content="structure provider:primary_nav" />
-              <tal:primary_nav content="structure provider:primary_nav_student" />
-          </ul>
-          <ul class="nav secondary-nav kofa-navbar-right">
-            <li tal:condition="not: layout/isAuthenticated">
-            <a href="#" i18n:translate=""
-               tal:attributes="href python: view.url(layout.site, 'login')">
-                Login
-            </a>
-            </li>
-            <li tal:condition="layout/isAuthenticated">
-            <a href="#" i18n:translate=""
-               tal:attributes="href python: view.url(layout.site, '@@contactadmin')">
-                Contact
-            </a>
-            </li>
-            <li tal:condition="layout/isAuthenticated">
-            <a href="#" i18n:translate=""
-               tal:attributes="href python: view.url(context, '@@logout')">
-               Logout
-            </a>
-            </li>
-          </ul>
-          <span class="language"
-                tal:define="langs provider:languages"
-                tal:condition="langs">
-            <tal:languages
-                  tal:content="structure langs" /> |
-          </span>
-        </div>
-      </div>
-    </div>
 
-    <div class="container">
-      <ul class="student-info-bar" tal:condition="layout/isAuthenticated">
-        <tal:breadcrumbs
-              tal:condition="python: layout.isAuthenticated()"
-              tal:content="structure provider:breadcrumbs" />
-        <span tal:condition="layout/getStudentName" class="wfstatus">
+  <!-- Diazo element-->
+  <body class="kofa-body">
+
+    <!-- Diazo element-->
+    <a class="kofa-brand-link" href="#"
+        tal:attributes="href python: view.url(layout.site)"
+        tal:content="layout/getAppAcronym">ACRONYM</a>
+    <!-- /Diazo element-->
+
+    <!-- Diazo element-->
+    <ul class="nav kofa-navbar-left">
+        <tal:primary_nav content="structure provider:primary_nav" />
+        <tal:primary_nav content="structure provider:primary_nav_student" />
+    </ul>
+    <!-- /Diazo element-->
+
+    <!-- Diazo element-->
+    <ul class="nav secondary-nav kofa-navbar-right">
+      <li tal:condition="not: layout/isAuthenticated">
+      <a href="#" i18n:translate=""
+         tal:attributes="href python: view.url(layout.site, 'login')">
+          Login
+      </a>
+      </li>
+      <li tal:condition="layout/isAuthenticated">
+      <a href="#" i18n:translate=""
+         tal:attributes="href python: view.url(layout.site, '@@contactadmin')">
+          Contact
+      </a>
+      </li>
+      <li tal:condition="layout/isAuthenticated">
+      <a href="#" i18n:translate=""
+         tal:attributes="href python: view.url(context, '@@logout')">
+         Logout
+      </a>
+      </li>
+    </ul>
+    <!-- Diazo element-->
+
+    <span tal:define="langs provider:languages"
+          tal:condition="langs"
+          class="language">
+      <tal:languages tal:content="structure langs" /> |
+    </span>
+
+    <!-- Diazo element-->
+    <ul class="breadcrumb" tal:condition="layout/isAuthenticated">
+      <tal:breadcrumbs
+            tal:condition="python: layout.isAuthenticated()"
+            tal:content="structure provider:breadcrumbs" />
+    </ul>
+    <!-- /Diazo element-->
+
+    <!-- Diazo element-->
+    <span tal:condition="layout/getStudentName">
+      <div class="wfstatus">
             <span tal:replace="python:context.student.student_id">
               Id
             </span>
-            |
+            &bull;
             <span tal:replace="python:context.student.translated_state">
               State
             </span>
-        </span>
-      </ul>
-      <div class="content">
-        <div class="actionbar" tal:condition="provider:actionbar">
-          <tal:actionbar content="structure provider:actionbar" />&nbsp;
-        </div>
-        <div tal:define="message context/@@messages"
-             tal:condition="python: len(message)>11">
-          <div tal:content="structure message">
-          </div>
-        </div>
-        <div class="alert-message error"
-          tal:define="status view/status|nothing"
-          tal:condition="status">
-          <span tal:content="view/status">
-            FORM STATUS SUMMARY
-          </span>:
-          <ul id="alert-error" tal:condition="view/errors">
-            <li tal:repeat="error view/error_views">
-               <span tal:replace="structure error">Error Type</span>
-            </li>
-          </ul>
-        </div>
-        <div class="pull-right">
-          <a i18n:translate="" href="#footer">Back to bottom</a>
-        </div>
-        <h1 class="kofa-content-label"
-            tal:condition="view/label|nothing"
-            tal:content="structure view/label">Label</h1>
-        <div tal:content="structure view/content">
-          THE CONTENT
-        </div>
-        <div id="footer" class="footer">
-          <div class="pull-right">
-            <a i18n:translate="" href="#">Back to top</a>
-          </div>
-          <div i18n:translate="">
-            Kofa - Student Management System
-          </div>
-          <div i18n:translate="">
-            Copyright &copy; WAeUP Group 2008-2014
-          </div>
+      </div>
+    </span>
+    <!-- /Diazo element-->
+
+    <!-- Diazo element-->
+    <div class="kofa-content">
+      <div class="actionbar" tal:condition="provider:actionbar">
+        <tal:actionbar content="structure provider:actionbar" />&nbsp;
+      </div>
+      <div tal:define="message context/@@messages"
+           tal:condition="python: len(message)>11">
+        <div tal:content="structure message">
         </div>
       </div>
+      <div class="alert alert-danger"
+        tal:define="status view/status|nothing"
+        tal:condition="status">
+        <span tal:content="view/status">
+          FORM STATUS SUMMARY
+        </span>:
+        <ul id="alert-error" tal:condition="view/errors">
+          <li tal:repeat="error view/error_views">
+             <span tal:replace="structure error">Error Type</span>
+          </li>
+        </ul>
+      </div>
+      <div class="pull-right">
+        <a i18n:translate="" href="#bottom">Back to bottom</a>
+      </div>
+      <h1 class="kofa-content-label"
+          tal:condition="view/label|nothing"
+          tal:content="structure view/label">Label</h1>
+      <div tal:content="structure view/content">
+        THE CONTENT
+      </div>
+      <div id="bottom" class="pull-right">
+        <a i18n:translate="" href="#">Back to top</a>
+      </div>
+      <br />
     </div>
+    <!-- /Diazo element-->
+
   </body>
+  <!-- /Diazo element-->
+
 </html>
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/usereditformpage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/usereditformpage.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/usereditformpage.pt	(revision 11254)
@@ -9,5 +9,5 @@
         <td i18n:translate="" class="fieldname">Password:</td>
         <td>
-          <input name="password" type="password"  />
+          <input class="form-control" name="password" type="password"  />
         </td>
       </tr>
@@ -15,5 +15,5 @@
         <td i18n:translate="" class="fieldname">Retype Password:</td>
         <td>
-          <input name="control_password" type="password" />
+          <input class="form-control" name="control_password" type="password" />
         </td>
       </tr>
Index: main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/userscontainerpage.pt
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/userscontainerpage.pt	(revision 10900)
+++ main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/userscontainerpage.pt	(revision 11254)
@@ -1,6 +1,6 @@
-<table i18n:domain="waeup.kofa" class="display dataTable">
+<table i18n:domain="waeup.kofa" class="kofa-data-table dataTable">
   <thead>
     <tr>
-      <th i18n:translate="">User Id</th>
+      <th i18n:translate="">Id</th>
       <th i18n:translate="">Name</th>
       <th i18n:translate="">Portal Roles</th>
@@ -19,7 +19,7 @@
           <input type="hidden" name="userid"
            tal:attributes="value account/name"/>
-            <input class="btn" type="submit" name="manage"
+            <input class="btn btn-sm btn-primary" type="submit" name="manage"
               tal:attributes="value view/manage_button" />
-            <input class="btn" type="submit" name="delete"
+            <input class="btn btn-sm btn-default" type="submit" name="delete"
               tal:attributes="value view/delete_button" />
         </form>
