Index: /main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser.py	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser.py	(revision 7459)
@@ -32,4 +32,5 @@
     )
 from waeup.sirp.accesscodes.catalog import search
+from waeup.sirp.browser.layout import action
 
 grok.context(ISIRPObject)
@@ -66,5 +67,5 @@
     grok.require('waeup.manageACBatches')
 
-    title = 'Create Access Code Batch'
+    label = 'Create Access Code Batch'
     pnav = 0
 
@@ -72,10 +73,10 @@
         'prefix', 'entry_num', 'cost')
 
-    @grok.action('Cancel')
+    @action('Cancel')
     def cancel(self, *args, **kw):
         self.flash('Batch creation cancelled.')
         self.redirect(self.url(self.context))
 
-    @grok.action('Create batch')
+    @action('Create batch')
     def createBatch(self, **data):
         creator = self.request.principal.id
Index: /main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser.txt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser.txt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser.txt	(revision 7459)
@@ -58,5 +58,5 @@
     <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     ...
-    <h2>Access Code Batches</h2>
+    ...<h2>Access Code Batches</h2>
     ...
     ... The following batches are available:
@@ -106,5 +106,5 @@
     <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     ...
-    <h2>Access Code Batches</h2>
+    ...<h2>Access Code Batches</h2>
     ...
     ... The following batches are available:
@@ -155,5 +155,5 @@
     <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     ...
-    <li ...>Archived APP-2 (APP-2_archive-...-zope.mgr.csv)</li>
+    <div ...>Archived APP-2 (APP-2_archive-...-zope.mgr.csv)</div>
     ...
 
@@ -165,5 +165,5 @@
     <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     ...
-    <li ...>No batch selected.</li>
+    <div ...>No batch selected.</div>
     ...
 
@@ -345,5 +345,5 @@
     >>> print browser.contents
     <!DOCTYPE html ...
-    <li class="message">APP-1-<10-DIGITS> disabled.</li>
+    ...APP-1-<10-DIGITS> disabled.</div>
     ...
 
@@ -355,5 +355,5 @@
     >>> print browser.contents
     <!DOCTYPE html ...
-    <li ...>APP-1-<10-DIGITS>: Disable transition not allowed.</li>
+    <div ...>APP-1-<10-DIGITS>: Disable transition not allowed.</div>
     ...
 
@@ -365,5 +365,5 @@
     >>> print browser.contents
     <!DOCTYPE html ...
-    <li class="message">APP-1-<10-DIGITS> (re-)enabled.</li>
+    ...APP-1-<10-DIGITS> (re-)enabled.</div>
     ...
 
@@ -375,5 +375,5 @@
     >>> print browser.contents
     <!DOCTYPE html ...
-    <li ...>APP-1-<10-DIGITS>: Re-enable transition not allowed.</li>
+    <div ...>APP-1-<10-DIGITS>: Re-enable transition not allowed.</div>
     ...
 
Index: /main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser_templates/admintaskacbatches.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser_templates/admintaskacbatches.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser_templates/admintaskacbatches.pt	(revision 7459)
@@ -2,4 +2,4 @@
 <a href=""
    tal:attributes="href viewlet/link_target"
-   tal:content="viewlet/link_title">Manage Users</a>
+   tal:content="viewlet/link_title">Manage</a>
 </p>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser_templates/batchcontainer.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser_templates/batchcontainer.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser_templates/batchcontainer.pt	(revision 7459)
@@ -15,6 +15,5 @@
     </thead>
     <tbody>
-      <tr tal:repeat="batch context/values"
-    tal:attributes="class python: repeat['batch'].odd() and 'even' or 'odd'">
+      <tr tal:repeat="batch context/values">
   <td>
     <input type="checkbox" name="batches" value="batch/prefix"
@@ -42,5 +41,5 @@
     </tbody>
   </table>
-  <input type="submit" name="archive" value="Archive" />
-  <input type="submit" name="delete" value="Archive and Delete" />
+  <input type="submit" class="btn" name="archive" value="Archive" />
+  <input type="submit" class="btn" name="delete" value="Archive and Delete" />
 </form>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser_templates/reimportbatchpage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser_templates/reimportbatchpage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser_templates/reimportbatchpage.pt	(revision 7459)
@@ -1,6 +1,4 @@
 <h3>Reimport Access Code Batches</h3>
-<p>
-  Please select the files to reimport. Please note, that batches with
-  same name have to be deleted before.
+<p> Please select the files to reimport. Please note, that batches with  same name have to be deleted before.
 </p>
 <form method="POST">
@@ -8,24 +6,21 @@
     <thead>
       <tr>
-        <th>&nbsp;</th>
-  <th>File</th>
+        <th>&nbsp;
+        </th>
+        <th>File
+        </th>
       </tr>
     </thead>
     <tbody>
-      <tr tal:repeat="filename context/getImportFiles"
-    tal:attributes="class python: repeat['filename'].odd() and 'even' or 'odd'">
-  <td>
-    <input type="checkbox" name="filenames" value="filename"
-     tal:attributes="value filename" />
-  </td>
-  <td tal:content="filename">file.name</td>
+      <tr tal:repeat="filename context/getImportFiles"  tal:attributes="class python: repeat['filename'].odd() and 'even' or 'odd'"> <td>
+          <input type="checkbox" name="filenames" value="filename"  tal:attributes="value filename" /> </td>
+        <td tal:content="filename">file.name</td>
       </tr>
       <tr tal:condition="python: len(list(context.getImportFiles())) == 0">
-  <td colspan="5"><b>No import batches available</b></td>
+        <td colspan="5"><b>No import batches available</b></td>
       </tr>
     </tbody>
   </table>
-
-  <input type="submit" name="cancel" value="Cancel" />
-  <input type="submit" name="reimport" value="Reimport" />
+  <input type="submit" class="btn primary" name="reimport" value="Reimport" />
+  <input type="submit" class="btn" name="cancel" value="Cancel" />
 </form>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser_templates/searchpage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser_templates/searchpage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser_templates/searchpage.pt	(revision 7459)
@@ -3,5 +3,5 @@
 <br />
 
-  <input type="submit" name="search" value="Search" />
+  <input type="submit" class="btn primary" name="search" value="Search" />
   for access codes
 
@@ -46,7 +46,7 @@
       </tbody>
     </table>
-    <div class="actionButtons">
-        <input type="submit" name="disable" value="Disable ACs" />
-        <input type="submit" name="enable" value="Enable ACs" />
+    <div>
+      <input type="submit" class="btn" name="disable" value="Disable ACs" />
+      <input type="submit" class="btn" name="enable" value="Enable ACs" />
     </div>
 
Index: /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py	(revision 7459)
@@ -38,5 +38,6 @@
 from waeup.sirp.browser.interfaces import ICaptchaManager
 from waeup.sirp.browser.breadcrumbs import Breadcrumb
-from waeup.sirp.browser.layout import NullValidator, jsaction
+from waeup.sirp.browser.layout import (
+    NullValidator, jsaction, action, UtilityView)
 from waeup.sirp.browser.pages import add_local_role, del_local_roles
 from waeup.sirp.browser.resources import datepicker, tabs, datatable, warning
@@ -120,19 +121,19 @@
         return
 
-    @grok.action('Add applicants container', validator=NullValidator)
+    @action('Add applicants container', validator=NullValidator)
     def addApplicantsContainer(self, **data):
         self.redirect(self.url(self.context, '@@add'))
         return
 
-    @grok.action('Cancel', validator=NullValidator)
+    @action('Cancel', validator=NullValidator)
     def cancel(self, **data):
         self.redirect(self.url(self.context))
         return
 
-    @grok.action('Add local role', validator=NullValidator)
+    @action('Add local role', validator=NullValidator)
     def addLocalRole(self, **data):
         return add_local_role(self,2, **data)
 
-    @grok.action('Remove selected local roles')
+    @action('Remove selected local roles')
     def delLocalRoles(self, **data):
         return del_local_roles(self,2,**data)
@@ -156,5 +157,5 @@
         return super(ApplicantsContainerAddFormPage, self).update()
 
-    @grok.action('Add applicants container')
+    @action('Add applicants container')
     def addApplicantsContainer(self, **data):
         year = data['year']
@@ -178,5 +179,5 @@
         return
 
-    @grok.action('Cancel', validator=NullValidator)
+    @action('Cancel', validator=NullValidator)
     def cancel(self, **data):
         self.redirect(self.url(self.context, '@@manage') + '#tab-1')
@@ -280,5 +281,5 @@
         return get_users_with_local_roles(self.context)
 
-    @grok.action('Save')
+    @action('Save')
     def apply(self, **data):
         self.applyData(self.context, **data)
@@ -310,19 +311,19 @@
         return
 
-    @grok.action('Add applicant', validator=NullValidator)
+    @action('Add applicant', validator=NullValidator)
     def addApplicant(self, **data):
         self.redirect(self.url(self.context, 'addapplicant'))
         return
 
-    @grok.action('Cancel', validator=NullValidator)
+    @action('Cancel', validator=NullValidator)
     def cancel(self, **data):
         self.redirect(self.url(self.context))
         return
 
-    @grok.action('Add local role', validator=NullValidator)
+    @action('Add local role', validator=NullValidator)
     def addLocalRole(self, **data):
         return add_local_role(self,3, **data)
 
-    @grok.action('Remove selected local roles')
+    @action('Remove selected local roles')
     def delLocalRoles(self, **data):
         return del_local_roles(self,3,**data)
@@ -345,5 +346,5 @@
         return "Applicants Container: %s" % self.context.title
 
-    @grok.action('Create application record')
+    @action('Create application record')
     def addApplicant(self, **data):
         applicant = createObject(u'waeup.Applicant')
@@ -409,5 +410,5 @@
         'applicant_id', 'firstname', 'lastname','email', 'course1')
 
-class CreateStudentPage(grok.View):
+class CreateStudentPage(UtilityView, grok.View):
     """Create a student object from applicatnt data
     and copy applicant object.
@@ -426,5 +427,5 @@
         return
 
-class AcceptanceFeePaymentAddPage(grok.View):
+class AcceptanceFeePaymentAddPage(UtilityView, grok.View):
     """ Page to add an online payment ticket
     """
@@ -493,5 +494,5 @@
             self.context.__parent__.display_fullname,self.context.p_id)
 
-class OnlinePaymentCallbackPage(grok.View):
+class OnlinePaymentCallbackPage(UtilityView, grok.View):
     """ Callback view
     """
@@ -525,5 +526,5 @@
         return
 
-class ExportPDFPaymentSlipPage(grok.View):
+class ExportPDFPaymentSlipPage(UtilityView, grok.View):
     """Deliver a PDF slip of the context.
     """
@@ -552,5 +553,5 @@
             self.context.__parent__, applicantview)
 
-class ExportPDFPage(grok.View):
+class ExportPDFPage(UtilityView, grok.View):
     """Deliver a PDF slip of the context.
     """
@@ -671,5 +672,5 @@
             dict(name=x, title=y) for x, y in allowed_transitions]
 
-    @grok.action('Save')
+    @action('Save')
     def save(self, **data):
         form = self.request.form
@@ -739,6 +740,6 @@
     # We explicitely want the forms to be validated before payment tickets
     # can be created. If no validation is requested, use
-    # 'validator=NullValidator' in the grok.action directive
-    @grok.action('Add online payment ticket')
+    # 'validator=NullValidator' in the action directive
+    @action('Add online payment ticket')
     def addPaymentTicket(self, **data):
         self.redirect(self.url(self.context, '@@addafp'))
@@ -763,4 +764,5 @@
     form_fields['date_of_birth'].custom_widget = FriendlyDateWidget('le-year')
     form_fields['phone'].custom_widget = PhoneWidget
+    form_fields['applicant_id'].for_display = True
     grok.template('applicanteditpage')
     manage_applications = False
@@ -808,6 +810,6 @@
     # We explicitely want the forms to be validated before payment tickets
     # can be created. If no validation is requested, use
-    # 'validator=NullValidator' in the grok.action directive
-    @grok.action('Add online payment ticket')
+    # 'validator=NullValidator' in the action directive
+    @action('Add online payment ticket')
     def addPaymentTicket(self, **data):
         self.redirect(self.url(self.context, '@@addafp'))
@@ -820,5 +822,5 @@
         return
 
-    @grok.action('Save')
+    @action('Save')
     def save(self, **data):
         if self.passport_changed is False:  # False is not None!
@@ -828,5 +830,5 @@
         return
 
-    @grok.action('Final Submit')
+    @action('Final Submit')
     def finalsubmit(self, **data):
         if self.passport_changed is False:  # False is not None!
@@ -903,5 +905,5 @@
         return
 
-    @grok.action('Get login credentials')
+    @action('Get login credentials')
     def register(self, **data):
         if not self.captcha_result.is_valid:
Index: /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantdisplaypage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantdisplaypage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantdisplaypage.pt	(revision 7459)
@@ -13,5 +13,5 @@
 <img src="" tal:attributes="src view/passport_url" />
 
-<table class="zebra">
+<table class="form-table">
   <tbody>
     <tal:block repeat="widget view/widgets">
@@ -26,5 +26,5 @@
     </tal:block>
     <tr>
-      <td class="fieldname" width="33%">
+      <td class="fieldname">
           Admitted Course of Study:
       </td>
@@ -44,5 +44,5 @@
 </table>
 <h3 i18n:translate="">Acceptance Fee Payment Tickets</h3>
-<table class="zebra">
+<table>
   <thead>
     <tr>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicanteditpage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicanteditpage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicanteditpage.pt	(revision 7459)
@@ -1,4 +1,4 @@
 <form action="." tal:attributes="action request/URL" method="post"
-      class="edit-form" enctype="multipart/form-data">
+      enctype="multipart/form-data">
 
   <h2 i18n:translate=""
@@ -14,5 +14,5 @@
   </div>
 
-  <div class="form-status"
+  <div class="alert-message error"
     tal:define="status view/status"
     tal:condition="status">
@@ -23,16 +23,14 @@
   </div>
 
-  <table class="zebra">
+  <table class="form-table">
     <tbody>
       <tal:block repeat="widget view/widgets">
         <tr>
-          <td class="label">
-            <label tal:attributes="for widget/name">
-              <span class="required" tal:condition="widget/required">*</span>
-              <span i18n:translate="" tal:content="widget/label">label</span>:
-            </label>
+          <td class="fieldname">
+            <span tal:condition="widget/required">*</span>
+            <span i18n:translate="" tal:content="widget/label">label</span>:
           </td>
-          <td class="field">
-            <span class="widget" tal:content="structure widget">
+          <td>
+            <span tal:content="structure widget">
               <input type="text" />
             </span>
@@ -41,5 +39,5 @@
             </tal:error>
             <tal:hint tal:condition="widget/hint">
-              <span class="hint" tal:content="structure widget/hint">hint</span>
+              <span tal:content="structure widget/hint">hint</span>
             </tal:hint>
           </td>
@@ -47,20 +45,18 @@
       </tal:block>
       <tr>
-        <td class="label">
-          <label i18n:translate="" for="form.passport">Photograph</label>
+        <td class="fieldname">
+          Photograph
         </td>
-        <td class="field">
-          <span class="widget">
-            <img src="passport.jpg" /><br />
-            <input type="file" name="form.passport" />
-            <br />
-            <span i18n:translate="">
-              Max. file size:
-              <span tal:replace="view/max_upload_size">10 KB</span>
-            </span>
+        <td>
+          <img src="passport.jpg" /><br />
+          <input type="file" name="form.passport" />
+          <br />
+          <span i18n:translate="">
+            Max. file size:
+            <span tal:replace="view/max_upload_size">10 KB</span>
           </span>
       </tr>
       <tr tal:condition="view/manage_applications">
-        <td class="label"><label>Password:</label></td>
+        <td class="fieldname">Password:</td>
         <td>
           <input name="password" type="password"  />
@@ -68,5 +64,5 @@
       </tr>
       <tr tal:condition="view/manage_applications">
-        <td class="label"><label>Retype password:</label></td>
+        <td class="fieldname">Retype password:</td>
         <td>
           <input name="control_password" type="password" />
@@ -74,5 +70,5 @@
       </tr>
       <tr tal:condition="view/manage_applications">
-        <td class="label"><label>Application Transition:</label></td>
+        <td class="fieldname">Application Transition:</td>
         <td>
           <select id="transition" name="transition">
@@ -88,5 +84,5 @@
 
   <div tal:condition="not: view/manage_applications">
-    <input class="checkboxType" id="confirm_passport" name="confirm_passport"
+    <input id="confirm_passport" name="confirm_passport"
            type="checkbox" value="True"/>
     I confirm that the Passport Photograph uploaded on this form is a
@@ -94,5 +90,5 @@
   </div>
 
-  <div class="actionButtons" tal:condition="view/availableActions">
+  <div tal:condition="view/availableActions">
     <span tal:repeat="action view/actions"
           tal:omit-tag="">
@@ -105,5 +101,5 @@
   <h3 i18n:translate="">Acceptance Fee Payment Tickets</h3>
 
-  <table class="display dataTableManage">
+  <table>
     <thead>
     <tr>
@@ -136,5 +132,5 @@
   </table>
 
-  <div class="actionButtons" tal:condition="view/availableActions">
+  <div tal:condition="view/availableActions">
     <span tal:repeat="action view/actions"
           tal:omit-tag="">
Index: /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantregister.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantregister.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantregister.pt	(revision 7459)
@@ -1,4 +1,4 @@
 <form action="." tal:attributes="action request/URL" method="post"
-      class="edit-form" enctype="multipart/form-data">
+      enctype="multipart/form-data">
 
   <h2 i18n:translate=""
@@ -6,5 +6,5 @@
     tal:content="view/label">Label</h2>
 
-  <div class="form-status"
+  <div class="alert-message error"
     tal:define="status view/status"
     tal:condition="status">
@@ -15,16 +15,14 @@
   </div>
 
-  <table class="zebra">
+  <table class="form-table">
     <tbody>
       <tal:block repeat="widget view/widgets">
         <tr>
-          <td class="label">
-            <label tal:attributes="for widget/name">
-              <span class="required" tal:condition="widget/required">*</span>
-              <span i18n:translate="" tal:content="widget/label">label</span>:
-            </label>
+          <td class="fieldname">
+            <span tal:condition="widget/required">*</span>
+            <span i18n:translate="" tal:content="widget/label">label</span>:
           </td>
-          <td class="field">
-            <span class="widget" tal:content="structure widget">
+          <td>
+            <span tal:content="structure widget">
               <input type="text" />
             </span>
@@ -33,5 +31,5 @@
             </tal:error>
             <tal:hint tal:condition="widget/hint">
-              <span class="hint" tal:content="structure widget/hint">hint</span>
+              <span tal:content="structure widget/hint">hint</span>
             </tal:hint>
           </td>
@@ -54,5 +52,5 @@
     credentials will be sent to the address provided.
   </p>
-  <div class="actionButtons" tal:condition="view/availableActions">
+  <div tal:condition="view/availableActions">
     <input tal:repeat="action view/actions"
            tal:replace="structure action/render"
Index: /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontaineraddpage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontaineraddpage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontaineraddpage.pt	(revision 7459)
@@ -6,5 +6,5 @@
     tal:content="view/label">Label</h2>
 
-  <div class="form-status"
+  <div class="alert-message error"
     tal:define="status view/status"
     tal:condition="status">
@@ -15,16 +15,14 @@
   </div>
 
-  <table class="zebra">
+  <table class="form-table">
     <tbody>
       <tal:block repeat="widget view/widgets">
         <tr>
-          <td class="label">
-            <label tal:attributes="for widget/name">
-              <span class="required" tal:condition="widget/required">*</span>
-              <span i18n:translate="" tal:content="widget/label">label</span>:
-            </label>
+          <td class="fieldname">
+            <span tal:condition="widget/required">*</span>
+            <span i18n:translate="" tal:content="widget/label">label</span>:
           </td>
-          <td class="field">
-            <span class="widget" tal:content="structure widget">
+          <td>
+            <span tal:content="structure widget">
               <input type="text" />
             </span>
@@ -33,5 +31,5 @@
             </tal:error>
             <tal:hint tal:condition="widget/hint">
-              <span class="hint" tal:content="structure widget/hint">hint</span>
+              <span tal:content="structure widget/hint">hint</span>
             </tal:hint>
           </td>
@@ -41,5 +39,5 @@
   </table>
 
-  <div class="actionButtons" tal:condition="view/availableActions">
+  <div tal:condition="view/availableActions">
     <input tal:repeat="action view/actions"
              tal:replace="structure action/render"
Index: /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontainermanagepage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontainermanagepage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontainermanagepage.pt	(revision 7459)
@@ -1,40 +1,39 @@
 <form action="." tal:attributes="action request/URL" method="POST"  class="edit-form" enctype="multipart/form-data">
   <h2 i18n:translate="" tal:condition="view/label" tal:content="view/label">Label</h2>
-  <div class="form-status"  tal:define="status view/status"  tal:condition="status"> Form Status:
+  <div class="alert-message error"  tal:define="status view/status"  tal:condition="status"> Form Status:
     <span i18n:translate="" tal:content="view/status"> Form status summary
     </span>
   </div>
-  <div id="tabs">
-    <ul>
-      <li>
-      <a href="#tab-1">
-        <span>Settings
-        </span></a>
-      </li>
-      <li>
-      <a href="#tab-2">
-        <span>Applicants
-        </span></a>
-      </li>
-      <li>
-      <a href="#tab-3">
-        <span>Local Roles
-        </span></a>
-      </li>
-    </ul>
-    <div id="tab-1">
-      <table class="zebra">
+  <ul class="tabs" data-tabs="tabs">
+    <li class="active">
+    <a href="#tab-1">
+      <span>Settings
+      </span></a>
+    </li>
+    <li>
+    <a href="#tab-2">
+      <span>Applicants
+      </span></a>
+    </li>
+    <li>
+    <a href="#tab-3">
+      <span>Local Roles
+      </span></a>
+    </li>
+  </ul>
+  <div class="tab-content">
+    <div id="tab-1" class="active">
+      <table class="form-table">
         <tbody>
           <tal:block repeat="widget view/widgets">
             <tr>
-              <td class="label">
-                <label tal:attributes="for widget/name">
-                  <span class="required" tal:condition="widget/required">*
-                  </span>
-                  <span i18n:translate="" tal:content="widget/label">label
-                  </span>:
-                </label> </td>
-              <td class="field">
-                <span class="widget" tal:content="structure widget">
+              <td class="fieldname">
+                <span tal:condition="widget/required">*
+                </span>
+                <span i18n:translate="" tal:content="widget/label">label
+                </span>:
+              </td>
+              <td>
+                <span tal:content="structure widget">
                   <input type="text" />
                 </span>
@@ -44,5 +43,5 @@
                 </tal:error>
                 <tal:hint tal:condition="widget/hint">
-                  <span class="hint" tal:content="structure widget/hint">hint
+                  <span  tal:content="structure widget/hint">hint
                   </span>
                 </tal:hint> </td>
@@ -51,5 +50,5 @@
         </tbody>
       </table>
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <div  tal:condition="view/availableActions">
         <span tal:repeat="action view/actions" tal:omit-tag="">
           <input tal:condition="python:action.label in view.taboneactions"
@@ -98,5 +97,5 @@
         </tbody>
       </table>
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <div tal:condition="view/availableActions">
         <span tal:repeat="action view/actions" tal:omit-tag="">
           <input tal:condition="python:action.label in view.tabtwoactions"
@@ -120,5 +119,5 @@
         </thead>
         <tbody>
-          <tr tal:repeat="entry view/getUsersWithLocalRoles" class="gradeB"> <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>
@@ -129,5 +128,5 @@
         </tbody>
       </table>
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <div tal:condition="view/availableActions">
         <span tal:repeat="action view/actions" tal:omit-tag="">
           <input tal:condition="python:action.label in view.tabthreeactions1"
@@ -135,5 +134,5 @@
         </span>
       </div> <br /><br />
-      <table class="zebra">
+      <table class="form-table">
         <tr> <td>
             <select id="user" name="user">
Index: /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontainerpage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontainerpage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantscontainerpage.pt	(revision 7459)
@@ -5,5 +5,5 @@
 <br />
 
-<table class="zebra" tal:condition="layout/isAuthenticated">
+<table class="form-table" tal:condition="layout/isAuthenticated">
   <tbody>
     <tal:block repeat="widget view/widgets">
@@ -13,5 +13,5 @@
           <tal:block replace="python:widget.label"/>:
         </td>
-        <td class="field">
+        <td>
           <tal:block tal:replace="structure widget" />
         </td>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantsrootmanagepage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantsrootmanagepage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantsrootmanagepage.pt	(revision 7459)
@@ -1,4 +1,4 @@
 <h2 i18n:translate="" tal:condition="view/label" tal:content="view/label">Label</h2>
-<div class="form-status" tal:define="status view/status" tal:condition="status">
+<div tal:define="status view/status" tal:condition="status" class="alert-message error">
   <div i18n:translate="" tal:content="view/status"> Form status summary
   </div>
@@ -10,19 +10,19 @@
   </ul>
 </div>
-<form action="." tal:attributes="action request/URL" method="POST"  class="edit-form" enctype="multipart/form-data">
-  <div id="tabs">
-    <ul>
-      <li>
-      <a href="#tab-1">
-        <span tal:content="view/subunits">Contents
-        </span></a>
-      </li>
-      <li>
-      <a href="#tab-2">
-        <span>Local Roles
-        </span></a>
-      </li>
-    </ul>
-    <div id="tab-1">
+<form action="." tal:attributes="action request/URL" method="POST"  enctype="multipart/form-data">
+  <ul class="tabs" data-tabs="tabs">
+    <li class="active">
+    <a href="#tab-1">
+      <span tal:content="view/subunits">Contents
+      </span></a>
+    </li>
+    <li>
+    <a href="#tab-2">
+      <span>Local Roles
+      </span></a>
+    </li>
+  </ul>
+  <div class="tab-content">
+    <div id="tab-1" class="active">
       <h3 tal:content="view/subunits">Applicants Containers</h3>
       <table class="display dataTableManage">
@@ -40,5 +40,5 @@
         </thead>
         <tbody>
-          <tr tal:repeat="entry context/values" 	class="gradeB"> <td>
+          <tr tal:repeat="entry context/values" 	class="gradeC"> <td>
               <input type="checkbox" name="val_id"   tal:attributes="value entry/__name__" /> </td>
             <td tal:content="entry/year">Year </td> <td>
@@ -48,5 +48,5 @@
         </tbody>
       </table>
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <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"/>
@@ -69,5 +69,5 @@
         </thead>
         <tbody>
-          <tr tal:repeat="entry view/getUsersWithLocalRoles" class="gradeB">  <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>
             <td tal:content="entry/user_name"> USERNAME   </td>
@@ -77,10 +77,10 @@
         </tbody>
       </table>
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <div tal:condition="view/availableActions">
         <span tal:repeat="action view/actions" tal:omit-tag="">
           <input tal:condition="python:action.label in view.tabtwoactions1" tal:replace="structure action/render"/>
         </span>
       </div> <br /><br />
-      <table class="zebra">
+      <table class="form-table">
         <tr> <td>
             <select id="user" name="user">
Index: /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantsrootpage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantsrootpage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantsrootpage.pt	(revision 7459)
@@ -10,12 +10,11 @@
   </thead>
   <tbody>
-    <tr tal:repeat="entry context/values"
-	class="gradeB">
+    <tr tal:repeat="entry context/values" class="gradeC">
       <td tal:content="entry/year">Year
       </td>	
       <td>
-	<a href=""
-	   tal:attributes="href python:view.url(entry)"
-	   tal:content="entry/__name__">Code</a>
+	     <a href=""
+    	   tal:attributes="href python:view.url(entry)"
+    	   tal:content="entry/__name__">Code</a>
       </td>
       <td tal:content="entry/title">Title
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/batchprocessing.txt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/batchprocessing.txt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/batchprocessing.txt	(revision 7459)
@@ -561,5 +561,5 @@
     True
     >>> browser.getControl('Show', index=0).click()
-    >>> '<input type="submit" name="back" value="Back" />' in browser.contents
+    >>> '<input class="btn primary" type="submit" name="back" value="Back" />' in browser.contents
     True
     >>> browser.getControl('Back', index=0).click()
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/browser.txt	(revision 7459)
@@ -54,5 +54,5 @@
   >>> print browser.contents
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
-  ...<li class="message">Your message has been sent.</li>
+  ...Your message has been sent...
   ...
 
@@ -77,5 +77,5 @@
 The edit form contains the default value for the portal skin::
 
-  >>> 'waeuptheme-gray1.css' in browser.contents
+  >>> 'waeup-base.css' in browser.contents
   True
 
@@ -85,5 +85,5 @@
   >>> print browser.contents
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
-  ...<li class="message">Settings have been saved.</li>
+  ...Settings have been saved...
   ...
 
@@ -92,5 +92,5 @@
   >>> print browser.contents
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
-  ...<li class="message">Plugins were updated. See log file for details.</li>
+  ...Plugins were updated. See log file for details...
   ...
 
@@ -118,5 +118,5 @@
   >>> print browser.contents
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
-  ...manage portal users...
+  ...Portal Users...
   ...
 
@@ -195,5 +195,5 @@
   >>> print browser.contents
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
-  ...<li class="message">Your message has been sent.</li>
+  ...Your message has been sent...
   ...
 
@@ -214,5 +214,5 @@
   >>> print browser.contents
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
-  ...<span class="required">*</span>
+  ...*...
   ...<span>Name of faculty</span>:
   ...
@@ -371,5 +371,5 @@
   >>> print browser.contents
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
-  ...<span class="required">*</span>
+  ...*</span>
   ...<span>Name of department</span>:
   ...
@@ -400,5 +400,5 @@
   >>> print browser.contents
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
-  ...<li class="message">The code chosen already exists in this faculty.</li>
+  ...The code chosen already exists in this faculty...
   ...
 
@@ -535,5 +535,5 @@
   >>> print browser.contents
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
-  ...<span class="required">*</span>
+  ...*</span>
   ...<span>Title of course</span>:
   ...
@@ -574,5 +574,5 @@
   >>> print browser.contents
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
-  ...<li class="message">A course with same code already exists:...</li>
+  ...A course with same code already exists:...
   ...
 
@@ -746,5 +746,5 @@
   >>> print browser.contents
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
-  ...<span class="required">*</span>
+  ...*</span>
   ...<span>Title</span>:
   ...
@@ -785,5 +785,5 @@
   >>> print browser.contents
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
-  ...<li class="message">A certificate with same code already exists:...</li>
+  ...A certificate with same code already exists:...
   ...
 
@@ -950,5 +950,5 @@
   >>> print browser.contents
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
-  ...<span class="required">*</span>
+  ...*</span>
   ...<span>Level</span>:
   ...
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/layout.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/layout.py	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/layout.py	(revision 7459)
@@ -34,5 +34,5 @@
 from waeup.sirp.interfaces import ISIRPObject, IUserAccount
 from waeup.sirp.browser.interfaces import ITheme
-from waeup.sirp.browser.theming import get_all_themes, SIRPThemeGray1
+from waeup.sirp.browser.theming import get_all_themes, SIRPThemeBase
 from waeup.sirp.students.interfaces import IStudentNavigation
 from waeup.sirp.applicants.interfaces import IApplicant
@@ -52,14 +52,16 @@
 default_primary_nav_template.__grok_name__ = 'default_primary_nav'
 
-class jsaction(grok.action):
+class action(grok.action):
 
     def __call__(self, success):
-        action = JSAction(self.label, success=success, **self.options)
+        action = SIRPAction(self.label, success=success, **self.options)
         self.actions.append(action)
         return action
 
-class JSAction(Action):
-
-    msg = '\'Are you sure?\''
+class SIRPAction(Action):
+
+    def __init__(self, label, style='', **options):
+        super(SIRPAction, self).__init__(label, **options)
+        self.style = style
 
     def render(self):
@@ -70,5 +72,27 @@
             label = zope.i18n.translate(self.label, context=self.form.request)
         return ('<input type="submit" id="%s" name="%s" value="%s"'
-                ' class="button" onclick="return confirmPost(%s)" />' %
+                ' class="btn %s"/>' %
+                (self.__name__, self.__name__, escape(label, quote=True),
+                self.style))
+
+class jsaction(grok.action):
+
+    def __call__(self, success):
+        action = JSAction(self.label, success=success, **self.options)
+        self.actions.append(action)
+        return action
+
+class JSAction(Action):
+
+    msg = '\'Are you sure?\''
+
+    def render(self):
+        if not self.available():
+            return ''
+        label = self.label
+        if isinstance(label, Message):
+            label = zope.i18n.translate(self.label, context=self.form.request)
+        return ('<input type="submit" id="%s" name="%s" value="%s"'
+                ' class="btn" onclick="return confirmPost(%s)" />' %
                 (self.__name__, self.__name__, escape(label, quote=True), self.msg)
                 )
@@ -116,5 +140,5 @@
         return self.url(site, name)
 
-    def flash(self, message, type='message'):
+    def flash(self, message, type='alert-message warning'):
         """Send a short message to the user.
         """
@@ -125,10 +149,10 @@
         return True
 
-class SIRPLayout(Layout, UtilityView):
+class SIRPLayout(UtilityView,Layout):
     """A megrok.layout.Layout with additional methods.
     """
     grok.baseclass()
 
-class SIRPForm(Form, UtilityView):
+class SIRPForm(UtilityView,Form):
     """A megrok.layout.Form with additional methods.
     """
@@ -137,17 +161,19 @@
     def setUpWidgets(self,ignore_request=False):
         super(SIRPForm,self).setUpWidgets(ignore_request)
+        # Width parameters will be overridden by Bootstrap
+        # so we have to set the css class
         if self.widgets.get('subject'):
-            self.widgets['subject'].displayWidth = 45
+            self.widgets['subject'].cssClass = 'span9'
         if self.widgets.get('body'):
             self.widgets['body'].height = 10
         if self.widgets.get('body'):
-            self.widgets['body'].width = 35
-
-class SIRPPage(Page):
+            self.widgets['body'].cssClass = 'span9'
+
+class SIRPPage(UtilityView,Page):
     """A megrok.layout page with additional methods.
     """
     grok.baseclass()
 
-class SIRPDisplayFormPage(DisplayForm, UtilityView):
+class SIRPDisplayFormPage(UtilityView,DisplayForm):
     """A megrok.layout.DisplayForm with additional methods.
     """
@@ -155,5 +181,5 @@
     template = default_waeup_display_template
 
-class SIRPEditFormPage(EditForm, UtilityView):
+class SIRPEditFormPage(UtilityView,EditForm):
     """A megrok.layout.EditForm with additional methods.
     """
@@ -163,14 +189,23 @@
     def setUpWidgets(self,ignore_request=False):
         super(SIRPEditFormPage,self).setUpWidgets(ignore_request)
+        for widget in self.widgets:
+            if widget.__class__.__name__ == 'TextWidget':
+                widget.cssClass = 'span8'
+            elif widget.__class__.__name__ == 'IntWidget':
+                widget.cssClass = 'span2'
+        #import pdb; pdb.set_trace()
         if self.widgets.get('title'):
-            self.widgets['title'].displayWidth = 80
+            self.widgets['title'].cssClass = 'span12'
         if self.widgets.get('frontpage'):
-            self.widgets['frontpage'].width = 70
+            self.widgets['frontpage'].cssClass = 'span12'
         if self.widgets.get('phone'):
-            self.widgets['phone'].displayWidth = 13
+            self.widgets['phone'].cssClass = 'span4'
         if self.widgets.get('notice'):
             self.widgets['notice'].height = 3
-
-class SIRPAddFormPage(AddForm,  UtilityView):
+        if self.widgets.get('perm_address'):
+            self.widgets['perm_address'].cssClass = 'span8'
+            self.widgets['perm_address'].height = 10
+
+class SIRPAddFormPage(UtilityView,AddForm):
     """A megrok.layout.AddForm with additional methods.
     """
@@ -184,5 +219,5 @@
 
     #: An instance of the default theme to use for the site layout
-    default_theme = SIRPThemeGray1()
+    default_theme = SIRPThemeBase()
     stafftemp = grok.PageTemplateFile('templates/staffsitelayout.pt')
     studenttemp = grok.PageTemplateFile('templates/studentsitelayout.pt')
@@ -194,4 +229,7 @@
     def getAppTitle(self):
         return getattr(grok.getSite()['configuration'], 'name', u'Sample University')
+
+    def getAppAcronym(self):
+        return getattr(grok.getSite()['configuration'], 'acronym', u'Acronym')
 
     def isAuthenticated(self):
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py	(revision 7459)
@@ -59,5 +59,5 @@
 from waeup.sirp.authentication import get_principal_role_manager
 from waeup.sirp.utils.helpers import get_user_account
-from waeup.sirp.browser.layout import jsaction, JSAction
+from waeup.sirp.browser.layout import jsaction, action
 
 grok.context(ISIRPObject)
@@ -215,5 +215,5 @@
         return get_user_account(self.request)
 
-    @grok.action('Send message now')
+    @action('Send message now', style='primary')
     def send(self, *args, **data):
         fullname = self.request.principal.title
@@ -244,5 +244,5 @@
                           'fullname', 'email_from', 'body')
 
-    @grok.action('Send now')
+    @action('Send now', style='primary')
     def send(self, *args, **data):
         sirp_utils = getUtility(ISIRPUtils)
@@ -378,5 +378,5 @@
     title = 'Portal Users'
 
-    @grok.action('Add user')
+    @action('Add user', style='primary')
     def addUser(self, **data):
         name = data['name']
@@ -426,5 +426,5 @@
         self.widgets['description'].height = 3
 
-    @grok.action('Save')
+    @action('Save', style='primary')
     def save(self, **data):
         form = self.request.form
@@ -444,5 +444,5 @@
         return
 
-    @grok.action('Cancel', validator=NullValidator)
+    @action('Cancel', validator=NullValidator)
     def cancel(self, **data):
         self.redirect(self.url(self.context.__parent__))
@@ -461,5 +461,5 @@
         return u'Send message to %s' % self.context.title
 
-    @grok.action('Send message now')
+    @action('Send message now', style='primary')
     def send(self, *args, **data):
         try:
@@ -596,5 +596,5 @@
         return super(ConfigurationContainerManageFormPage, self).update()
 
-    @grok.action('Save')
+    @action('Save', style='primary')
     def save(self, **data):
         self.applyData(self.context, **data)
@@ -602,5 +602,5 @@
         return
 
-    @grok.action('Add session configuration', validator=NullValidator)
+    @action('Add session configuration', validator=NullValidator, style='primary')
     def addSubunit(self, **data):
         self.redirect(self.url(self.context, '@@add'))
@@ -621,5 +621,5 @@
         return
 
-    @grok.action('Update plugins', validator=NullValidator)
+    @action('Update plugins', validator=NullValidator)
     def updatePlugins(self, **data):
         grok.getSite().updatePlugins()
@@ -638,5 +638,5 @@
     pnav = 0
 
-    @grok.action('Add Session Configuration')
+    @action('Add Session Configuration', style='primary')
     def addSessionConfiguration(self, **data):
         sessionconfiguration = createObject(u'waeup.SessionConfiguration')
@@ -650,5 +650,5 @@
         return
 
-    @grok.action('Cancel', validator=NullValidator)
+    @action('Cancel', validator=NullValidator)
     def cancel(self):
         self.redirect(self.url(self.context, '@@index')+'#tab-2')
@@ -674,5 +674,5 @@
         return 'Edit academic session %s configuration' % session_string
 
-    @grok.action('Save')
+    @action('Save', style='primary')
     def save(self, **data):
         self.applyData(self.context, **data)
@@ -681,5 +681,5 @@
         return
 
-    @grok.action('Cancel', validator=NullValidator)
+    @action('Cancel', validator=NullValidator)
     def cancel(self):
         self.redirect(self.url(self.context.__parent__, '@@index')+'#tab-2')
@@ -1210,10 +1210,10 @@
         return
 
-    @grok.action('Add faculty', validator=NullValidator)
+    @action('Add faculty', validator=NullValidator)
     def addFaculty(self, **data):
         self.redirect(self.url(self.context, '@@add'))
         return
 
-    @grok.action('Cancel', validator=NullValidator)
+    @action('Cancel', validator=NullValidator)
     def cancel(self, **data):
         self.redirect(self.url(self.context))
@@ -1232,5 +1232,5 @@
     pnav = 1
 
-    @grok.action('Add faculty')
+    @action('Add faculty', style='primary')
     def addFaculty(self, **data):
         faculty = createObject(u'waeup.Faculty')
@@ -1243,5 +1243,5 @@
         self.redirect(self.url(self.context, u'@@manage')+'#tab-1')
 
-    @grok.action('Cancel')
+    @action('Cancel')
     def cancel(self, **data):
         self.redirect(self.url(self.context))
@@ -1315,24 +1315,24 @@
         return
 
-    @grok.action('Save')
+    @action('Save', style='primary')
     def save(self, **data):
         self.applyData(self.context, **data)
         return
 
-    @grok.action('Cancel', validator=NullValidator)
+    @action('Cancel', validator=NullValidator)
     def cancel(self, **data):
         self.redirect(self.url(self.context))
         return
 
-    @grok.action('Add department', validator=NullValidator)
+    @action('Add department', validator=NullValidator)
     def addSubunit(self, **data):
         self.redirect(self.url(self.context, '@@add'))
         return
 
-    @grok.action('Add local role', validator=NullValidator)
+    @action('Add local role', validator=NullValidator)
     def addLocalRole(self, **data):
         return add_local_role(self, '3', **data)
 
-    @grok.action('Remove selected local roles')
+    @action('Remove selected local roles')
     def delLocalRoles(self, **data):
         return del_local_roles(self,3,**data)
@@ -1352,5 +1352,5 @@
         return self.context.longtitle()
 
-    @grok.action('Add department')
+    @action('Add department', style='primary')
     def addDepartment(self, **data):
         department = createObject(u'waeup.Department')
@@ -1364,5 +1364,5 @@
         self.redirect(self.url(self.context, u'@@manage')+'#tab-2')
 
-    @grok.action('Cancel')
+    @action('Cancel')
     def cancel(self, **data):
         self.redirect(self.url(self.context))
@@ -1503,5 +1503,5 @@
         return get_users_with_local_roles(self.context)
 
-    @grok.action('Save')
+    @action('Save', style='primary')
     def save(self, **data):
         self.applyData(self.context, **data)
@@ -1520,24 +1520,24 @@
         return
 
-    @grok.action('Add course', validator=NullValidator)
+    @action('Add course', validator=NullValidator)
     def addCourse(self, **data):
         self.redirect(self.url(self.context, 'addcourse'))
         return
 
-    @grok.action('Add certificate', validator=NullValidator)
+    @action('Add certificate', validator=NullValidator)
     def addCertificate(self, **data):
         self.redirect(self.url(self.context, 'addcertificate'))
         return
 
-    @grok.action('Cancel', validator=NullValidator)
+    @action('Cancel', validator=NullValidator)
     def cancel(self, **data):
         self.redirect(self.url(self.context))
         return
 
-    @grok.action('Add local role', validator=NullValidator)
+    @action('Add local role', validator=NullValidator)
     def addLocalRole(self, **data):
         return add_local_role(self, 4, **data)
 
-    @grok.action('Remove selected local roles')
+    @action('Remove selected local roles')
     def delLocalRoles(self, **data):
         return del_local_roles(self,4,**data)
@@ -1557,5 +1557,5 @@
         return self.context.longtitle()
 
-    @grok.action('Add course')
+    @action('Add course')
     def addCourse(self, **data):
         course = createObject(u'waeup.Course')
@@ -1579,5 +1579,5 @@
         self.redirect(self.url(self.context, u'@@manage')+'#tab-2')
 
-    @grok.action('Cancel', validator=NullValidator)
+    @action('Cancel', validator=NullValidator)
     def cancel(self, **data):
         self.redirect(self.url(self.context))
@@ -1598,5 +1598,5 @@
         return self.context.longtitle()
 
-    @grok.action('Add certificate')
+    @action('Add certificate')
     def addCertificate(self, **data):
         certificate = createObject(u'waeup.Certificate')
@@ -1621,5 +1621,5 @@
         return
 
-    @grok.action('Cancel', validator=NullValidator)
+    @action('Cancel', validator=NullValidator)
     def cancel(self): #, **data):
         self.redirect(self.url(self.context))
@@ -1657,10 +1657,10 @@
         return 'Course: %s (%s)' % (self.context.title, self.context.code)
 
-    @grok.action('Save')
+    @action('Save', style='primary')
     def save(self, **data):
         self.applyData(self.context, **data)
         return
 
-    @grok.action('Save and return')
+    @action('Save and return')
     def saveAndReturn(self, **data):
         self.applyData(self.context, **data)
@@ -1668,5 +1668,5 @@
         return
 
-    @grok.action('Cancel', validator=NullValidator)
+    @action('Cancel', validator=NullValidator)
     def cancel(self, **data):
         self.redirect(self.url(self.context))
@@ -1731,5 +1731,5 @@
     form_fields = grok.AutoFields(ICertificate)
 
-    @grok.action('Save')
+    @action('Save', style='primary')
     def save(self, **data):
         self.applyData(self.context, **data)
@@ -1741,10 +1741,10 @@
         return
 
-    @grok.action('Add course referrer', validator=NullValidator)
+    @action('Add course referrer', validator=NullValidator)
     def addCertificateCourse(self, **data):
         self.redirect(self.url(self.context, 'addcertificatecourse'))
         return
 
-    @grok.action('Cancel', validator=NullValidator)
+    @action('Cancel', validator=NullValidator)
     def cancel(self, **data):
         self.redirect(self.url(self.context))
@@ -1765,9 +1765,9 @@
         return get_users_with_local_roles(self.context)
 
-    @grok.action('Add local role', validator=NullValidator)
+    @action('Add local role', validator=NullValidator)
     def addLocalRole(self, **data):
         return add_local_role(self, 3, **data)
 
-    @grok.action('Remove selected local roles')
+    @action('Remove selected local roles')
     def delLocalRoles(self, **data):
         return del_local_roles(self,3,**data)
@@ -1788,5 +1788,5 @@
         return "Certificate: %s (%s)" % (self.context.title, self.context.code)
 
-    @grok.action('Add course referrer')
+    @action('Add course referrer')
     def addCertcourse(self, **data):
         try:
@@ -1798,5 +1798,5 @@
         self.redirect(self.url(self.context, u'@@manage')+'#tab-2')
 
-    @grok.action('Cancel', validator=NullValidator)
+    @action('Cancel', validator=NullValidator)
     def cancel(self, **data):
         self.redirect(self.url(self.context))
@@ -1838,5 +1838,5 @@
         return 'Course Referrer: %s' % (self.context.__name__)
 
-    @grok.action('Save and return')
+    @action('Save and return')
     def saveAndReturn(self, **data):
         parent = self.context.__parent__
@@ -1853,5 +1853,5 @@
         return
 
-    @grok.action('Cancel', validator=NullValidator)
+    @action('Cancel', validator=NullValidator)
     def cancel(self, **data):
         self.redirect(self.url(self.context))
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/resources.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/resources.py	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/resources.py	(revision 7459)
@@ -140,8 +140,8 @@
 toggleall = ResourceInclusion(waeup_sirp, 'toggleall.js')
 
-#: A resource that binds jQueryUI tabs to <div> tags with class
+#: A resource that binds Bootstrap tabs to <div> tags with class
 #: ``tabs``.
 #:
-#: If you want jQuery tabs for some <div>s in your page then you
+#: If you want Bootstrap tabs in your page then you
 #: have to perform two steps:
 #:
@@ -159,31 +159,30 @@
 #:   into the HTML page generated.
 #:
-#: * In your HTML code add some ``<div>`` tag with ``class`` set to
-#:   ``tabs``, like this:
+#: * In your HTML code add some tags with like this:
 #:
 #:    .. code-block:: html
-#:
-#:      <div id="tabs">
-#:        <ul>
-#:          <li><a href="#tab-1"><span>Tab 1 Heading</span></a></li>
-#:          <li><a href="#tab-2"><span>Tab 2 Heading</span></a></li>
-#:        </ul>
-#:        <div id="tab-1">
-#:          Content of tab 1
-#:        </div>
-#:        <div id="tab-2">
-#:          Content of tab 2
-#:        </div>
-#:      </div>
+
+#:     <ul class="tabs" data-tabs="tabs" >
+#:       <li class="active"><a href="#tab-1">Tab 1 Heading</a></li>
+#:       <li><a href="#tab-2">Tab 2 Heading</a></li>
+#:       <li><a href="#tab-3">Tab 3 Heading</a></li>
+#:     </ul>
+
+#:     <div class="tab-content">
+#:       <div id="tab-1" class="active">...</div>
+#:       <div id="tab-2">...</div>
+#:       <div id="tab-3">...</div>
+#:     </div>
 #:
 #: When the HTML is rendered, clicking into one of the tabs will make
 #: other <div>s disappear. See
 #:
-#:   http://jqueryui.com/demos/tabs/
+#:   http://twitter.github.com/bootstrap/javascript.html#tabs
 #:
 #: for details.
 #:
-tabs = ResourceInclusion(waeup_sirp, 'tabs.js',
-                         depends=[jquery, jqueryui])
+tabs = ResourceInclusion(waeup_sirp, 'bootstrap-tabs-1.4.0.js',
+                          depends=[jquery])
+
 
 #: Resource that makes datatables for jQuery UI available.
@@ -249,27 +248,17 @@
                               depends=[datatables, datatables_css])
 
-#: Register basic YUI based CSS as a resource.
-reset_fonts_grids = ResourceInclusion(
-    waeup_sirp, 'yuirfg.css')
-
-yuiapp_css = ResourceInclusion(
-    waeup_sirp, 'yuiapp.css',
-    depends=[reset_fonts_grids])
-
-#: Register basic SIRP base CSS (which is based on ``yuiapp.css`` as a
-#: resource.
+#: Register Twitter's Bootsrap css including dropdown js as a resource.
+bootstrap_min = ResourceInclusion(
+    waeup_sirp, 'bootstrap.min-1.4.0.css')
+
+dropdown = ResourceInclusion(
+    waeup_sirp, 'bootstrap-dropdown-1.4.0.js',
+    depends=[jquery])
+
+#: Register basic SIRP CSS (which is based on ``bootstrap.min-1.4.0.css`` 
+#: and ``base`` as a resource.
 waeup_base_css = ResourceInclusion(
     waeup_sirp, 'waeup-base.css',
-    depends=[yuiapp_css, base])
-
-#: The red SIRP theme registered as a resource.
-waeuptheme_red1 = ResourceInclusion(
-    waeup_sirp, 'waeuptheme-red1.css',
-    depends=[waeup_base_css])
-
-#: The gray SIRP theme registered as a resource.
-waeuptheme_gray1 = ResourceInclusion(
-    waeup_sirp, 'waeuptheme-gray1.css',
-    depends=[waeup_base_css])
+    depends=[dropdown,bootstrap_min, base])
 
 #: A basic theme based on jQuery only (crappy yet).
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/static/bootstrap-dropdown-1.4.0.js
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/static/bootstrap-dropdown-1.4.0.js	(revision 7459)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/static/bootstrap-dropdown-1.4.0.js	(revision 7459)
@@ -0,0 +1,55 @@
+/* ============================================================
+ * bootstrap-dropdown.js v1.4.0
+ * http://twitter.github.com/bootstrap/javascript.html#dropdown
+ * ============================================================
+ * Copyright 2011 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function( $ ){
+
+  "use strict"
+
+  /* DROPDOWN PLUGIN DEFINITION
+   * ========================== */
+
+  $.fn.dropdown = function ( selector ) {
+    return this.each(function () {
+      $(this).delegate(selector || d, 'click', function (e) {
+        var li = $(this).parent('li')
+          , isActive = li.hasClass('open')
+
+        clearMenus()
+        !isActive && li.toggleClass('open')
+        return false
+      })
+    })
+  }
+
+  /* APPLY TO STANDARD DROPDOWN ELEMENTS
+   * =================================== */
+
+  var d = 'a.menu, .dropdown-toggle'
+
+  function clearMenus() {
+    $(d).parent('li').removeClass('open')
+  }
+
+  $(function () {
+    $('html').bind("click", clearMenus)
+    $('body').dropdown( '[data-dropdown] a.menu, [data-dropdown] .dropdown-toggle' )
+  })
+
+}( window.jQuery || window.ender );
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/static/bootstrap-tabs-1.4.0.js
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/static/bootstrap-tabs-1.4.0.js	(revision 7459)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/static/bootstrap-tabs-1.4.0.js	(revision 7459)
@@ -0,0 +1,80 @@
+/* ========================================================
+ * bootstrap-tabs.js v1.4.0
+ * http://twitter.github.com/bootstrap/javascript.html#tabs
+ * ========================================================
+ * Copyright 2011 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ======================================================== */
+
+
+!function( $ ){
+
+  "use strict"
+
+  function activate ( element, container ) {
+    container
+      .find('> .active')
+      .removeClass('active')
+      .find('> .dropdown-menu > .active')
+      .removeClass('active')
+
+    element.addClass('active')
+
+    if ( element.parent('.dropdown-menu') ) {
+      element.closest('li.dropdown').addClass('active')
+    }
+  }
+
+  function tab( e ) {
+    var $this = $(this)
+      , $ul = $this.closest('ul:not(.dropdown-menu)')
+      , href = $this.attr('href')
+      , previous
+      , $href
+
+    if ( /^#\w+/.test(href) ) {
+      e.preventDefault()
+
+      if ( $this.parent('li').hasClass('active') ) {
+        return
+      }
+
+      previous = $ul.find('.active a').last()[0]
+      $href = $(href)
+
+      activate($this.parent('li'), $ul)
+      activate($href, $href.parent())
+
+      $this.trigger({
+        type: 'change'
+      , relatedTarget: previous
+      })
+    }
+  }
+
+
+ /* TABS/PILLS PLUGIN DEFINITION
+  * ============================ */
+
+  $.fn.tabs = $.fn.pills = function ( selector ) {
+    return this.each(function () {
+      $(this).delegate(selector || '.tabs li > a, .pills > li > a', 'click', tab)
+    })
+  }
+
+  $(document).ready(function () {
+    $('body').tabs('ul[data-tabs] li > a, ul[data-pills] > li > a')
+  })
+
+}( window.jQuery || window.ender );
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/static/bootstrap.min-1.4.0.css
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/static/bootstrap.min-1.4.0.css	(revision 7459)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/static/bootstrap.min-1.4.0.css	(revision 7459)
@@ -0,0 +1,2226 @@
+html, body {
+  margin: 0;
+  padding: 0;
+}
+h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, cite, code, del, dfn, em, img, q, s, samp, small, strike, strong, sub, sup, tt, var, dd, dl, dt, li, ol, ul, fieldset, form, label, legend, button, table, caption, tbody, tfoot, thead, tr, th, td {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-weight: normal;
+  font-style: normal;
+  font-size: 100%;
+  line-height: 1;
+  font-family: inherit;
+}
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+ol, ul {
+  list-style: none;
+}
+q:before, q:after, blockquote:before, blockquote:after {
+  content: "";
+}
+html {
+  overflow-y: scroll;
+  font-size: 100%;
+  -webkit-text-size-adjust: 100%;
+  -ms-text-size-adjust: 100%;
+}
+a:focus {
+  outline: thin dotted;
+}
+a:hover, a:active {
+  outline: 0;
+}
+article, aside, details, figcaption, figure, footer, header, hgroup, nav, section {
+  display: block;
+}
+audio, canvas, video {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1;
+}
+audio:not([controls]) {
+  display: none;
+}
+sub, sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+sup {
+  top: -0.5em;
+}
+sub {
+  bottom: -0.25em;
+}
+img {
+  border: 0;
+  -ms-interpolation-mode: bicubic;
+}
+button, input, select, textarea {
+  font-size: 100%;
+  margin: 0;
+  vertical-align: baseline;
+  *vertical-align: middle;
+}
+button, input {
+  line-height: normal;
+  *overflow: visible;
+}
+button::-moz-focus-inner, input::-moz-focus-inner {
+  border: 0;
+  padding: 0;
+}
+button, input[type="button"], input[type="reset"], input[type="submit"] {
+  cursor: pointer;
+  -webkit-appearance: button;
+}
+input[type="search"] {
+  -webkit-appearance: textfield;
+  -webkit-box-sizing: content-box;
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+}
+input[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+textarea {
+  overflow: auto;
+  vertical-align: top;
+}
+body {
+  background-color: #ffffff;
+  margin: 0;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 18px;
+  color: #404040;
+}
+.container {
+  width: 940px;
+  margin-left: auto;
+  margin-right: auto;
+  zoom: 1;
+}
+.container:before, .container:after {
+  display: table;
+  content: "";
+  zoom: 1;
+}
+.container:after {
+  clear: both;
+}
+.container-fluid {
+  position: relative;
+  min-width: 940px;
+  padding-left: 20px;
+  padding-right: 20px;
+  zoom: 1;
+}
+.container-fluid:before, .container-fluid:after {
+  display: table;
+  content: "";
+  zoom: 1;
+}
+.container-fluid:after {
+  clear: both;
+}
+.container-fluid>.sidebar {
+  position: absolute;
+  top: 0;
+  left: 20px;
+  width: 220px;
+}
+.container-fluid>.content {
+  margin-left: 240px;
+}
+a {
+  color: #0069d6;
+  text-decoration: none;
+  line-height: inherit;
+  font-weight: inherit;
+}
+a:hover {
+  color: #00438a;
+  text-decoration: underline;
+}
+.pull-right {
+  float: right;
+}
+.pull-left {
+  float: left;
+}
+.hide {
+  display: none;
+}
+.show {
+  display: block;
+}
+.row {
+  zoom: 1;
+  margin-left: -20px;
+}
+.row:before, .row:after {
+  display: table;
+  content: "";
+  zoom: 1;
+}
+.row:after {
+  clear: both;
+}
+.row>[class*="span"] {
+  display: inline;
+  float: left;
+  margin-left: 20px;
+}
+.span1 {
+  width: 40px;
+}
+.span2 {
+  width: 100px;
+}
+.span3 {
+  width: 160px;
+}
+.span4 {
+  width: 220px;
+}
+.span5 {
+  width: 280px;
+}
+.span6 {
+  width: 340px;
+}
+.span7 {
+  width: 400px;
+}
+.span8 {
+  width: 460px;
+}
+.span9 {
+  width: 520px;
+}
+.span10 {
+  width: 580px;
+}
+.span11 {
+  width: 640px;
+}
+.span12 {
+  width: 700px;
+}
+.span13 {
+  width: 760px;
+}
+.span14 {
+  width: 820px;
+}
+.span15 {
+  width: 880px;
+}
+.span16 {
+  width: 940px;
+}
+.span17 {
+  width: 1000px;
+}
+.span18 {
+  width: 1060px;
+}
+.span19 {
+  width: 1120px;
+}
+.span20 {
+  width: 1180px;
+}
+.span21 {
+  width: 1240px;
+}
+.span22 {
+  width: 1300px;
+}
+.span23 {
+  width: 1360px;
+}
+.span24 {
+  width: 1420px;
+}
+.row>.offset1 {
+  margin-left: 80px;
+}
+.row>.offset2 {
+  margin-left: 140px;
+}
+.row>.offset3 {
+  margin-left: 200px;
+}
+.row>.offset4 {
+  margin-left: 260px;
+}
+.row>.offset5 {
+  margin-left: 320px;
+}
+.row>.offset6 {
+  margin-left: 380px;
+}
+.row>.offset7 {
+  margin-left: 440px;
+}
+.row>.offset8 {
+  margin-left: 500px;
+}
+.row>.offset9 {
+  margin-left: 560px;
+}
+.row>.offset10 {
+  margin-left: 620px;
+}
+.row>.offset11 {
+  margin-left: 680px;
+}
+.row>.offset12 {
+  margin-left: 740px;
+}
+.span-one-third {
+  width: 300px;
+}
+.span-two-thirds {
+  width: 620px;
+}
+.row>.offset-one-third {
+  margin-left: 340px;
+}
+.row>.offset-two-thirds {
+  margin-left: 660px;
+}
+p {
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 18px;
+  margin-bottom: 9px;
+}
+p small {
+  font-size: 11px;
+  color: #bfbfbf;
+}
+h1, h2, h3, h4, h5, h6 {
+  font-weight: bold;
+  color: #404040;
+}
+h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
+  color: #bfbfbf;
+}
+h1 {
+  margin-bottom: 18px;
+  font-size: 30px;
+  line-height: 36px;
+}
+h1 small {
+  font-size: 18px;
+}
+h2 {
+  font-size: 24px;
+  line-height: 36px;
+}
+h2 small {
+  font-size: 14px;
+}
+h3, h4, h5, h6 {
+  line-height: 36px;
+}
+h3 {
+  font-size: 18px;
+}
+h3 small {
+  font-size: 14px;
+}
+h4 {
+  font-size: 16px;
+}
+h4 small {
+  font-size: 12px;
+}
+h5 {
+  font-size: 14px;
+}
+h6 {
+  font-size: 13px;
+  color: #bfbfbf;
+  text-transform: uppercase;
+}
+ul, ol {
+  margin: 0 0 18px 25px;
+}
+ul ul, ul ol, ol ol, ol ul {
+  margin-bottom: 0;
+}
+ul {
+  list-style: disc;
+}
+ol {
+  list-style: decimal;
+}
+li {
+  line-height: 18px;
+  color: #808080;
+}
+ul.unstyled {
+  list-style: none;
+  margin-left: 0;
+}
+dl {
+  margin-bottom: 18px;
+}
+dl dt, dl dd {
+  line-height: 18px;
+}
+dl dt {
+  font-weight: bold;
+}
+dl dd {
+  margin-left: 9px;
+}
+hr {
+  margin: 20px 0 19px;
+  border: 0;
+  border-bottom: 1px solid #eee;
+}
+strong {
+  font-style: inherit;
+  font-weight: bold;
+}
+em {
+  font-style: italic;
+  font-weight: inherit;
+  line-height: inherit;
+}
+.muted {
+  color: #bfbfbf;
+}
+blockquote {
+  margin-bottom: 18px;
+  border-left: 5px solid #eee;
+  padding-left: 15px;
+}
+blockquote p {
+  font-size: 14px;
+  font-weight: 300;
+  line-height: 18px;
+  margin-bottom: 0;
+}
+blockquote small {
+  display: block;
+  font-size: 12px;
+  font-weight: 300;
+  line-height: 18px;
+  color: #bfbfbf;
+}
+blockquote small:before {
+  content: '\2014 \00A0';
+}
+address {
+  display: block;
+  line-height: 18px;
+  margin-bottom: 18px;
+}
+code, pre {
+  padding: 0 3px 2px;
+  font-family: Monaco, Andale Mono, Courier New, monospace;
+  font-size: 12px;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+code {
+  background-color: #fee9cc;
+  color: rgba(0, 0, 0, 0.75);
+  padding: 1px 3px;
+}
+pre {
+  background-color: #f5f5f5;
+  display: block;
+  padding: 8.5px;
+  margin: 0 0 18px;
+  line-height: 18px;
+  font-size: 12px;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  white-space: pre;
+  white-space: pre-wrap;
+  word-wrap: break-word;
+}
+form {
+  margin-bottom: 18px;
+}
+fieldset {
+  margin-bottom: 18px;
+  padding-top: 18px;
+}
+fieldset legend {
+  display: block;
+  padding-left: 150px;
+  font-size: 19.5px;
+  line-height: 1;
+  color: #404040;
+  *padding: 0 0 5px 145px;
+  *line-height: 1.5;
+}
+form .clearfix {
+  margin-bottom: 18px;
+  zoom: 1;
+}
+form .clearfix:before, form .clearfix:after {
+  display: table;
+  content: "";
+  zoom: 1;
+}
+form .clearfix:after {
+  clear: both;
+}
+label, input, select, textarea {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  font-weight: normal;
+  line-height: normal;
+}
+label {
+  padding-top: 6px;
+  font-size: 13px;
+  line-height: 18px;
+  float: left;
+  width: 130px;
+  text-align: right;
+  color: #404040;
+}
+form .input {
+  margin-left: 150px;
+}
+input[type=checkbox], input[type=radio] {
+  cursor: pointer;
+}
+input, textarea, select, .uneditable-input {
+  display: inline-block;
+  width: 210px;
+  height: 18px;
+  padding: 4px;
+  font-size: 13px;
+  line-height: 18px;
+  color: #808080;
+  border: 1px solid #ccc;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+select {
+  padding: initial;
+}
+input[type=checkbox], input[type=radio] {
+  width: auto;
+  height: auto;
+  padding: 0;
+  margin: 3px 0;
+  *margin-top: 0;
+  line-height: normal;
+  border: none;
+}
+input[type=file] {
+  background-color: #ffffff;
+  padding: initial;
+  border: initial;
+  line-height: initial;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+input[type=button], input[type=reset], input[type=submit] {
+  width: auto;
+  height: auto;
+}
+select, input[type=file] {
+  height: 27px;
+  *height: auto;
+  line-height: 27px;
+  *margin-top: 4px;
+}
+select[multiple] {
+  height: inherit;
+  background-color: #ffffff;
+}
+textarea {
+  height: auto;
+}
+.uneditable-input {
+  background-color: #ffffff;
+  display: block;
+  border-color: #eee;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+  cursor: not-allowed;
+}
+:-moz-placeholder {
+  color: #bfbfbf;
+}
+::-webkit-input-placeholder {
+  color: #bfbfbf;
+}
+input, textarea {
+  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -o-transition: border linear 0.2s, box-shadow linear 0.2s;
+  transition: border linear 0.2s, box-shadow linear 0.2s;
+  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
+  box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+input:focus, textarea:focus {
+  outline: 0;
+  border-color: rgba(82, 168, 236, 0.8);
+  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+  -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+  box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+}
+input[type=file]:focus, input[type=checkbox]:focus, select:focus {
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+  outline: 1px dotted #666;
+}
+form .clearfix.error>label, form .clearfix.error .help-block, form .clearfix.error .help-inline {
+  color: #b94a48;
+}
+form .clearfix.error input, form .clearfix.error textarea {
+  color: #b94a48;
+  border-color: #ee5f5b;
+}
+form .clearfix.error input:focus, form .clearfix.error textarea:focus {
+  border-color: #e9322d;
+  -webkit-box-shadow: 0 0 6px #f8b9b7;
+  -moz-box-shadow: 0 0 6px #f8b9b7;
+  box-shadow: 0 0 6px #f8b9b7;
+}
+form .clearfix.error .input-prepend .add-on, form .clearfix.error .input-append .add-on {
+  color: #b94a48;
+  background-color: #fce6e6;
+  border-color: #b94a48;
+}
+form .clearfix.warning>label, form .clearfix.warning .help-block, form .clearfix.warning .help-inline {
+  color: #c09853;
+}
+form .clearfix.warning input, form .clearfix.warning textarea {
+  color: #c09853;
+  border-color: #ccae64;
+}
+form .clearfix.warning input:focus, form .clearfix.warning textarea:focus {
+  border-color: #be9a3f;
+  -webkit-box-shadow: 0 0 6px #e5d6b1;
+  -moz-box-shadow: 0 0 6px #e5d6b1;
+  box-shadow: 0 0 6px #e5d6b1;
+}
+form .clearfix.warning .input-prepend .add-on, form .clearfix.warning .input-append .add-on {
+  color: #c09853;
+  background-color: #d2b877;
+  border-color: #c09853;
+}
+form .clearfix.success>label, form .clearfix.success .help-block, form .clearfix.success .help-inline {
+  color: #468847;
+}
+form .clearfix.success input, form .clearfix.success textarea {
+  color: #468847;
+  border-color: #57a957;
+}
+form .clearfix.success input:focus, form .clearfix.success textarea:focus {
+  border-color: #458845;
+  -webkit-box-shadow: 0 0 6px #9acc9a;
+  -moz-box-shadow: 0 0 6px #9acc9a;
+  box-shadow: 0 0 6px #9acc9a;
+}
+form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-append .add-on {
+  color: #468847;
+  background-color: #bcddbc;
+  border-color: #468847;
+}
+.input-mini, input.mini, textarea.mini, select.mini {
+  width: 60px;
+}
+.input-small, input.small, textarea.small, select.small {
+  width: 90px;
+}
+.input-medium, input.medium, textarea.medium, select.medium {
+  width: 150px;
+}
+.input-large, input.large, textarea.large, select.large {
+  width: 210px;
+}
+.input-xlarge, input.xlarge, textarea.xlarge, select.xlarge {
+  width: 270px;
+}
+.input-xxlarge, input.xxlarge, textarea.xxlarge, select.xxlarge {
+  width: 530px;
+}
+textarea.xxlarge {
+  overflow-y: auto;
+}
+input.span1, textarea.span1 {
+  display: inline-block;
+  float: none;
+  width: 30px;
+  margin-left: 0;
+}
+input.span2, textarea.span2 {
+  display: inline-block;
+  float: none;
+  width: 90px;
+  margin-left: 0;
+}
+input.span3, textarea.span3 {
+  display: inline-block;
+  float: none;
+  width: 150px;
+  margin-left: 0;
+}
+input.span4, textarea.span4 {
+  display: inline-block;
+  float: none;
+  width: 210px;
+  margin-left: 0;
+}
+input.span5, textarea.span5 {
+  display: inline-block;
+  float: none;
+  width: 270px;
+  margin-left: 0;
+}
+input.span6, textarea.span6 {
+  display: inline-block;
+  float: none;
+  width: 330px;
+  margin-left: 0;
+}
+input.span7, textarea.span7 {
+  display: inline-block;
+  float: none;
+  width: 390px;
+  margin-left: 0;
+}
+input.span8, textarea.span8 {
+  display: inline-block;
+  float: none;
+  width: 450px;
+  margin-left: 0;
+}
+input.span9, textarea.span9 {
+  display: inline-block;
+  float: none;
+  width: 510px;
+  margin-left: 0;
+}
+input.span10, textarea.span10 {
+  display: inline-block;
+  float: none;
+  width: 570px;
+  margin-left: 0;
+}
+input.span11, textarea.span11 {
+  display: inline-block;
+  float: none;
+  width: 630px;
+  margin-left: 0;
+}
+input.span12, textarea.span12 {
+  display: inline-block;
+  float: none;
+  width: 690px;
+  margin-left: 0;
+}
+input.span13, textarea.span13 {
+  display: inline-block;
+  float: none;
+  width: 750px;
+  margin-left: 0;
+}
+input.span14, textarea.span14 {
+  display: inline-block;
+  float: none;
+  width: 810px;
+  margin-left: 0;
+}
+input.span15, textarea.span15 {
+  display: inline-block;
+  float: none;
+  width: 870px;
+  margin-left: 0;
+}
+input.span16, textarea.span16 {
+  display: inline-block;
+  float: none;
+  width: 930px;
+  margin-left: 0;
+}
+input[disabled], select[disabled], textarea[disabled], input[readonly], select[readonly], textarea[readonly] {
+  background-color: #f5f5f5;
+  border-color: #ddd;
+  cursor: not-allowed;
+}
+.actions {
+  background: #f5f5f5;
+  margin-top: 18px;
+  margin-bottom: 18px;
+  padding: 17px 20px 18px 150px;
+  border-top: 1px solid #ddd;
+  -webkit-border-radius: 0 0 3px 3px;
+  -moz-border-radius: 0 0 3px 3px;
+  border-radius: 0 0 3px 3px;
+}
+.actions .secondary-action {
+  float: right;
+}
+.actions .secondary-action a {
+  line-height: 30px;
+}
+.actions .secondary-action a:hover {
+  text-decoration: underline;
+}
+.help-inline, .help-block {
+  font-size: 13px;
+  line-height: 18px;
+  color: #bfbfbf;
+}
+.help-inline {
+  padding-left: 5px;
+  *position: relative;
+  *top: -5px;
+}
+.help-block {
+  display: block;
+  max-width: 600px;
+}
+.inline-inputs {
+  color: #808080;
+}
+.inline-inputs span {
+  padding: 0 2px 0 1px;
+}
+.input-prepend input, .input-append input {
+  -webkit-border-radius: 0 3px 3px 0;
+  -moz-border-radius: 0 3px 3px 0;
+  border-radius: 0 3px 3px 0;
+}
+.input-prepend .add-on, .input-append .add-on {
+  position: relative;
+  background: #f5f5f5;
+  border: 1px solid #ccc;
+  z-index: 2;
+  float: left;
+  display: block;
+  width: auto;
+  min-width: 16px;
+  height: 18px;
+  padding: 4px 4px 4px 5px;
+  margin-right: -1px;
+  font-weight: normal;
+  line-height: 18px;
+  color: #bfbfbf;
+  text-align: center;
+  text-shadow: 0 1px 0 #ffffff;
+  -webkit-border-radius: 3px 0 0 3px;
+  -moz-border-radius: 3px 0 0 3px;
+  border-radius: 3px 0 0 3px;
+}
+.input-prepend .active, .input-append .active {
+  background: #a9dba9;
+  border-color: #46a546;
+}
+.input-prepend .add-on {
+  *margin-top: 1px;
+}
+.input-append input {
+  float: left;
+  -webkit-border-radius: 3px 0 0 3px;
+  -moz-border-radius: 3px 0 0 3px;
+  border-radius: 3px 0 0 3px;
+}
+.input-append .add-on {
+  -webkit-border-radius: 0 3px 3px 0;
+  -moz-border-radius: 0 3px 3px 0;
+  border-radius: 0 3px 3px 0;
+  margin-right: 0;
+  margin-left: -1px;
+}
+.inputs-list {
+  margin: 0 0 5px;
+  width: 100%;
+}
+.inputs-list li {
+  display: block;
+  padding: 0;
+  width: 100%;
+}
+.inputs-list label {
+  display: block;
+  float: none;
+  width: auto;
+  padding: 0;
+  margin-left: 20px;
+  line-height: 18px;
+  text-align: left;
+  white-space: normal;
+}
+.inputs-list label strong {
+  color: #808080;
+}
+.inputs-list label small {
+  font-size: 11px;
+  font-weight: normal;
+}
+.inputs-list .inputs-list {
+  margin-left: 25px;
+  margin-bottom: 10px;
+  padding-top: 0;
+}
+.inputs-list:first-child {
+  padding-top: 6px;
+}
+.inputs-list li+li {
+  padding-top: 2px;
+}
+.inputs-list input[type=radio], .inputs-list input[type=checkbox] {
+  margin-bottom: 0;
+  margin-left: -20px;
+  float: left;
+}
+.form-stacked {
+  padding-left: 20px;
+}
+.form-stacked fieldset {
+  padding-top: 9px;
+}
+.form-stacked legend {
+  padding-left: 0;
+}
+.form-stacked label {
+  display: block;
+  float: none;
+  width: auto;
+  font-weight: bold;
+  text-align: left;
+  line-height: 20px;
+  padding-top: 0;
+}
+.form-stacked .clearfix {
+  margin-bottom: 9px;
+}
+.form-stacked .clearfix div.input {
+  margin-left: 0;
+}
+.form-stacked .inputs-list {
+  margin-bottom: 0;
+}
+.form-stacked .inputs-list li {
+  padding-top: 0;
+}
+.form-stacked .inputs-list li label {
+  font-weight: normal;
+  padding-top: 0;
+}
+.form-stacked div.clearfix.error {
+  padding-top: 10px;
+  padding-bottom: 10px;
+  padding-left: 10px;
+  margin-top: 0;
+  margin-left: -10px;
+}
+.form-stacked .actions {
+  margin-left: -20px;
+  padding-left: 20px;
+}
+table {
+  width: 100%;
+  margin-bottom: 18px;
+  padding: 0;
+  font-size: 13px;
+  border-collapse: collapse;
+}
+table th, table td {
+  padding: 10px 10px 9px;
+  line-height: 18px;
+  text-align: left;
+}
+table th {
+  padding-top: 9px;
+  font-weight: bold;
+  vertical-align: middle;
+}
+table td {
+  vertical-align: top;
+  border-top: 1px solid #ddd;
+}
+table tbody th {
+  border-top: 1px solid #ddd;
+  vertical-align: top;
+}
+.condensed-table th, .condensed-table td {
+  padding: 5px 5px 4px;
+}
+.bordered-table {
+  border: 1px solid #ddd;
+  border-collapse: separate;
+  *border-collapse: collapse;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.bordered-table th+th, .bordered-table td+td, .bordered-table th+td {
+  border-left: 1px solid #ddd;
+}
+.bordered-table thead tr:first-child th:first-child, .bordered-table tbody tr:first-child td:first-child {
+  -webkit-border-radius: 4px 0 0 0;
+  -moz-border-radius: 4px 0 0 0;
+  border-radius: 4px 0 0 0;
+}
+.bordered-table thead tr:first-child th:last-child, .bordered-table tbody tr:first-child td:last-child {
+  -webkit-border-radius: 0 4px 0 0;
+  -moz-border-radius: 0 4px 0 0;
+  border-radius: 0 4px 0 0;
+}
+.bordered-table tbody tr:last-child td:first-child {
+  -webkit-border-radius: 0 0 0 4px;
+  -moz-border-radius: 0 0 0 4px;
+  border-radius: 0 0 0 4px;
+}
+.bordered-table tbody tr:last-child td:last-child {
+  -webkit-border-radius: 0 0 4px 0;
+  -moz-border-radius: 0 0 4px 0;
+  border-radius: 0 0 4px 0;
+}
+table .span1 {
+  width: 20px;
+}
+table .span2 {
+  width: 60px;
+}
+table .span3 {
+  width: 100px;
+}
+table .span4 {
+  width: 140px;
+}
+table .span5 {
+  width: 180px;
+}
+table .span6 {
+  width: 220px;
+}
+table .span7 {
+  width: 260px;
+}
+table .span8 {
+  width: 300px;
+}
+table .span9 {
+  width: 340px;
+}
+table .span10 {
+  width: 380px;
+}
+table .span11 {
+  width: 420px;
+}
+table .span12 {
+  width: 460px;
+}
+table .span13 {
+  width: 500px;
+}
+table .span14 {
+  width: 540px;
+}
+table .span15 {
+  width: 580px;
+}
+table .span16 {
+  width: 620px;
+}
+.zebra-striped tbody tr:nth-child(odd) td, .zebra-striped tbody tr:nth-child(odd) th {
+  background-color: #f9f9f9;
+}
+.zebra-striped tbody tr:hover td, .zebra-striped tbody tr:hover th {
+  background-color: #f5f5f5;
+}
+table .header {
+  cursor: pointer;
+}
+table .header:after {
+  content: "";
+  float: right;
+  margin-top: 7px;
+  border-width: 0 4px 4px;
+  border-style: solid;
+  border-color: #000 transparent;
+  visibility: hidden;
+}
+table .headerSortUp, table .headerSortDown {
+  background-color: rgba(141, 192, 219, 0.25);
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+}
+table .header:hover:after {
+  visibility: visible;
+}
+table .headerSortDown:after, table .headerSortDown:hover:after {
+  visibility: visible;
+  filter: alpha(opacity=60);
+  -khtml-opacity: 0.6;
+  -moz-opacity: 0.6;
+  opacity: 0.6;
+}
+table .headerSortUp:after {
+  border-bottom: none;
+  border-left: 4px solid transparent;
+  border-right: 4px solid transparent;
+  border-top: 4px solid #000;
+  visibility: visible;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+  filter: alpha(opacity=60);
+  -khtml-opacity: 0.6;
+  -moz-opacity: 0.6;
+  opacity: 0.6;
+}
+table .blue {
+  color: #049cdb;
+  border-bottom-color: #049cdb;
+}
+table .headerSortUp.blue, table .headerSortDown.blue {
+  background-color: #ade6fe;
+}
+table .green {
+  color: #46a546;
+  border-bottom-color: #46a546;
+}
+table .headerSortUp.green, table .headerSortDown.green {
+  background-color: #cdeacd;
+}
+table .red {
+  color: #9d261d;
+  border-bottom-color: #9d261d;
+}
+table .headerSortUp.red, table .headerSortDown.red {
+  background-color: #f4c8c5;
+}
+table .yellow {
+  color: #ffc40d;
+  border-bottom-color: #ffc40d;
+}
+table .headerSortUp.yellow, table .headerSortDown.yellow {
+  background-color: #fff6d9;
+}
+table .orange {
+  color: #f89406;
+  border-bottom-color: #f89406;
+}
+table .headerSortUp.orange, table .headerSortDown.orange {
+  background-color: #fee9cc;
+}
+table .purple {
+  color: #7a43b6;
+  border-bottom-color: #7a43b6;
+}
+table .headerSortUp.purple, table .headerSortDown.purple {
+  background-color: #e2d5f0;
+}
+.topbar {
+  height: 40px;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 10000;
+  overflow: visible;
+}
+.topbar a {
+  color: #bfbfbf;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+.topbar h3 a:hover, .topbar .brand:hover, .topbar ul .active>a {
+  background-color: #333;
+  background-color: rgba(255, 255, 255, 0.05);
+  color: #ffffff;
+  text-decoration: none;
+}
+.topbar h3 {
+  position: relative;
+}
+.topbar h3 a, .topbar .brand {
+  float: left;
+  display: block;
+  padding: 8px 20px 12px;
+  margin-left: -20px;
+  color: #ffffff;
+  font-size: 20px;
+  font-weight: 200;
+  line-height: 1;
+}
+.topbar p {
+  margin: 0;
+  line-height: 40px;
+}
+.topbar p a:hover {
+  background-color: transparent;
+  color: #ffffff;
+}
+.topbar form {
+  float: left;
+  margin: 5px 0 0 0;
+  position: relative;
+  filter: alpha(opacity=100);
+  -khtml-opacity: 1;
+  -moz-opacity: 1;
+  opacity: 1;
+}
+.topbar form.pull-right {
+  float: right;
+}
+.topbar input {
+  background-color: #444;
+  background-color: rgba(255, 255, 255, 0.3);
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: normal;
+  font-weight: 13px;
+  line-height: 1;
+  padding: 4px 9px;
+  color: #ffffff;
+  color: rgba(255, 255, 255, 0.75);
+  border: 1px solid #111;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25);
+  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25);
+  -webkit-transition: none;
+  -moz-transition: none;
+  -ms-transition: none;
+  -o-transition: none;
+  transition: none;
+}
+.topbar input:-moz-placeholder {
+  color: #e6e6e6;
+}
+.topbar input::-webkit-input-placeholder {
+  color: #e6e6e6;
+}
+.topbar input:hover {
+  background-color: #bfbfbf;
+  background-color: rgba(255, 255, 255, 0.5);
+  color: #ffffff;
+}
+.topbar input:focus, .topbar input.focused {
+  outline: 0;
+  background-color: #ffffff;
+  color: #404040;
+  text-shadow: 0 1px 0 #ffffff;
+  border: 0;
+  padding: 5px 10px;
+  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+  -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+  box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+}
+.topbar-inner, .topbar .fill {
+  background-color: #222;
+  background-color: #222222;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));
+  background-image: -moz-linear-gradient(top, #333333, #222222);
+  background-image: -ms-linear-gradient(top, #333333, #222222);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));
+  background-image: -webkit-linear-gradient(top, #333333, #222222);
+  background-image: -o-linear-gradient(top, #333333, #222222);
+  background-image: linear-gradient(top, #333333, #222222);
+  filter: progid: DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+}
+.topbar div>ul, .nav {
+  display: block;
+  float: left;
+  margin: 0 10px 0 0;
+  position: relative;
+  left: 0;
+}
+.topbar div>ul>li, .nav>li {
+  display: block;
+  float: left;
+}
+.topbar div>ul a, .nav a {
+  display: block;
+  float: none;
+  padding: 10px 10px 11px;
+  line-height: 19px;
+  text-decoration: none;
+}
+.topbar div>ul a:hover, .nav a:hover {
+  color: #ffffff;
+  text-decoration: none;
+}
+.topbar div>ul .active>a, .nav .active>a {
+  background-color: #222;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+.topbar div>ul.secondary-nav, .nav.secondary-nav {
+  float: right;
+  margin-left: 10px;
+  margin-right: 0;
+}
+.topbar div>ul.secondary-nav .menu-dropdown, .nav.secondary-nav .menu-dropdown, .topbar div>ul.secondary-nav .dropdown-menu, .nav.secondary-nav .dropdown-menu {
+  right: 0;
+  border: 0;
+}
+.topbar div>ul a.menu:hover, .nav a.menu:hover, .topbar div>ul li.open .menu, .nav li.open .menu, .topbar div>ul .dropdown-toggle:hover, .nav .dropdown-toggle:hover, .topbar div>ul .dropdown.open .dropdown-toggle, .nav .dropdown.open .dropdown-toggle {
+  background: #444;
+  background: rgba(255, 255, 255, 0.05);
+}
+.topbar div>ul .menu-dropdown, .nav .menu-dropdown, .topbar div>ul .dropdown-menu, .nav .dropdown-menu {
+  background-color: #333;
+}
+.topbar div>ul .menu-dropdown a.menu, .nav .menu-dropdown a.menu, .topbar div>ul .dropdown-menu a.menu, .nav .dropdown-menu a.menu, .topbar div>ul .menu-dropdown .dropdown-toggle, .nav .menu-dropdown .dropdown-toggle, .topbar div>ul .dropdown-menu .dropdown-toggle, .nav .dropdown-menu .dropdown-toggle {
+  color: #ffffff;
+}
+.topbar div>ul .menu-dropdown a.menu.open, .nav .menu-dropdown a.menu.open, .topbar div>ul .dropdown-menu a.menu.open, .nav .dropdown-menu a.menu.open, .topbar div>ul .menu-dropdown .dropdown-toggle.open, .nav .menu-dropdown .dropdown-toggle.open, .topbar div>ul .dropdown-menu .dropdown-toggle.open, .nav .dropdown-menu .dropdown-toggle.open {
+  background: #444;
+  background: rgba(255, 255, 255, 0.05);
+}
+.topbar div>ul .menu-dropdown li a, .nav .menu-dropdown li a, .topbar div>ul .dropdown-menu li a, .nav .dropdown-menu li a {
+  color: #999;
+  text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
+}
+.topbar div>ul .menu-dropdown li a:hover, .nav .menu-dropdown li a:hover, .topbar div>ul .dropdown-menu li a:hover, .nav .dropdown-menu li a:hover {
+  background-color: #191919;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));
+  background-image: -moz-linear-gradient(top, #292929, #191919);
+  background-image: -ms-linear-gradient(top, #292929, #191919);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));
+  background-image: -webkit-linear-gradient(top, #292929, #191919);
+  background-image: -o-linear-gradient(top, #292929, #191919);
+  background-image: linear-gradient(top, #292929, #191919);
+  filter: progid: DXImageTransform.Microsoft.gradient(startColorstr='#292929', endColorstr='#191919', GradientType=0);
+  color: #ffffff;
+}
+.topbar div>ul .menu-dropdown .active a, .nav .menu-dropdown .active a, .topbar div>ul .dropdown-menu .active a, .nav .dropdown-menu .active a {
+  color: #ffffff;
+}
+.topbar div>ul .menu-dropdown .divider, .nav .menu-dropdown .divider, .topbar div>ul .dropdown-menu .divider, .nav .dropdown-menu .divider {
+  background-color: #222;
+  border-color: #444;
+}
+.topbar ul .menu-dropdown li a, .topbar ul .dropdown-menu li a {
+  padding: 4px 15px;
+}
+li.menu, .dropdown {
+  position: relative;
+}
+a.menu:after, .dropdown-toggle:after {
+  width: 0;
+  height: 0;
+  display: inline-block;
+  content: "&darr;";
+  text-indent: -99999px;
+  vertical-align: top;
+  margin-top: 8px;
+  margin-left: 4px;
+  border-left: 4px solid transparent;
+  border-right: 4px solid transparent;
+  border-top: 4px solid #ffffff;
+  filter: alpha(opacity=50);
+  -khtml-opacity: 0.5;
+  -moz-opacity: 0.5;
+  opacity: 0.5;
+}
+.menu-dropdown, .dropdown-menu {
+  background-color: #ffffff;
+  float: left;
+  display: none;
+  position: absolute;
+  top: 40px;
+  z-index: 900;
+  min-width: 160px;
+  max-width: 220px;
+  _width: 160px;
+  margin-left: 0;
+  margin-right: 0;
+  padding: 6px 0;
+  zoom: 1;
+  border-color: #999;
+  border-color: rgba(0, 0, 0, 0.2);
+  border-style: solid;
+  border-width: 0 1px 1px;
+  -webkit-border-radius: 0 0 6px 6px;
+  -moz-border-radius: 0 0 6px 6px;
+  border-radius: 0 0 6px 6px;
+  -webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+  -moz-background-clip: padding-box;
+  background-clip: padding-box;
+}
+.menu-dropdown li, .dropdown-menu li {
+  float: none;
+  display: block;
+  background-color: none;
+}
+.menu-dropdown .divider, .dropdown-menu .divider {
+  height: 1px;
+  margin: 5px 0;
+  overflow: hidden;
+  background-color: #eee;
+  border-bottom: 1px solid #ffffff;
+}
+.topbar .dropdown-menu a, .dropdown-menu a {
+  display: block;
+  padding: 4px 15px;
+  clear: both;
+  font-weight: normal;
+  line-height: 18px;
+  color: #808080;
+  text-shadow: 0 1px 0 #ffffff;
+}
+.topbar .dropdown-menu a:hover, .dropdown-menu a:hover, .topbar .dropdown-menu a.hover, .dropdown-menu a.hover {
+  background-color: #dddddd;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));
+  background-image: -moz-linear-gradient(top, #eeeeee, #dddddd);
+  background-image: -ms-linear-gradient(top, #eeeeee, #dddddd);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));
+  background-image: -webkit-linear-gradient(top, #eeeeee, #dddddd);
+  background-image: -o-linear-gradient(top, #eeeeee, #dddddd);
+  background-image: linear-gradient(top, #eeeeee, #dddddd);
+  filter: progid: DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0);
+  color: #404040;
+  text-decoration: none;
+  -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025);
+  -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025);
+  box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025);
+}
+.open .menu, .dropdown.open .menu, .open .dropdown-toggle, .dropdown.open .dropdown-toggle {
+  color: #ffffff;
+  background: #ccc;
+  background: rgba(0, 0, 0, 0.3);
+}
+.open .menu-dropdown, .dropdown.open .menu-dropdown, .open .dropdown-menu, .dropdown.open .dropdown-menu {
+  display: block;
+}
+.tabs, .pills {
+  margin: 0 0 18px;
+  padding: 0;
+  list-style: none;
+  zoom: 1;
+}
+.tabs:before, .pills:before, .tabs:after, .pills:after {
+  display: table;
+  content: "";
+  zoom: 1;
+}
+.tabs:after, .pills:after {
+  clear: both;
+}
+.tabs>li, .pills>li {
+  float: left;
+}
+.tabs>li>a, .pills>li>a {
+  display: block;
+}
+.tabs {
+  border-color: #ddd;
+  border-style: solid;
+  border-width: 0 0 1px;
+}
+.tabs>li {
+  position: relative;
+  margin-bottom: -1px;
+}
+.tabs>li>a {
+  padding: 0 15px;
+  margin-right: 2px;
+  line-height: 34px;
+  border: 1px solid transparent;
+  -webkit-border-radius: 4px 4px 0 0;
+  -moz-border-radius: 4px 4px 0 0;
+  border-radius: 4px 4px 0 0;
+}
+.tabs>li>a:hover {
+  text-decoration: none;
+  background-color: #eee;
+  border-color: #eee #eee #ddd;
+}
+.tabs .active>a, .tabs .active>a:hover {
+  color: #808080;
+  background-color: #ffffff;
+  border: 1px solid #ddd;
+  border-bottom-color: transparent;
+  cursor: default;
+}
+.tabs .menu-dropdown, .tabs .dropdown-menu {
+  top: 35px;
+  border-width: 1px;
+  -webkit-border-radius: 0 6px 6px 6px;
+  -moz-border-radius: 0 6px 6px 6px;
+  border-radius: 0 6px 6px 6px;
+}
+.tabs a.menu:after, .tabs .dropdown-toggle:after {
+  border-top-color: #999;
+  margin-top: 15px;
+  margin-left: 5px;
+}
+.tabs li.open.menu .menu, .tabs .open.dropdown .dropdown-toggle {
+  border-color: #999;
+}
+.tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after {
+  border-top-color: #555;
+}
+.pills a {
+  margin: 5px 3px 5px 0;
+  padding: 0 15px;
+  line-height: 30px;
+  text-shadow: 0 1px 1px #ffffff;
+  -webkit-border-radius: 15px;
+  -moz-border-radius: 15px;
+  border-radius: 15px;
+}
+.pills a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25);
+  background-color: #00438a;
+}
+.pills .active a {
+  color: #ffffff;
+  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25);
+  background-color: #0069d6;
+}
+.pills-vertical>li {
+  float: none;
+}
+.tab-content>.tab-pane, .pill-content>.pill-pane, .tab-content>div, .pill-content>div {
+  display: none;
+}
+.tab-content>.active, .pill-content>.active {
+  display: block;
+}
+.breadcrumb {
+  padding: 7px 14px;
+  margin: 0 0 18px;
+  background-color: #f5f5f5;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));
+  background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));
+  background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: -o-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: linear-gradient(top, #ffffff, #f5f5f5);
+  filter: progid: DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);
+  border: 1px solid #ddd;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  -webkit-box-shadow: inset 0 1px 0 #ffffff;
+  -moz-box-shadow: inset 0 1px 0 #ffffff;
+  box-shadow: inset 0 1px 0 #ffffff;
+}
+.breadcrumb li {
+  display: inline;
+  text-shadow: 0 1px 0 #ffffff;
+}
+.breadcrumb .divider {
+  padding: 0 5px;
+  color: #bfbfbf;
+}
+.breadcrumb .active a {
+  color: #404040;
+}
+.hero-unit {
+  background-color: #f5f5f5;
+  margin-bottom: 30px;
+  padding: 60px;
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+}
+.hero-unit h1 {
+  margin-bottom: 0;
+  font-size: 60px;
+  line-height: 1;
+  letter-spacing: -1px;
+}
+.hero-unit p {
+  font-size: 18px;
+  font-weight: 200;
+  line-height: 27px;
+}
+footer {
+  margin-top: 17px;
+  padding-top: 17px;
+  border-top: 1px solid #eee;
+}
+.page-header {
+  margin-bottom: 17px;
+  border-bottom: 1px solid #ddd;
+  -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+}
+.page-header h1 {
+  margin-bottom: 8px;
+}
+.btn.danger, .alert-message.danger, .btn.danger:hover, .alert-message.danger:hover, .btn.error, .alert-message.error, .btn.error:hover, .alert-message.error:hover, .btn.success, .alert-message.success, .btn.success:hover, .alert-message.success:hover, .btn.info, .alert-message.info, .btn.info:hover, .alert-message.info:hover {
+  color: #ffffff;
+}
+.btn .close, .alert-message .close {
+  font-family: Arial, sans-serif;
+  line-height: 18px;
+}
+.btn.danger, .alert-message.danger, .btn.error, .alert-message.error {
+  background-color: #c43c35;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));
+  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: linear-gradient(top, #ee5f5b, #c43c35);
+  filter: progid: DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #c43c35 #c43c35 #882a25;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+.btn.success, .alert-message.success {
+  background-color: #57a957;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));
+  background-image: -moz-linear-gradient(top, #62c462, #57a957);
+  background-image: -ms-linear-gradient(top, #62c462, #57a957);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));
+  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
+  background-image: -o-linear-gradient(top, #62c462, #57a957);
+  background-image: linear-gradient(top, #62c462, #57a957);
+  filter: progid: DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #57a957 #57a957 #3d773d;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+.btn.info, .alert-message.info {
+  background-color: #339bb9;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));
+  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));
+  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: linear-gradient(top, #5bc0de, #339bb9);
+  filter: progid: DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #339bb9 #339bb9 #22697d;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+.btn {
+  cursor: pointer;
+  display: inline-block;
+  background-color: #e6e6e6;
+  background-repeat: no-repeat;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  filter: progid: DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
+  padding: 5px 14px 6px;
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+  color: #333;
+  font-size: 13px;
+  line-height: normal;
+  border: 1px solid #ccc;
+  border-bottom-color: #bbb;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -webkit-transition: 0.1s linear all;
+  -moz-transition: 0.1s linear all;
+  -ms-transition: 0.1s linear all;
+  -o-transition: 0.1s linear all;
+  transition: 0.1s linear all;
+}
+.btn:hover {
+  background-position: 0 -15px;
+  color: #333;
+  text-decoration: none;
+}
+.btn:focus {
+  outline: 1px dotted #666;
+}
+.btn.primary {
+  color: #ffffff;
+  background-color: #0064cd;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
+  background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+  background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -o-linear-gradient(top, #049cdb, #0064cd);
+  background-image: linear-gradient(top, #049cdb, #0064cd);
+  filter: progid: DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #0064cd #0064cd #003f81;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+.btn.active, .btn:active {
+  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+.btn.disabled {
+  cursor: default;
+  background-image: none;
+  filter: progid: DXImageTransform.Microsoft.gradient(enabled = false);
+  filter: alpha(opacity=65);
+  -khtml-opacity: 0.65;
+  -moz-opacity: 0.65;
+  opacity: 0.65;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+.btn[disabled] {
+  cursor: default;
+  background-image: none;
+  filter: progid: DXImageTransform.Microsoft.gradient(enabled = false);
+  filter: alpha(opacity=65);
+  -khtml-opacity: 0.65;
+  -moz-opacity: 0.65;
+  opacity: 0.65;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+.btn.large {
+  font-size: 15px;
+  line-height: normal;
+  padding: 9px 14px 9px;
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+}
+.btn.small {
+  padding: 7px 9px 7px;
+  font-size: 11px;
+}
+:root .alert-message,:root .btn {
+  border-radius: 0 \0;
+}
+button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+.close {
+  float: right;
+  color: #000000;
+  font-size: 20px;
+  font-weight: bold;
+  line-height: 13.5px;
+  text-shadow: 0 1px 0 #ffffff;
+  filter: alpha(opacity=25);
+  -khtml-opacity: 0.25;
+  -moz-opacity: 0.25;
+  opacity: 0.25;
+}
+.close:hover {
+  color: #000000;
+  text-decoration: none;
+  filter: alpha(opacity=40);
+  -khtml-opacity: 0.4;
+  -moz-opacity: 0.4;
+  opacity: 0.4;
+}
+.alert-message {
+  position: relative;
+  padding: 7px 15px;
+  margin-bottom: 18px;
+  color: #404040;
+  background-color: #eedc94;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));
+  background-image: -moz-linear-gradient(top, #fceec1, #eedc94);
+  background-image: -ms-linear-gradient(top, #fceec1, #eedc94);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));
+  background-image: -webkit-linear-gradient(top, #fceec1, #eedc94);
+  background-image: -o-linear-gradient(top, #fceec1, #eedc94);
+  background-image: linear-gradient(top, #fceec1, #eedc94);
+  filter: progid: DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #eedc94 #eedc94 #e4c652;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  border-width: 1px;
+  border-style: solid;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+}
+.alert-message .close {
+  margin-top: 1px;
+  *margin-top: 0;
+}
+.alert-message a {
+  font-weight: bold;
+  color: #404040;
+}
+.alert-message.danger p a, .alert-message.error p a, .alert-message.success p a, .alert-message.info p a {
+  color: #ffffff;
+}
+.alert-message h5 {
+  line-height: 18px;
+}
+.alert-message p {
+  margin-bottom: 0;
+}
+.alert-message div {
+  margin-top: 5px;
+  margin-bottom: 2px;
+  line-height: 28px;
+}
+.alert-message .btn {
+  -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
+  -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
+  box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
+}
+.alert-message.block-message {
+  background-image: none;
+  background-color: #fdf5d9;
+  filter: progid: DXImageTransform.Microsoft.gradient(enabled = false);
+  padding: 14px;
+  border-color: #fceec1;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+.alert-message.block-message ul, .alert-message.block-message p {
+  margin-right: 30px;
+}
+.alert-message.block-message ul {
+  margin-bottom: 0;
+}
+.alert-message.block-message li {
+  color: #404040;
+}
+.alert-message.block-message .alert-actions {
+  margin-top: 5px;
+}
+.alert-message.block-message.error, .alert-message.block-message.success, .alert-message.block-message.info {
+  color: #404040;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+}
+.alert-message.block-message.error {
+  background-color: #fddfde;
+  border-color: #fbc7c6;
+}
+.alert-message.block-message.success {
+  background-color: #d1eed1;
+  border-color: #bfe7bf;
+}
+.alert-message.block-message.info {
+  background-color: #ddf4fb;
+  border-color: #c6edf9;
+}
+.alert-message.block-message.danger p a, .alert-message.block-message.error p a, .alert-message.block-message.success p a, .alert-message.block-message.info p a {
+  color: #404040;
+}
+.pagination {
+  height: 36px;
+  margin: 18px 0;
+}
+.pagination ul {
+  float: left;
+  margin: 0;
+  border: 1px solid #ddd;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+.pagination li {
+  display: inline;
+}
+.pagination a {
+  float: left;
+  padding: 0 14px;
+  line-height: 34px;
+  border-right: 1px solid;
+  border-right-color: #ddd;
+  border-right-color: rgba(0, 0, 0, 0.15);
+  *border-right-color: #ddd;
+  text-decoration: none;
+}
+.pagination a:hover, .pagination .active a {
+  background-color: #c7eefe;
+}
+.pagination .disabled a, .pagination .disabled a:hover {
+  background-color: transparent;
+  color: #bfbfbf;
+}
+.pagination .next a {
+  border: 0;
+}
+.well {
+  background-color: #f5f5f5;
+  margin-bottom: 20px;
+  padding: 19px;
+  min-height: 20px;
+  border: 1px solid #eee;
+  border: 1px solid rgba(0, 0, 0, 0.05);
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+}
+.well blockquote {
+  border-color: #ddd;
+  border-color: rgba(0, 0, 0, 0.15);
+}
+.modal-backdrop {
+  background-color: #000000;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 10000;
+}
+.modal-backdrop.fade {
+  opacity: 0;
+}
+.modal-backdrop, .modal-backdrop.fade.in {
+  filter: alpha(opacity=80);
+  -khtml-opacity: 0.8;
+  -moz-opacity: 0.8;
+  opacity: 0.8;
+}
+.modal {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  z-index: 11000;
+  max-height: 500px;
+  overflow: auto;
+  width: 560px;
+  margin: -250px 0 0 -280px;
+  background-color: #ffffff;
+  border: 1px solid #999;
+  border: 1px solid rgba(0, 0, 0, 0.3);
+  *border: 1px solid #999;
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  -webkit-background-clip: padding-box;
+  -moz-background-clip: padding-box;
+  background-clip: padding-box;
+}
+.modal .close {
+  margin-top: 7px;
+}
+.modal.fade {
+  -webkit-transition: opacity .3s linear, top .3s ease-out;
+  -moz-transition: opacity .3s linear, top .3s ease-out;
+  -ms-transition: opacity .3s linear, top .3s ease-out;
+  -o-transition: opacity .3s linear, top .3s ease-out;
+  transition: opacity .3s linear, top .3s ease-out;
+  top: -25%;
+}
+.modal.fade.in {
+  top: 50%;
+}
+.modal-header {
+  border-bottom: 1px solid #eee;
+  padding: 5px 15px;
+}
+.modal-body {
+  padding: 15px;
+}
+.modal-body form {
+  margin-bottom: 0;
+}
+.modal-footer {
+  background-color: #f5f5f5;
+  padding: 14px 15px 15px;
+  border-top: 1px solid #ddd;
+  -webkit-border-radius: 0 0 6px 6px;
+  -moz-border-radius: 0 0 6px 6px;
+  border-radius: 0 0 6px 6px;
+  -webkit-box-shadow: inset 0 1px 0 #ffffff;
+  -moz-box-shadow: inset 0 1px 0 #ffffff;
+  box-shadow: inset 0 1px 0 #ffffff;
+  zoom: 1;
+  margin-bottom: 0;
+}
+.modal-footer:before, .modal-footer:after {
+  display: table;
+  content: "";
+  zoom: 1;
+}
+.modal-footer:after {
+  clear: both;
+}
+.modal-footer .btn {
+  float: right;
+  margin-left: 5px;
+}
+.modal .popover, .modal .twipsy {
+  z-index: 12000;
+}
+.twipsy {
+  display: block;
+  position: absolute;
+  visibility: visible;
+  padding: 5px;
+  font-size: 11px;
+  z-index: 1000;
+  filter: alpha(opacity=80);
+  -khtml-opacity: 0.8;
+  -moz-opacity: 0.8;
+  opacity: 0.8;
+}
+.twipsy.fade.in {
+  filter: alpha(opacity=80);
+  -khtml-opacity: 0.8;
+  -moz-opacity: 0.8;
+  opacity: 0.8;
+}
+.twipsy.above .twipsy-arrow {
+  bottom: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-top: 5px solid #000000;
+}
+.twipsy.left .twipsy-arrow {
+  top: 50%;
+  right: 0;
+  margin-top: -5px;
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-left: 5px solid #000000;
+}
+.twipsy.below .twipsy-arrow {
+  top: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-bottom: 5px solid #000000;
+}
+.twipsy.right .twipsy-arrow {
+  top: 50%;
+  left: 0;
+  margin-top: -5px;
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-right: 5px solid #000000;
+}
+.twipsy-inner {
+  padding: 3px 8px;
+  background-color: #000000;
+  color: white;
+  text-align: center;
+  max-width: 200px;
+  text-decoration: none;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.twipsy-arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+}
+.popover {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 1000;
+  padding: 5px;
+  display: none;
+}
+.popover.above .arrow {
+  bottom: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-top: 5px solid #000000;
+}
+.popover.right .arrow {
+  top: 50%;
+  left: 0;
+  margin-top: -5px;
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-right: 5px solid #000000;
+}
+.popover.below .arrow {
+  top: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-bottom: 5px solid #000000;
+}
+.popover.left .arrow {
+  top: 50%;
+  right: 0;
+  margin-top: -5px;
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-left: 5px solid #000000;
+}
+.popover .arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+}
+.popover .inner {
+  background: #000000;
+  background: rgba(0, 0, 0, 0.8);
+  padding: 3px;
+  overflow: hidden;
+  width: 280px;
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+}
+.popover .title {
+  background-color: #f5f5f5;
+  padding: 9px 15px;
+  line-height: 1;
+  -webkit-border-radius: 3px 3px 0 0;
+  -moz-border-radius: 3px 3px 0 0;
+  border-radius: 3px 3px 0 0;
+  border-bottom: 1px solid #eee;
+}
+.popover .content {
+  background-color: #ffffff;
+  padding: 14px;
+  -webkit-border-radius: 0 0 3px 3px;
+  -moz-border-radius: 0 0 3px 3px;
+  border-radius: 0 0 3px 3px;
+  -webkit-background-clip: padding-box;
+  -moz-background-clip: padding-box;
+  background-clip: padding-box;
+}
+.popover .content p, .popover .content ul, .popover .content ol {
+  margin-bottom: 0;
+}
+.fade {
+  -webkit-transition: opacity 0.15s linear;
+  -moz-transition: opacity 0.15s linear;
+  -ms-transition: opacity 0.15s linear;
+  -o-transition: opacity 0.15s linear;
+  transition: opacity 0.15s linear;
+  opacity: 0;
+}
+.fade.in {
+  opacity: 1;
+}
+.label {
+  padding: 1px 3px 2px;
+  font-size: 9.75px;
+  font-weight: bold;
+  color: #ffffff;
+  text-transform: uppercase;
+  white-space: nowrap;
+  background-color: #bfbfbf;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  text-shadow: none;
+}
+.label.important {
+  background-color: #c43c35;
+}
+.label.warning {
+  background-color: #f89406;
+}
+.label.success {
+  background-color: #46a546;
+}
+.label.notice {
+  background-color: #62cffc;
+}
+.media-grid {
+  margin-left: -20px;
+  margin-bottom: 0;
+  zoom: 1;
+}
+.media-grid:before, .media-grid:after {
+  display: table;
+  content: "";
+  zoom: 1;
+}
+.media-grid:after {
+  clear: both;
+}
+.media-grid li {
+  display: inline;
+}
+.media-grid a {
+  float: left;
+  padding: 4px;
+  margin: 0 0 18px 20px;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
+  -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+.media-grid a img {
+  display: block;
+}
+.media-grid a:hover {
+  border-color: #0069d6;
+  -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+  -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+  box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+}
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/static/mobile.css
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/static/mobile.css	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/static/mobile.css	(revision 7459)
@@ -1,24 +1,22 @@
-#primary-navigation li a {
-  font-size:100%;
-  padding-bottom: 0.5em;
-  padding-left: 0.5em;
-  padding-right: 0.5em;
-  padding-top: 0.5em;
+.container {
+  width: 480px;
 }
 
-#user-navigation li a {
-  font-size: 86%;
-  padding-bottom: 0.5em;
-  padding-left: 0.5em;
-  padding-right: 0.5em;
-  padding-top: 0.8em;
+body {
+  padding-top: 60px;
 }
 
-#hd {
-  padding-left:0.3em;
-  padding-right:0.3em;
+select {
+  width: 60px;
 }
 
-#bd {
-  padding:0.6em;
+.dataTables_length {
+    float: left;
+    width: 40%;
 }
+
+.dataTables_filter {
+    float: right;
+    text-align: right;
+    width: 60%;
+}
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/static/waeup-base.css
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/static/waeup-base.css	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/static/waeup-base.css	(revision 7459)
@@ -1,32 +1,112 @@
 /* This is the base stylesheet for SIRP. It defines base styles
-additionally or modifying yuiapp.css styles and yuirfg.css. For themes, please create
+additionally or modifying Bootstrap styles. For themes, please create
 a stylesheet overriding values set here in a file named
 'waeuptheme-<SOME-NAME>.css' and include a utility and a resource in theming.py 
 and resources.py respectively. */
 
-#hd { background-color:#003366; }
-.block .hd { background-color:#003366; color:#fff; border-bottom:10px solid #262626; }
-.block .bd h1 { font-size:153.9%; color:green; margin-bottom:0.5em;}
-.block .bd h2 { font-size:153.9%; color:#003366; margin-bottom:0.5em;}
-.block .bd h3 { font-size:130%; color:#003366; margin-bottom:0.5em;}
-.spaces .hd { background-color:transparent; }
-.spaces .hd ul li { background-color:#003366; }
-a { color:#003366; }
-.tabs .hd ul li a:hover { background-color:#8d0399; }
+/* bootstrap.min customizations */
 
-/***** Henrik Stuff *****/
-
-.breadcrumbs { 
-  background-color: #fff; 
-  padding: 3px; 
-  margin-bottom: 1.3em 
+body {
+  padding-top: 56px;
+  background-color: #EEEEEE;
 }
 
-a, table td a {
-  text-decoration: none;
+.container-fluid>.sidebar {
+  width: 165px;
 }
 
-a:hover {
-  text-decoration: underline;
+.container-fluid > .content {
+  margin-left: 180px;
+}
+
+.well {
+  border: 0px;
+  background-color: #FFFFFF;
+  padding-bottom: 12px;
+  padding-left: 12px;
+  padding-right: 12px;
+  padding-top: 12px;
+}
+
+.content {
+  background-color: #FFFFFF;
+  margin-left: -20px;
+  margin-right: -20px;
+  padding-bottom: 16px;
+  padding-left: 20px;
+  padding-right: 20px;
+  padding-top: 16px;
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
+}
+
+.container {
+  width: 700px;
+}
+
+h2 {
+  margin-bottom: 12px;
+}
+
+.breadcrumb {
+  margin-left: 20px;
+  margin-right: 20px;
+  margin-bottom: 14px;
+  padding-left: 20px;
+  padding-right: 20px;
+  width: 940px;
+  background-color: #FFFFFF;
+  background-image: None;
+  border: 0px;
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+}
+
+
+select {
+  width: 180px;
+}
+
+ /* IE doesn't like the footer tag*/
+.footer {
+  padding-top: 17px;
+  border-top: 1px solid #eee;
+  margin-top: 50px;
+}
+
+ /* dataTables stuff */
+
+.dataTables_wrapper {
+  min-height: 50px;
+  margin-bottom: 50px;
+}
+
+.dataTables_filter {
+  margin-bottom: 20px;
+}
+
+ /* SIRP stuff */
+
+.actionbar {
+  margin-bottom: 16px;
+}
+
+.error {
+  color: red;
+}
+
+.form-table {
+  width: 100%;
+}
+
+.form-table td {
+  padding: 5px 5px 4px;
+  border-top: none;
+}
+
+.fieldname {
+  width: 25%;
 }
 
@@ -38,445 +118,37 @@
   padding: 4px;
   margin-bottom: 8px;
+  line-height: 16px;
 }
 
-.form-status {
-    border:1px solid #fbb;
-    background-color:#fdd;
-    text-align:center;
-    padding: 2px;
+.student-info-bar{
+  padding: 7px 14px;
+  margin-left: -20px;
+  margin-right: -20px;
+  margin-bottom: 14px;
+  padding-left: 20px;
+  padding-right: 20px;
+  width: 700px;
+  background-color: #FFFFFF;
+  background-image: None;
+  border: 0px;
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
 }
 
-.hint {
-    color: #CD0A0A;
-    padding-left: 4px;
+.student-info-bar li {
+  display: inline;
+  text-shadow: 0 1px 0 #ffffff;
 }
-
-
-.block {
-    margin-bottom: 0.5em;
+.student-info-bar .divider {
+  padding: 0 5px;
+  color: #bfbfbf;
 }
-
-.block .bd {
-    padding-bottom: 1em;
+.student-info-bar .active a {
+  color: #404040;
 }
-
-.actionButtons {
-    padding-top: 1em;
-}
-
 .wfstatus {
   float: right;
+  line-height: 18px;
 }
-
-.studentmenu {
-  text-align: left;
-  line-height: 2;
-}
-
-.error {
-  border:0px
-}
-
-/* Define different styles for headlines in rendered restructured text */
-
-#rest h1 {
-  font-size:130%;
-}
-
-#rest h2 {
-  font-size:100%;
-}
-
-#rest h3 {
-  font-size:100%;
-}
-
-
-#rest h4 {
-  font-size:100%;
-}
-
-/* jquery-ui customizations */
-
-.ui-corner-all, .ui-corner-top {
-  -moz-border-radius-bottomleft: 0px;
-  -moz-border-radius-bottomright: 0px;
-  -moz-border-radius-topleft: 7px;
-  -moz-border-radius-topright: 7px;
-}
-
-.ui-widget {
-  font-family: Verdana,Arial,sans-serif;
-  font-size: 100%;
-}
-
-.ui-tabs .ui-tabs-nav li a:hover {
-  text-decoration: underline;
-}
-
-.dataTables_wrapper {
-  min-height: 100px;
-}
-
-.dataTables_info {
-  padding-top: 15px;
-  float: None;
-}
-
-.dataTables_paginate {
-  padding-top: 15px;
-}
-
-
-/***** Uli Stuff *****/
-
-/* Make YUI button icons appear vertically centered... */
-.yui-skin-sam .yui-button a img {
-  vertical-align: middle;
-  margin-right: 3px;
-  margin-top: -1px;
-  margin-left: -2px;
-}
-
-/* Fix logo image height: as image is taller than h1 text, header area
-   explodes otherwise */
-#logo img {
-  margin-top: -45px;
-  position: relative;
-  top: 12px;
-}
-
-.actionbar { 
-  margin-top: -18px;
-  margin-bottom: 18px;
-}
-
-/* Form labels */
-form label, form label span {
-  color: #333;
-  font-weight: bold;
-  font-size: 100%;
-}
-
-/* Fixes to let tables appear correctly... */
-table, tr, th, td {font-family: arial,sans-serif;}
-
-/* Odd and even table rows */
-tr.even,
-.yui-skin-sam tr.yui-dt-even {
-  background-color: #fff;
-}
-tr.odd,
-.yui-skin-sam tr.yui-dt-odd {
-  background-color: #eee;
-}
-
-/* unselected paginator page numbers */
-.yui-skin-sam .yui-pg-pages a.yui-pg-page {
-  background-color: #fff;
-  color: #000;
-  text-decoration: none;
-  border: 1px solid #000;
-  padding-left: 5px;
-}
-
-/* selected paginator page, hover for unselected pages */
-.yui-skin-sam .yui-pg-pages a.yui-pg-page:hover,
-.yui-skin-sam span.yui-pg-page {
-  background-color: #000;
-  color: #fff;
-}
-
-/* paginator prev, next, etc. links */
-.yui-skin-sam .yui-dt .yui-dt-paginator a.yui-pg-first,
-.yui-skin-sam .yui-dt .yui-dt-paginator a.yui-pg-previous,
-.yui-skin-sam .yui-dt .yui-dt-paginator a.yui-pg-last,
-.yui-skin-sam .yui-dt .yui-dt-paginator a.yui-pg-next {
-  color: #000;
-  text-decoration: none;
-  background-color: #fff;
-}
-
-/* Header row */
-th .yui-dt-liner {
-  color: #fff;
-  background: #000 url();
-}
-
-/* Header cells text, when not selected */
-.yui-skin-sam .yui-dt th, .yui-skin-sam .yui-dt th a {
-  font-weight: bold;
-  color: #fff;
-}
-
-/* Sortable header cells, when selected */
-.yui-skin-sam th.yui-dt-desc .yui-dt-liner .yui-dt-sortable,
-.yui-skin-sam th.yui-dt-asc .yui-dt-liner .yui-dt-sortable {
-  color: #000;
-}
-
-/* Action buttons */
-
-.yui-button {
-	display: -moz-inline-box;
-	display: inline-block;
-	vertical-align: text-bottom;
-}
-.yui-button .first-child {
-	display: block;
-	*display: inline-block;
-}
-.yui-button button, .yui-button a {
-	display: block;
-	*display: inline-block;
-	border: none;
-	margin: 0;
-}
-.yui-button button {
-	background-color: transparent;
-	*overflow: visible;
-	cursor: pointer;
-}
-.yui-button a {
-	text-decoration: none;
-}
-.yui-skin-sam .yui-button {
-	border-width: 1px 0;
-	border-style: solid;
-	border-color: #808080;
-	background: url(sprite.png) repeat-x 0 0;
-	margin: auto .25em;
-}
-.yui-skin-sam .yui-button .first-child {
-	border-width: 0 1px;
-	border-style: solid;
-	border-color: #808080;
-	margin: 0 -1px;
-	_margin: 0;
-}
-.yui-skin-sam .yui-button button, .yui-skin-sam .yui-button a {
-	padding: 0 10px;
-	font-size: 93%;
-	line-height: 2;
-	*line-height: 1.7;
-	min-height: 2em;
-	*min-height: auto;
-	color: #000;
-}
-.yui-skin-sam .yui-button a {
-	*line-height: 1.875;
-	*padding-bottom: 1px;
-}
-
-
-/* The follwing is stolen from jquery... */
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled { cursor: default !important; }
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { display: block; 
-           text-indent: -99999px; overflow: hidden;
-           background-repeat: no-repeat; }
-
-/* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(ui-icons_222222_256x240.png); }
-.ui-widget-content .ui-icon {background-image: url(ui-icons_222222_256x240.png); }
-.ui-widget-header .ui-icon {background-image: url(ui-icons_ffffff_256x240.png); }
-.ui-state-default .ui-icon { background-image: url(ui-icons_ef8c08_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(ui-icons_ef8c08_256x240.png); }
-.ui-state-active .ui-icon {background-image: url(ui-icons_ef8c08_256x240.png); }
-.ui-state-highlight .ui-icon {background-image: url(ui-icons_228ef1_256x240.png); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(ui-icons_e73434_256x240.png); }
-
-/* positioning */
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-off { background-position: -96px -144px; }
-.ui-icon-radio-on { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-span.ui-icon {
-               position: relative;
-               float: left;
-               margin-right: 4px;
-               margin-bottom: 0pt;
-               margin-left: -0pt;
-               left: 0.2em;
-}
-a span.ui-icon { 
-                 margin-top: 4px;
-                 }
Index: in/waeup.sirp/trunk/src/waeup/sirp/browser/static/waeuptheme-gray1.css
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/static/waeuptheme-gray1.css	(revision 7458)
+++ 	(revision )
@@ -1,202 +1,0 @@
-/* This is the bare minimum needed to create your own theme.
-In this example, all we're doing is overriding the default
-color scheme with our own. In the real world, you'd probably
-want to do more complex operations. */
- 
-
-.breadcrumbs { 
-  padding: 0.3em; 
-  margin-bottom: 0.8em;
-} 
-
-#hd { background-color:#232C30;}
-.block .hd { background-color:#456; color:#fff; }
-.block .bd h1 { color:#456; }
-.block .bd h2 { color:#456; }
-.block .bd h3 { color:#456; }
-.spaces .hd { background-color:transparent; }
-.spaces .hd ul li { background-color:#456; }
-a { color:#456; }
-.tabs .hd ul li a:hover { background-color:#cc0000; }
-
-#bd { padding:0.8em; }
-
-.yui-t2 #yui-main .yui-b {
-  margin-left:12.9em;
-}
-
-#hd {padding:0.5em 0.4em 0;}
-
-.block .hd { 
-  padding:0.3em 1em; border-bottom:0px solid #262626;
-}
-
-table td, table th {
-  padding:0.3em;
-}
-
-table thead {
-  font-weight:normal;
-}
-
-#primary-navigation li a {
-  font-size:100%;
-  padding:0.3em 1em;
-}
-
-#user-navigation li a {
-  font-size:90%;
-  padding:0.4em 1em;
-}
-
-#ft {
-  padding:0em 1em;
-}
-
-#navigation {
-  background-color:#456;
-  margin-top:1.0em;
-}
-
-.rounded #navigation ul li, .rounded #navigation ul li a {
-  -moz-border-radius-topleft:4px;
-  -moz-border-radius-topright:4px;
-}
-
-.rounded #navigation, .rounded .hd, .rounded .hd ul li, .rounded .hd ul li a {
-  -moz-border-radius-topleft:0px;
-  -moz-border-radius-topright:0px;
-}
-
-.yui-skin-sam .yui-button button, .yui-skin-sam .yui-button a {
-  color:#000000;
-  font-size:93%;
-  line-height:1.6em;
-  min-height:1em;
-  padding:0 10px;
-}
-
-.yui-button a:hover {
-  text-decoration: none;
-}
-
-
-.actionbar { 
-  margin-top: -10px;
-  margin-bottom: 18px;
-  margin-left: -15px;
-}
-
-form label, form label span {
-  font-size: 100%;
-  color: #222222;
-  font-weight: normal;  
-}
-
-/* jquery-ui customizations */
-
-.ui-tabs {
-  padding-bottom: 0em;
-  padding-left: 0em;
-  padding-right: 0em;
-  padding-top: 0em;
-  position: relative;
-}
-
-.ui-corner-all {
-  -moz-border-radius:0px;
-}
-
-.ui-corner-top {
-  -moz-border-radius-topleft:4px;
-  -moz-border-radius-topright:4px;
-}
-
-.ui-tabs .ui-tabs-nav {
-  margin: 0;
-  padding-left: 0.2em;
-  padding-right: 0.2em;
-  padding-bottom: 0;
-  padding-top: 0;
-
-}
-
-.ui-tabs .ui-tabs-nav li {
-  float: center;
-  margin-left: 6px;
-  margin-right: 0.2em;
-  margin-top: 0;
-  padding-left: 0;
-  padding-right: 0;
-  padding-top: 0;
-  position: relative;
-  top: 1px;
-  white-space: nowrap;
-
-}
-
-.ui-tabs .ui-tabs-nav li a {
-  float: center;
-  padding-bottom: 0.5em;
-  padding-left: 1em;
-  padding-right: 1em;
-  padding-top: 0.5em;
-  text-decoration: none;
-}
-
-
-
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected {
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-  background: #FFF;
-  border-width: 0px;
-  padding-top: 0px;
-  margin-top: 0px;
-}
-
-
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited {
-  color: #FFF;
-}
-
-.ui-state-active a:link, .ui-state-active a:visited {
-  color: #000;
-}
-
-.ui-widget-header, .ui-state-default, .ui-widget-header .ui-state-default {
-  
-  border-width: 0px;
-  background-color: #456;
-  background-image: none;
-  font-weight: normal;
-  color: white;
-}
-
-
-.ui-widget-header {
-  background-color: #456;
-  background-image: None;
-  border-color: #456;
-  border-style: solid;
-  border-width:0px;  
-}
-
-.ui-helper-reset {
-  font-size: 90%;
-  line-height: 1;
-}
-
-.ui-widget-content {
-  background-color: #FFFFFF;
-  background-image: none;
-  border-bottom-style: solid;
-  border-bottom-width: 1px;
-  border-top-style: solid;
-  border-top-width: 0px;
-  border-color: #456;
-}
-
-.ui-widget-content a {
-  color: #456;
-}
Index: in/waeup.sirp/trunk/src/waeup/sirp/browser/static/waeuptheme-red1.css
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/static/waeuptheme-red1.css	(revision 7458)
+++ 	(revision )
@@ -1,24 +1,0 @@
-/* This is the bare minimum needed to create your own theme.
-In this example, all we're doing is overriding the default
-color scheme with our own. In the real world, you'd probably
-want to do more complex operations. */
- 
-#hd { background-color:#840000; }
-.block .hd { background-color:#840000; color:#fff; border-bottom:10px solid #262626; }
-.block .bd h1 { color:#840000; }
-.block .bd h2 { color:#840000; }
-.block .bd h3 { color:#840000; }
-.spaces .hd { background-color:transparent; }
-.spaces .hd ul li { background-color:#840000; }
-a { color:#840000; }
-.tabs .hd ul li a:hover { background-color:#cc0000; }
-
-.uni-logo {
-  background-image: url("your-logo.gif");
-  background-position: 0 13px;
-  background-repeat: no-repeat;
-  padding-bottom: 18px;
-  padding-left: 0;
-  padding-right: 135px;
-  padding-top: 40px;
-}
Index: in/waeup.sirp/trunk/src/waeup/sirp/browser/static/yuiapp.css
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/static/yuiapp.css	(revision 7458)
+++ 	(revision )
@@ -1,141 +1,0 @@
-html, body { background-color:#f0f0ee; color:#222; }
-
-/* Make the page full bleed */
-#doc3 { margin:0; }
-
-/* Header */
-#hd { padding:1.2em 1.5em 0 1.5em; background-color:#7a1818; }
-h1 { font-size:230%; color:#fff; }
-
-#navigation { margin-top:1.5em; background-color:#262626; height:1%; }
-#navigation li { float:left; display:inline; }
-#navigation li a { display:block; color:#fff; text-decoration:none; }
-#navigation li a:hover { text-decoration:underline; }
-
-#primary-navigation li a { font-size:116%; padding:0.4em 1em; }
-#primary-navigation li.active a { background-color:#f0f0ee; color:#000; }
-
-#user-navigation { float:right; }
-#user-navigation li a { font-size:93%; padding:0.5em 1em; }
-
-/* Body */
-#bd { padding:1.5em; }
-h2 { font-size:153.9%; margin-bottom:0.5em; }
-h3 { font-size:153.9%; margin-bottom:0.5em; }
-
-/* Basic block */
-.block { margin-bottom:1.5em; }
-.block .hd { background-color:#7a1818; padding:0.7em 1em; color:#fff;
-             border-bottom:10px solid #262626; }
-.block .hd h2, .block .hd h3 { font-size:100%; margin-bottom:0; }
-.block .bd { padding:1em; background-color:#fff; }
-.block .bd h1 { color:#7a1818; }
-.block .bd h2 { color:#7a1818; }
-.block .bd h3 { color:#7a1818; }
-
-/* Extend block with tabs */
-.tabs .hd { padding:0; }
-.tabs .hd ul { height:1%; }
-.tabs .hd ul li { float:left; }
-.tabs .hd ul li a { display:block; color:#fff; text-decoration:none;
-                    padding:0.5em 1em; }
-.tabs .hd ul li a:hover { background-color:#470E0E; }
-.tabs .hd ul li.active a { background-color:#262626 !important; color:#fff;
-                           text-decoration:none; } /* important! fixes IE cascade issue */
-.tabs .hd h2, .tabs .hd h3 { position:absolute;
-                             margin-left:-5000px; } /* Hidden SEO Header if needed */
-
-/* Extend tab block with spaced tabs */
-.spaces .hd { background-color:transparent; }
-.spaces .hd ul li { background-color:#7a1818; margin-right:0.1em; }
-
-/* Extend block and header to have rounded corners */
-.rounded .hd,
-.rounded .hd ul li,
-.rounded .hd ul li a,
-.rounded #navigation,
-.rounded #navigation ul li,
-.rounded #navigation ul li a {
-    -moz-border-radius-topright:7px;
-    -moz-border-radius-topleft:7px;
-    -webkit-border-top-right-radius:7px;
-    -webkit-border-top-left-radius:7px;
-}
-
-/* Style the horizontal rules inside .block */
-.block hr { background-color:#f0f0ee; color:#f0f0ee; height:1px; border:0; }
-
-/* Tables */
-table { width:100%; margin-bottom:2em; }
-table td, table th { padding:0.5em; }
-table thead { background-color:#262626; color:#fff; font-weight:bold; }
-table thead a { text-decoration:none; color:#fff; }
-table thead a:hover { text-decoration:underline; }
-table tbody a { text-decoration:underline; }
-
-table.zebra tbody tr:nth-child(even) {background: #eee}
-table.zebra tbody tr:nth-child(odd) {background: #fff}
-
-
-
-/* Pager control*/
-ul.pager { text-align:right; }
-ul.pager li { display:inline; }
-ul.pager li a { padding:0.1em 0.3em; margin-right:0.3em; border:1px solid #000;
-                text-decoration:none; color:#000; }
-ul.pager li.active a, ul.pager li a:hover { background-color:#000; color:#fff; }
-
-
-
-/* Forms */
-form label { font-weight:bold; }
-form label span { font-weight:normal; color:#f00; font-size:85%; }
-form span.info { font-style:italic; color:#aaa; font-size:85%; }
-form .text { display:block; width:99%; border:1px solid #aaa; padding:0.3em; }
-form .column { width:48%; }
-form .left { float:left; }
-form .right { float:right; }
-
-/* Messages */
-.alert { padding:0.5em; text-align:center; }
-.error { border:2px solid #fbb; background-color:#fdd; }
-.warning { border:2px solid #fffaaa; background-color:#ffc; }
-.notice { border:2px solid #1fdf00; background-color:#bbffb6; }
-
-/* Lists */
-ol.list, ul.list, dl.list { margin-left:2em; margin-bottom:1em; }
-ol.list li { list-style:decimal outside; }
-ul.list li { list-style:disc outside; }
-dl.list dd { margin-left:1em; }
-
-ul.biglist { margin-bottom:1em; }
-ul.biglist li { margin-top:-1px; border:1px solid #f0f0ee;
-                border-width:1px 0 1px 0; }
-ul.biglist li a { display:block; padding:0.5em 0; text-decoration:none;
-                  color:#000; }
-ul.biglist li a:hover { text-decoration:underline; }
-
-/* Footer */
-#ft { text-align:center; font-size:85%; padding:0.5em 1em; color:#262626; }
-
-/* Generics */
-p { margin-bottom:1em; }
-a { color:#7a1818; }
-strong { font-weight:bold; }
-em { font-style:italic; }
-abbr, acronym { border-bottom:1px dotted #000; cursor:help; }
-
-.small { font-size:85%; }
-.gray { color:#999; }
-.highlight { background-color:#ffffcc; }
-.clear { clear:both; }
-.text-left { text-align:left; }
-.text-right { text-align:right; }
-.text-center { text-align:center; }
-
-/* datepicker */
-.ui-datepicker { background-color:#e0e0dd; }
-.ui-datepicker-title { font-weight: bold;  }
-
-/* use monospace font in textearea-based widgets */
-div.widget textarea { font-family: monospace; }
Index: in/waeup.sirp/trunk/src/waeup/sirp/browser/static/yuirfg.css
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/static/yuirfg.css	(revision 7458)
+++ 	(revision )
@@ -1,317 +1,0 @@
-/*Copyright (c) 2009, Yahoo! Inc. All rights reserved.Code licensed under the BSD License:http://developer.yahoo.net/yui/license.txtversion: 2.7.0*/
-html {
-	color: #000;
-	background: #FFF;
-}
-body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fieldset, legend, input, button, textarea, p, blockquote, th, td {
-	margin: 0;
-	padding: 0;
-}
-table {
-	border-collapse: collapse;
-	border-spacing: 0;
-}
-fieldset, img {
-	border: 0;
-}
-address, caption, cite, code, dfn, em, strong, th, var, optgroup {
-	font-style: inherit;
-	font-weight: inherit;
-}
-del, ins {
-	text-decoration: none;
-}
-li {
-	list-style: none;
-}
-caption, th {
-	text-align: left;
-}
-h1, h2, h3, h4, h5, h6 {
-	font-size: 100%;
-	font-weight: normal;
-}
-q:before, q:after {
-	content: '';
-}
-abbr, acronym {
-	border: 0;
-	font-variant: normal;
-}
-sup {
-	vertical-align: baseline;
-}
-sub {
-	vertical-align: baseline;
-}
-legend {
-	color: #000;
-}
-input, button, textarea, select, optgroup, option {
-	font-family: inherit;
-	font-size: inherit;
-	font-style: inherit;
-	font-weight: inherit;
-}
-input, button, textarea, select {
-	*font-size: 100%;
-}
-body {
-	font: 13px/1.231 arial, helvetica, clean, sans-serif;
-	*font-size: small;
-	*font: x-small;
-}
-select, input, button, textarea, button {
-	font: 99% arial, helvetica, clean, sans-serif;
-}
-table {
-	font-size: inherit;
-	font: 100%;
-}
-pre, code, kbd, samp, tt {
-	font-family: monospace;
-	*font-size: 108%;
-	line-height: 100%;
-}
-body {
-	text-align: center;
-}
-#doc, #doc2, #doc3, #doc4, .yui-t1, .yui-t2, .yui-t3, .yui-t4, .yui-t5, .yui-t6, .yui-t7 {
-	margin: auto;
-	text-align: left;
-	width: 57.69em;
-	*width: 56.25em;
-}
-#doc2 {
-	width: 73.076em;
-	*width: 71.25em;
-}
-#doc3 {
-	margin: auto 10px;
-	width: auto;
-}
-#doc4 {
-	width: 74.923em;
-	*width: 73.05em;
-}
-.yui-b {
-	position: relative;
-}
-.yui-b {
-	_position: static;
-}
-#yui-main .yui-b {
-	position: static;
-}
-#yui-main, .yui-g .yui-u .yui-g {
-	width: 100%;
-}
-.yui-t1 #yui-main, .yui-t2 #yui-main, .yui-t3 #yui-main {
-	float: right;
-	margin-left: -25em;
-}
-.yui-t4 #yui-main, .yui-t5 #yui-main, .yui-t6 #yui-main {
-	float: left;
-	margin-right: -25em;
-}
-.yui-t1 .yui-b {
-	float: left;
-	width: 12.30769em;
-	*width: 12.00em;
-}
-.yui-t1 #yui-main .yui-b {
-	margin-left: 13.30769em;
-	*margin-left: 13.05em;
-}
-.yui-t2 .yui-b {
-	float: left;
-	width: 13.8461em;
-	*width: 13.50em;
-}
-.yui-t2 #yui-main .yui-b {
-	margin-left: 14.8461em;
-	*margin-left: 14.55em;
-}
-.yui-t3 .yui-b {
-	float: left;
-	width: 23.0769em;
-	*width: 22.50em;
-}
-.yui-t3 #yui-main .yui-b {
-	margin-left: 24.0769em;
-	*margin-left: 23.62em;
-}
-.yui-t4 .yui-b {
-	float: right;
-	width: 13.8456em;
-	*width: 13.50em;
-}
-.yui-t4 #yui-main .yui-b {
-	margin-right: 14.8456em;
-	*margin-right: 14.55em;
-}
-.yui-t5 .yui-b {
-	float: right;
-	width: 18.4615em;
-	*width: 18.00em;
-}
-.yui-t5 #yui-main .yui-b {
-	margin-right: 19.4615em;
-	*margin-right: 19.125em;
-}
-.yui-t6 .yui-b {
-	float: right;
-	width: 23.0769em;
-	*width: 22.50em;
-}
-.yui-t6 #yui-main .yui-b {
-	margin-right: 24.0769em;
-	*margin-right: 23.62em;
-}
-.yui-t7 #yui-main .yui-b {
-	display: block;
-	margin: 0 0 1em 0;
-}
-#yui-main .yui-b {
-	float: none;
-	width: auto;
-}
-.yui-gb .yui-u, .yui-g .yui-gb .yui-u, .yui-gb .yui-g, .yui-gb .yui-gb, .yui-gb .yui-gc, .yui-gb .yui-gd, .yui-gb .yui-ge, .yui-gb .yui-gf, .yui-gc .yui-u, .yui-gc .yui-g, .yui-gd .yui-u {
-	float: left;
-}
-.yui-g .yui-u, .yui-g .yui-g, .yui-g .yui-gb, .yui-g .yui-gc, .yui-g .yui-gd, .yui-g .yui-ge, .yui-g .yui-gf, .yui-gc .yui-u, .yui-gd .yui-g, .yui-g .yui-gc .yui-u, .yui-ge .yui-u, .yui-ge .yui-g, .yui-gf .yui-g, .yui-gf .yui-u {
-	float: right;
-}
-.yui-g div.first, .yui-gb div.first, .yui-gc div.first, .yui-gd div.first, .yui-ge div.first, .yui-gf div.first, .yui-g .yui-gc div.first, .yui-g .yui-ge div.first, .yui-gc div.first div.first {
-	float: left;
-}
-.yui-g .yui-u, .yui-g .yui-g, .yui-g .yui-gb, .yui-g .yui-gc, .yui-g .yui-gd, .yui-g .yui-ge, .yui-g .yui-gf {
-	width: 49.1%;
-}
-.yui-gb .yui-u, .yui-g .yui-gb .yui-u, .yui-gb .yui-g, .yui-gb .yui-gb, .yui-gb .yui-gc, .yui-gb .yui-gd, .yui-gb .yui-ge, .yui-gb .yui-gf, .yui-gc .yui-u, .yui-gc .yui-g, .yui-gd .yui-u {
-	width: 32%;
-	margin-left: 1.99%;
-}
-.yui-gb .yui-u {
-	*margin-left: 1.9%;
-	*width: 31.9%;
-}
-.yui-gc div.first, .yui-gd .yui-u {
-	width: 66%;
-}
-.yui-gd div.first {
-	width: 32%;
-}
-.yui-ge div.first, .yui-gf .yui-u {
-	width: 74.2%;
-}
-.yui-ge .yui-u, .yui-gf div.first {
-	width: 24%;
-}
-.yui-g .yui-gb div.first, .yui-gb div.first, .yui-gc div.first, .yui-gd div.first {
-	margin-left: 0;
-}
-.yui-g .yui-g .yui-u, .yui-gb .yui-g .yui-u, .yui-gc .yui-g .yui-u, .yui-gd .yui-g .yui-u, .yui-ge .yui-g .yui-u, .yui-gf .yui-g .yui-u {
-	width: 49%;
-	*width: 48.1%;
-	*margin-left: 0;
-}
-.yui-g .yui-g .yui-u {
-	width: 48.1%;
-}
-.yui-g .yui-gb div.first, .yui-gb .yui-gb div.first {
-	*margin-right: 0;
-	*width: 32%;
-	_width: 31.7%;
-}
-.yui-g .yui-gc div.first, .yui-gd .yui-g {
-	width: 66%;
-}
-.yui-gb .yui-g div.first {
-	*margin-right: 4%;
-	_margin-right: 1.3%;
-}
-.yui-gb .yui-gc div.first, .yui-gb .yui-gd div.first {
-	*margin-right: 0;
-}
-.yui-gb .yui-gb .yui-u, .yui-gb .yui-gc .yui-u {
-	*margin-left: 1.8%;
-	_margin-left: 4%;
-}
-.yui-g .yui-gb .yui-u {
-	_margin-left: 1.0%;
-}
-.yui-gb .yui-gd .yui-u {
-	*width: 66%;
-	_width: 61.2%;
-}
-.yui-gb .yui-gd div.first {
-	*width: 31%;
-	_width: 29.5%;
-}
-.yui-g .yui-gc .yui-u, .yui-gb .yui-gc .yui-u {
-	width: 32%;
-	_float: right;
-	margin-right: 0;
-	_margin-left: 0;
-}
-.yui-gb .yui-gc div.first {
-	width: 66%;
-	*float: left;
-	*margin-left: 0;
-}
-.yui-gb .yui-ge .yui-u, .yui-gb .yui-gf .yui-u {
-	margin: 0;
-}
-.yui-gb .yui-gb .yui-u {
-	_margin-left: .7%;
-}
-.yui-gb .yui-g div.first, .yui-gb .yui-gb div.first {
-	*margin-left: 0;
-}
-.yui-gc .yui-g .yui-u, .yui-gd .yui-g .yui-u {
-	*width: 48.1%;
-	*margin-left: 0;
-}
-.yui-gb .yui-gd div.first {
-	width: 32%;
-}
-.yui-g .yui-gd div.first {
-	_width: 29.9%;
-}
-.yui-ge .yui-g {
-	width: 24%;
-}
-.yui-gf .yui-g {
-	width: 74.2%;
-}
-.yui-gb .yui-ge div.yui-u, .yui-gb .yui-gf div.yui-u {
-	float: right;
-}
-.yui-gb .yui-ge div.first, .yui-gb .yui-gf div.first {
-	float: left;
-}
-.yui-gb .yui-ge .yui-u, .yui-gb .yui-gf div.first {
-	*width: 24%;
-	_width: 20%;
-}
-.yui-gb .yui-ge div.first, .yui-gb .yui-gf .yui-u {
-	*width: 73.5%;
-	_width: 65.5%;
-}
-.yui-ge div.first .yui-gd .yui-u {
-	width: 65%;
-}
-.yui-ge div.first .yui-gd div.first {
-	width: 32%;
-}
-#hd:after, #bd:after, #ft:after, .yui-g:after, .yui-gb:after, .yui-gc:after, .yui-gd:after, .yui-ge:after, .yui-gf:after {
-	content: ".";
-	display: block;
-	height: 0;
-	clear: both;
-	visibility: hidden;
-}
-#hd, #bd, #ft, .yui-g, .yui-gb, .yui-gc, .yui-gd, .yui-ge, .yui-gf {
-	zoom: 1;
-}
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/actionbutton.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/actionbutton.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/actionbutton.pt	(revision 7459)
@@ -1,10 +1,7 @@
-<span class="yui-button" tal:condition="viewlet/target_url">
-  <span class="first-child">
-    <a href=""
-       tal:attributes="href viewlet/target_url">
-      <img src="" alt="edit"
-	   tal:attributes="src viewlet/icon_url;
-			   alt viewlet/alt"/>
-    <span tal:content="viewlet/text">TEXT</span></a>
-  </span>
-</span>
+<a class="btn actionbar" tal:condition="viewlet/target_url"
+   tal:attributes="href viewlet/target_url">
+  <img src="" alt="edit"
+   tal:attributes="src viewlet/icon_url;
+	   alt viewlet/alt"/>
+  <span tal:replace="viewlet/text">TEXT</span>
+</a>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/breadcrumbs.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/breadcrumbs.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/breadcrumbs.pt	(revision 7459)
@@ -1,13 +1,8 @@
-<div class="breadcrumbs">
-  <span tal:repeat="item viewlet/getEntries">
-    <a href="#"
-       tal:attributes="href item/url">
-      <span tal:content="item/title">
-	Entry
-      </span>
+<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">
-      >
-    </span>
-  </span>
-</div>
+    <span tal:condition="not: repeat/item/end" class="divider">/</span>
+  </li>
+</span>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatecoursepage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatecoursepage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatecoursepage.pt	(revision 7459)
@@ -1,5 +1,5 @@
 <h2 tal:content="context/longtitle">TITLE</h2>
 
-<table class="zebra">
+<table class="form-table">
   <thead>
   </thead>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatemanagepage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatemanagepage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatemanagepage.pt	(revision 7459)
@@ -3,5 +3,5 @@
 tal:content="view/label">Label</h2>
 
-<div class="form-status"
+<div class="alert-message error"
     tal:define="status view/status"
     tal:condition="status">
@@ -13,153 +13,151 @@
 
 <form action="." tal:attributes="action request/URL" method="POST"
-      class="edit-form" enctype="multipart/form-data"> 
+      enctype="multipart/form-data"> 
 
-<div id="tabs">
-  <ul>
-    <li><a href="#tab-1"><span>Settings</span></a></li>
+  <ul class="tabs" data-tabs="tabs">
+    <li class="active"><a href="#tab-1"><span>Settings</span></a></li>
     <li><a href="#tab-2"><span>Course Referrers</span></a></li>
     <li><a href="#tab-3"><span>Local Roles</span></a></li>
   </ul>
    
-  <div id="tab-1">
-        <table class="zebra">
+  <div class="tab-content">
+    <div id="tab-1" class="active">
+          <table class="form-table">
+          <tbody>
+          <tal:block repeat="widget view/widgets">
+            <tr>
+              <td class="fieldname">
+                <span tal:condition="widget/required">*</span>
+                <span i18n:translate="" tal:content="widget/label">label</span>:
+              </td>
+              <td>
+                <span tal:content="structure widget">
+                  <input type="text" />
+                </span>
+                <tal:error tal:condition="widget/error">
+                  <span tal:replace="structure widget/error">error</span>
+                </tal:error>
+                <tal:hint tal:condition="widget/hint">
+                  <span tal:content="structure widget/hint">hint</span>
+                </tal:hint>
+              </td>
+            </tr>
+          </tal:block>
+          </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 id="tab-2">
+      <h3>Course Referrers</h3>
+      <table class="display dataTableManage">
+        <thead>
+          <tr>
+            <th>&nbsp;</th><th>Level</th><th>Semester</th><th>Referrer</th><th>Course</th><th>Title</th>
+            <th>Mandatory</th>
+          </tr>
+        </thead>
         <tbody>
-        <tal:block repeat="widget view/widgets">
-          <tr>
-            <td class="label">
-              <label tal:attributes="for widget/name">
-                <span class="required" tal:condition="widget/required">*</span>
-                <span i18n:translate="" tal:content="widget/label">label</span>:
-              </label>
+          <tr tal:repeat="cc context/values" class="gradeC">
+             <td>
+              <input type="checkbox"
+        		 name="val_id"
+        		 tal:attributes="value cc/__name__" />
             </td>
-            <td class="field">
-              <span class="widget" tal:content="structure widget">
-                <input type="text" />
+             <td>
+              <span tal:content="cc/level">
+        	   LEVEL
               </span>
-              <tal:error tal:condition="widget/error">
-                <span tal:replace="structure widget/error">error</span>
-              </tal:error>
-              <tal:hint tal:condition="widget/hint">
-                <span class="hint" tal:content="structure widget/hint">hint</span>
-              </tal:hint>
+            </td>
+            <td tal:content="cc/course/semester">SEMESTER</td>
+            <td>
+              <a tal:attributes="href python: view.url(cc)"
+        	     tal:content="cc/__name__">
+            	REFERRER CODE
+              </a>
+            </td>
+            <td>
+              <a tal:attributes="href python:view.url(cc.course)"
+        	     tal:content="cc/course/code">
+            	COURSE CODE
+              </a>
+            </td>
+            <td>
+              <span tal:content="cc/course/title">
+        	   COURSE TITLE
+              </span>
+            </td>
+            <td>
+              <span tal:content="cc/core_or_elective">
+        	   MANDATORY
+              </span>
             </td>
           </tr>
-        </tal:block>
         </tbody>
-        </table>
-        <div class="actionButtons" 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 id="tab-2">
-    <h3>Course Referrers</h3>
-    <table class="display dataTableManage">
-      <thead>
-        <tr>
-          <th>&nbsp;</th><th>Level</th><th>Semester</th><th>Referrer</th><th>Course</th><th>Title</th>
-          <th>Mandatory</th>
+      </table>
+      <div tal:condition="view/availableActions">
+        <span tal:repeat="action view/actions"
+              tal:omit-tag="">
+          <input tal:condition="python:action.label in view.tabtwoactions"
+                 tal:replace="structure action/render"/>
+        </span>
+      </div>
+    </div>
+    <div id="tab-3"> <br />
+      <table class="display dataTableManage">
+        <thead>
+          <tr>
+            <th>&nbsp;
+            </th>
+            <th>User Id
+            </th>
+            <th>Name
+            </th>
+            <th>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.tabthreeactions1" 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>
-      </thead>
-      <tbody>
-        <tr tal:repeat="cc context/values">
-           <td>
-            <input type="checkbox"
-      		 name="val_id"
-      		 tal:attributes="value cc/__name__" />
-          </td>
-           <td>
-            <span tal:content="cc/level">
-      	   LEVEL
-            </span>
-          </td>
-          <td tal:content="cc/course/semester">SEMESTER</td>
-          <td>
-            <a tal:attributes="href python: view.url(cc)"
-      	     tal:content="cc/__name__">
-          	REFERRER CODE
-            </a>
-          </td>
-          <td>
-            <a tal:attributes="href python:view.url(cc.course)"
-      	     tal:content="cc/course/code">
-          	COURSE CODE
-            </a>
-          </td>
-          <td>
-            <span tal:content="cc/course/title">
-      	   COURSE TITLE
-            </span>
-          </td>
-          <td>
-            <span tal:content="cc/core_or_elective">
-      	   MANDATORY
-            </span>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-    <div class="actionButtons" tal:condition="view/availableActions">
-      <span tal:repeat="action view/actions"
-            tal:omit-tag="">
-        <input tal:condition="python:action.label in view.tabtwoactions"
-               tal:replace="structure action/render"/>
-      </span>
+      </table>
     </div>
   </div>
-  <div id="tab-3"> <br />
-    <table class="display dataTableManage">
-      <thead>
-        <tr>
-          <th>&nbsp;
-          </th>
-          <th>User Id
-          </th>
-          <th>Name
-          </th>
-          <th>Local Role
-          </th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr tal:repeat="entry view/getUsersWithLocalRoles" class="gradeB"> <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 class="actionButtons" tal:condition="view/availableActions">
-      <span tal:repeat="action view/actions" tal:omit-tag="">
-        <input tal:condition="python:action.label in view.tabthreeactions1" tal:replace="structure action/render"/>
-      </span>
-    </div><br /><br />
-    <table class="zebra">
-      <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>
-</div>
 </form>  
 
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatepage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatepage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/certificatepage.pt	(revision 7459)
@@ -1,5 +1,5 @@
 <h2 tal:content="context/longtitle">TITLE</h2>
 
-<table class="zebra">
+<table class="form-table">
 <thead>
 </thead>  
@@ -7,12 +7,10 @@
   <tal:block repeat="widget view/widgets">
     <tr>
-      <td>
-        <label tal:attributes="for widget/name">
-          <span i18n:translate=""
+      <td class="fieldname">
+        <span i18n:translate=""
                          tal:content="widget/label">label</span>:
-        </label>
       </td>
-      <td class="field" tal:on-error="default">
-        <div class="widget" tal:content="structure widget">
+      <td tal:on-error="default">
+        <div tal:content="structure widget">
           <input type="text" />
         </div>
@@ -33,5 +31,5 @@
 </thead>
 <tbody>
-  <tr tal:repeat="cc context/values">
+  <tr tal:repeat="cc context/values" class="gradeC">
      <td>
       <span tal:content="cc/level">
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/configurationmanagepage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/configurationmanagepage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/configurationmanagepage.pt	(revision 7459)
@@ -1,11 +1,10 @@
 <h2 i18n:translate="" tal:condition="view/label" tal:content="view/label">Label</h2>
-<div class="form-status"  tal:define="status view/status"  tal:condition="status"> Form Status:
+<div class="alert-message error"  tal:define="status view/status"  tal:condition="status"> Form Status:
   <span i18n:translate="" tal:content="view/status"> Form status summary
   </span>
 </div>
-<form action="." tal:attributes="action request/URL" method="POST" class="edit-form" enctype="multipart/form-data">
-  <div id="tabs">
-    <ul>
-      <li>
+<form action="." tal:attributes="action request/URL" method="POST" enctype="multipart/form-data">
+    <ul class="tabs" data-tabs="tabs">
+      <li class="active">
       <a href="#tab-1">
         <span>Site Settings
@@ -16,18 +15,18 @@
       </li>
     </ul>
-    <div id="tab-1">
-      <table class="zebra">
+    <div class="tab-content">
+    <div id="tab-1" class="active">
+      <table class="form-table">
         <tbody>
           <tal:block repeat="widget view/widgets">
             <tr>
-              <td class="label">
-                <label tal:attributes="for widget/name">
-                  <span class="required" tal:condition="widget/required">*
+              <td class="fieldname">
+                  <span tal:condition="widget/required">*
                   </span>
                   <span i18n:translate="" tal:content="widget/label">label
                   </span>:
-                </label> </td>
-              <td class="field">
-                <span class="widget" tal:content="structure widget">
+              </td>
+              <td>
+                <span tal:content="structure widget">
                   <input type="text" />
                 </span>
@@ -37,5 +36,5 @@
                 </tal:error>
                 <tal:hint tal:condition="widget/hint">
-                  <span class="hint" tal:content="structure widget/hint">hint
+                  <span tal:content="structure widget/hint">hint
                   </span>
                 </tal:hint> </td>
@@ -44,7 +43,8 @@
         </tbody>
       </table>
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <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"/>
+          <input tal:condition="python:action.label in view.taboneactions"
+                 tal:replace="structure action/render"/>
         </span>
       </div>
@@ -61,5 +61,5 @@
         </thead>
         <tbody>
-          <tr tal:repeat="entry view/getSessionConfigurations" class="gradeB"> <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>
@@ -67,5 +67,5 @@
         </tbody>
       </table>
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <div tal:condition="view/availableActions">
         <span tal:repeat="action view/actions" tal:omit-tag="">
           <input tal:condition="python:action.label in view.tabtwoactions" tal:replace="structure action/render"/>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/contactform.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/contactform.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/contactform.pt	(revision 7459)
@@ -1,4 +1,4 @@
 <form action="." tal:attributes="action request/URL" method="post"
-      class="edit-form" enctype="multipart/form-data">
+      enctype="multipart/form-data">
 
   <h2 i18n:translate=""
@@ -6,5 +6,5 @@
     tal:content="view/label">Label</h2>
 
-  <div class="form-status"
+  <div class="alert-message error"
       tal:define="status view/status"
       tal:condition="status">
@@ -21,5 +21,5 @@
          tal:content="widget/label">Label
     </div>
-    <div class="widget" tal:content="structure widget">
+    <div tal:content="structure widget">
       Textbody
     </div>
@@ -27,5 +27,5 @@
   </tal:block>
 
-  <div class="actionButtons" tal:condition="view/availableActions">
+  <div tal:condition="view/availableActions">
     <input tal:repeat="action view/actions"
            tal:replace="structure action/render"
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/coursepage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/coursepage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/coursepage.pt	(revision 7459)
@@ -1,25 +1,25 @@
 <h2 tal:content="context/title">TITLE</h2>
 
-<table class="listing">
+<table class="form-table">
   <thead>
   </thead>
   <tbody>
-    <tr class="odd">
+    <tr>
       <td>Code:</td>
       <td tal:content="context/__name__">CODE</td>
     </tr>  
-    <tr class="even">
+    <tr>
       <td>Title:</td>
       <td tal:content="context/title">THE TITLE</td>
     </tr>
-    <tr class="odd">
+    <tr>
       <td>Credits:</td>
       <td tal:content="context/credits">CREDITS</td>
     </tr>
-    <tr class="even">
+    <tr>
       <td>Passmark:</td>
       <td tal:content="context/passmark">PASSMARK</td>
     </tr>
-    <tr class="odd">
+    <tr>
       <td>Semester/Term:</td>
       <td tal:content="context/semester">SEMESTER</td>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport1page.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport1page.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport1page.pt	(revision 7459)
@@ -16,8 +16,7 @@
     </thead>
     <tbody>
-      <tr tal:repeat="file view/getFiles"
-      tal:attributes="class python: repeat['file'].odd() and 'odd' or ''">
+      <tr tal:repeat="file view/getFiles">
         <td>
-          <button type="submit" name="select"
+          <button type="submit" name="select" class="btn primary"
             tal:attributes="value file/name">Select</button>
         </td>
@@ -29,4 +28,4 @@
     </tbody>
   </table>
-  <input type="submit" name="cancel" value="Cancel" />
+  <input type="submit" name="cancel" class="btn" value="Cancel" />
 </form>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport2page.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport2page.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport2page.pt	(revision 7459)
@@ -13,5 +13,5 @@
   </p>
   <div>
-    <table class = "zebra"
+    <table
            tal:define="body view/getPreviewBody;
                         headers view/getPreviewHeader;
@@ -19,6 +19,5 @@
       <thead>
         <tr>
-          <th style="border: 1px solid #888;"
-              tal:repeat="headerfield headers"
+          <th tal:repeat="headerfield headers"
               tal:content="headerfield"> headerfield
           </th>
@@ -28,6 +27,5 @@
         <tr tal:repeat="row body">
           <td tal:repeat="value row"
-              tal:content="value"
-              style="border: 1px solid #000;"> value
+              tal:content="value"> value
           </td>
         </tr>
@@ -62,7 +60,7 @@
     </p>
   </div>
-  <input type="submit" name="cancel" value="Cancel" />
-  <input type="submit" name="back1" value="Back to step 1" />
-  <input tal:attributes="disabled python: view.getWarnings() and 'disabled' or ''"
+  <input class="btn" type="submit" name="cancel" value="Cancel" />
+  <input class="btn danger" type="submit" name="back1" value="Back to step 1" />
+  <input class="btn primary" tal:attributes="disabled python: view.getWarnings() and 'disabled' or ''"
     type="submit" name="proceed" value="Proceed to step 3..." />
 </form>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport3page.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport3page.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport3page.pt	(revision 7459)
@@ -1,2 +1,6 @@
+<div class="alert-message success" tal:condition="not: view/getWarnings">
+  Header fields OK
+</div>
+
 <h2 i18n:translate=""
 tal:condition="view/label"
@@ -25,10 +29,7 @@
      tal:attributes="value view/mode" />
   </p>
-  <div class="alert notice ui-state-info" tal:condition="not: view/getWarnings">
-    <span class="ui-icon ui-icon-info">A</span>
-    Header fields OK
-  </div>
+
   <div>
-    <table class = "zebra"
+    <table class="condensed-table"
      tal:define="body view/getPreviewBody;
            headers view/headerfields;
@@ -36,6 +37,5 @@
       <thead>
         <tr>
-          <th style="border: 1px solid #888;"
-              tal:repeat="headerfield headers"
+          <th tal:repeat="headerfield headers"
               tal:content="headerfield">
             headerfield
@@ -43,12 +43,10 @@
         </tr>
         <tr>
-          <th style="border: 1px solid #888; text-align=center;"
-              tal:repeat="headerfield headers">
+          <th tal:repeat="headerfield headers">
             <i>change to:</i>
           </th>
         </tr>
         <tr>
-          <th style="border: 1px solid #888;"
-              tal:repeat="headerfield headers">
+          <th tal:repeat="headerfield headers">
             <select name="headerfield">
               <option tal:repeat="opt view/getPossibleHeaders"
@@ -65,6 +63,5 @@
         <tr tal:repeat="row body">
           <td tal:repeat="value row"
-              tal:content="value"
-              style="border: 1px solid #000;">
+              tal:content="value">
             value
           </td>
@@ -74,10 +71,10 @@
   </div>
 
-  <input type="submit" name="cancel" value="Cancel" />
-  <input type="reset" name="reset" value="Reset" />
-  <input type="submit" name="update" value="Set headerfields" />
-  <br />
-  <input type="submit" name="back2" value="Back to step 2" />
-  <input tal:attributes="disabled python: view.getWarnings() and 'disabled' or ''"
+  <input class="btn" type="submit" name="cancel" value="Cancel" />
+  <input class="btn" type="reset" name="reset" value="Reset" />
+  <input class="btn" type="submit" name="update" value="Set headerfields" />
+  <br /><br />
+  <input class="btn danger" type="submit" name="back2" value="Back to step 2" />
+  <input class="btn primary" tal:attributes="disabled python: view.getWarnings() and 'disabled' or ''"
    type="submit" name="proceed" value="Perform import..." />
 </form>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport4page.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport4page.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterimport4page.pt	(revision 7459)
@@ -18,5 +18,5 @@
 </p>
 <form method="POST">
-  <input type="submit" name="finish" value="Back to data center" />
-  <input type="submit" name="showlog" value="View processing log" />
+  <input class="btn primary" type="submit" name="finish" value="Back to data center" />
+  <input class="btn" type="submit" name="showlog" value="View processing log" />
 </form>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterlogspage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterlogspage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterlogspage.pt	(revision 7459)
@@ -1,36 +1,34 @@
-<h2 i18n:translate=""
-tal:condition="view/label"
-tal:content="view/label">Label</h2>
-
+<h2 i18n:translate="" tal:condition="view/label" tal:content="view/label">Label</h2>
 <div tal:define="files view/files">
-  <p tal:condition="not: files">
-    Currently no log files are available.
+  <p tal:condition="not: files">Currently no log files are available.
   </p>
-  <table tal:condition="files">
+  <table tal:condition="files" class="condensed-table">
     <thead>
       <tr>
-  <th></th><th>File</th><th>Date</th><th>Size</th>
+        <th>
+        </th>
+        <th>File
+        </th>
+        <th>Date
+        </th>
+        <th>Size
+        </th>
       </tr>
     </thead>
     <tbody>
-      <tr tal:repeat="file files"
-    tal:attributes="class python: repeat['file'].odd() and 'odd' or 'even'">
-  <td class="text-center">
-    <form method="POST">
-      <input type="submit" name="show" value="Show" />
-      <input type="hidden" name="logname"
-       tal:attributes="value file/name" />
-    </form>
-  </td>
-  <td tal:content="file/name">file.name</td>
-  <td tal:content="file/uploaddate">Fri Jan 15 17:44:25 2010</td>
-  <td tal:content="file/getSize">12 bytes</td>
+      <tr tal:repeat="file files" tal:attributes="class python: repeat['file'].odd() and 'odd' or 'even'">
+        <td class="text-center">
+          <form method="POST">
+            <input type="submit" class="btn primary" name="show" value="Show" />
+            <input type="hidden" name="logname" tal:attributes="value file/name" />
+          </form></td>
+        <td tal:content="file/name">file.name</td>
+        <td tal:content="file/uploaddate">Fri Jan 15 17:44:25 2010</td>
+        <td tal:content="file/getSize">12 bytes</td>
       </tr>
     </tbody>
   </table>
-
   <form method="POST">
-    <input type="submit" name="back" value="Back to Data Center" />
+    <input type="submit" class="btn" name="back" value="Back to Data Center" />
   </form>
-
 </div>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterlogsshowfilepage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterlogsshowfilepage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterlogsshowfilepage.pt	(revision 7459)
@@ -4,8 +4,8 @@
 
 <form method="POST">
-  <input type="submit" name="back" value="Back" />
+  <input class="btn primary" type="submit" name="back" value="Back" />
 </form>
 
-<div class="bd">
+<div>
   <pre tal:content="view/filecontents">
     blah, blah
@@ -14,4 +14,4 @@
 
 <form method="POST">
-  <input type="submit" name="back" value="Back" />
+  <input class="btn primary" type="submit" name="back" value="Back" />
 </form>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacentermanagepage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacentermanagepage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacentermanagepage.pt	(revision 7459)
@@ -5,20 +5,17 @@
 <form method="POST">
   <div>
-    <label for="newpath">Storage path:</label>
+    Storage path:
     <input type="text" name="newpath"
      tal:attributes="value context/storage" />
     <br /><br />
-    <div>
-      <input type="checkbox" name="move" checked="checked" />
-      <label for="move">Copy existing data to new storage?</label>
-    </div>
-    <div>
-      <input type="checkbox" name="overwrite" checked="no" />
-      <label for="overwrite">Overwrite contents in new location?</label>
-    </div>
-    <br />
-    <input type="submit" name="save" value="Save" />
-    <input type="reset" name="reset" value="Reset" />
-    <input type="submit" name="cancel" value="Cancel" />
+    Copy existing data to new storage? &nbsp;&nbsp;
+    <input type="checkbox" name="move" checked="checked" />
+    <br /><br />
+    Overwrite contents in new location? &nbsp;&nbsp;
+    <input type="checkbox" name="overwrite" checked="no" />
+    <br /><br />
+    <input class="btn primary" type="submit" name="save" value="Save" />
+    <input class="btn" type="reset" name="reset" value="Reset" />
+    <input class="btn" type="submit" name="cancel" value="Cancel" />
   </div>
 </form>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterpage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterpage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenterpage.pt	(revision 7459)
@@ -19,6 +19,5 @@
   </thead>
   <tbody>
-    <tr tal:repeat="file context/getFiles"
-	tal:attributes="class python: repeat['file'].odd() and 'odd' or 'even'">
+    <tr tal:repeat="file context/getFiles">
       <td tal:content="file/name">thefilename</td>
       <td tal:content="file/size">12 k</td>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenteruploadpage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenteruploadpage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/datacenteruploadpage.pt	(revision 7459)
@@ -5,7 +5,8 @@
 <form method="post" enctype="multipart/form-data">
   <input type="file" name="uploadfile:file" />
+  <br /><br />
   <div>
-    <input type="submit" name="SUBMIT" value="Upload" />
-    <input type="submit" name="CANCEL" value="Cancel" />
+    <input class="btn primary" type="submit" name="SUBMIT" value="Upload" />
+    <input class="btn" type="submit" name="CANCEL" value="Cancel" />
   </div>
 </form>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/default_waeup_display_form.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/default_waeup_display_form.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/default_waeup_display_form.pt	(revision 7459)
@@ -3,9 +3,9 @@
     tal:content="view/label">Label</h2>
 
-<table class="zebra">
+<table class="form-table">
   <tbody>
     <tal:block repeat="widget view/widgets">
       <tr>
-        <td class="fieldname" width="33%">
+        <td class="fieldname">
           <tal:block content="widget/label"/>:
         </td>
@@ -18,5 +18,5 @@
   </tbody>
   <tfoot>
-    <tr class="controls">
+    <tr>
       <td colspan="2" class="align-right">
         <input tal:repeat="action view/actions"
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/default_waeup_edit_form.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/default_waeup_edit_form.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/default_waeup_edit_form.pt	(revision 7459)
@@ -1,4 +1,4 @@
 <form action="." tal:attributes="action request/URL" method="post"
-      class="edit-form" enctype="multipart/form-data">
+      enctype="multipart/form-data">
 
   <h2 i18n:translate=""
@@ -6,5 +6,5 @@
     tal:content="view/label">Label</h2>
 
-  <div class="form-status"
+  <div class="alert-message error"
       tal:define="status view/status"
       tal:condition="status">
@@ -13,23 +13,16 @@
         Form status summary
       </span>
-      <ul tal:condition="view/errors">
-        <li tal:repeat="error view/error_views">
-           <span tal:replace="structure error">Error Type</span>
-        </li>
-      </ul>
   </div>
 
-  <table class="zebra">
+  <table class="form-table">
     <tbody>
       <tal:block repeat="widget view/widgets">
         <tr>
-          <td class="label">
-            <label tal:attributes="for widget/name">
-              <span class="required" tal:condition="widget/required">*</span>
-              <span i18n:translate="" tal:content="widget/label">label</span>:
-            </label>
+          <td class="fieldname">
+            <span tal:condition="widget/required">*</span>
+            <span i18n:translate="" tal:content="widget/label">label</span>:
           </td>
-          <td class="field">
-            <span class="widget" tal:content="structure widget">
+          <td>
+            <span tal:content="structure widget">
               <input type="text" />
             </span>
@@ -38,5 +31,5 @@
             </tal:error>
             <tal:hint tal:condition="widget/hint">
-              <span class="hint" tal:content="structure widget/hint">hint</span>
+              <span tal:content="structure widget/hint">hint</span>
             </tal:hint>
           </td>
@@ -46,5 +39,5 @@
     </tbody>
   </table>
-  <div class="actionButtons" tal:condition="view/availableActions">
+  <div tal:condition="view/availableActions">
     <input tal:repeat="action view/actions"
            tal:replace="structure action/render"
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/departmentmanagepage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/departmentmanagepage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/departmentmanagepage.pt	(revision 7459)
@@ -1,39 +1,38 @@
 <h2 i18n:translate="" tal:condition="view/label" tal:content="view/label">Label</h2>
-<div class="form-status"  tal:define="status view/status"  tal:condition="status"> Form Status:
+<div class="alert-message error"  tal:define="status view/status"  tal:condition="status"> Form Status:
   <span i18n:translate="" tal:content="view/status"> Form status summary
   </span>
 </div>
-<form action="." tal:attributes="action request/URL" method="POST" class="edit-form" enctype="multipart/form-data">
-  <div id="tabs">
-    <ul>
-      <li>
-      <a href="#tab-1">
-        <span>Settings
-        </span></a>
-      </li>
-      <li>
-      <a href="#tab-2">Courses</a>
-      </li>
-      <li>
-      <a href="#tab-3">Certificates</a>
-      </li>
-      <li>
-      <a href="#tab-4">Local Roles</a>
-      </li>
-    </ul>
-    <div id="tab-1">
-      <table class="zebra">
+<form action="." tal:attributes="action request/URL" method="POST" enctype="multipart/form-data">
+  <ul class="tabs" data-tabs="tabs">
+    <li class="active">
+    <a href="#tab-1">
+      <span>Settings
+      </span></a>
+    </li>
+    <li>
+    <a href="#tab-2">Courses</a>
+    </li>
+    <li>
+    <a href="#tab-3">Certificates</a>
+    </li>
+    <li>
+    <a href="#tab-4">Local Roles</a>
+    </li>
+  </ul>
+  <div class="tab-content">
+    <div id="tab-1" class="active">
+      <table class="form-table">
         <tbody>
           <tal:block repeat="widget view/widgets">
             <tr>
-              <td class="label">
-                <label tal:attributes="for widget/name">
-                  <span class="required" tal:condition="widget/required">*
+              <td class="fieldname">
+                  <span tal:condition="widget/required">*
                   </span>
                   <span i18n:translate="" tal:content="widget/label">label
                   </span>:
-                </label> </td>
-              <td class="field">
-                <span class="widget" tal:content="structure widget">
+              </td>
+              <td>
+                <span tal:content="structure widget">
                   <input type="text" />
                 </span>
@@ -43,5 +42,5 @@
                 </tal:error>
                 <tal:hint tal:condition="widget/hint">
-                  <span class="hint" tal:content="structure widget/hint">hint
+                  <span tal:content="structure widget/hint">hint
                   </span>
                 </tal:hint> </td>
@@ -50,5 +49,5 @@
         </tbody>
       </table>
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <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"/>
@@ -69,5 +68,5 @@
         </thead>
         <tbody>
-          <tr tal:repeat="entry view/getCourses" class="gradeB"> <td>
+          <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>
@@ -76,5 +75,5 @@
         </tbody>
       </table>
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <div tal:condition="view/availableActions">
         <span tal:repeat="action view/actions" tal:omit-tag="">
           <input tal:condition="python:action.label in view.tabtwoactions" tal:replace="structure action/render"/>
@@ -95,5 +94,5 @@
         </thead>
         <tbody>
-          <tr tal:repeat="entry view/getCertificates" class="gradeB"> <td>
+          <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>
@@ -102,5 +101,5 @@
         </tbody>
       </table>
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <div tal:condition="view/availableActions">
         <span tal:repeat="action view/actions" tal:omit-tag="">
           <input tal:condition="python:action.label in view.tabthreeactions" tal:replace="structure action/render"/>
@@ -123,5 +122,5 @@
         </thead>
         <tbody>
-          <tr tal:repeat="entry view/getUsersWithLocalRoles" class="gradeB"> <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>
             <td tal:content="entry/user_name"> USERNAME </td>
@@ -131,10 +130,10 @@
         </tbody>
       </table>
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <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="zebra">
+      <table class="form-table">
         <tr> <td>
             <select id="user" name="user">
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/departmentpage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/departmentpage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/departmentpage.pt	(revision 7459)
@@ -3,11 +3,10 @@
 tal:content="view/label">Label</h2>
 
-<div id="tabs">
-    <ul>
-      <li><a href="#tab-1"><span>Courses</span></a></li>
-      <li><a href="#tab-2"><span>Certificates</span></a></li>
-    </ul>
-    
-    <div id="tab-1"> 
+<ul class="tabs" data-tabs="tabs">
+  <li class="active"><a href="#tab-1"><span>Courses</span></a></li>
+  <li><a href="#tab-2"><span>Certificates</span></a></li>
+</ul>
+<div class="tab-content">
+    <div id="tab-1" class="active">
     <br /> 
     <table class="display dataTable">
@@ -18,6 +17,5 @@
       </thead>
       <tbody>
-        <tr tal:repeat="entry view/getCourses"
-    	class="gradeB">
+        <tr tal:repeat="entry view/getCourses" class="gradeC">
           <td>
         	<a href=""
@@ -42,6 +40,5 @@
       </thead>
       <tbody>
-        <tr tal:repeat="entry view/getCertificates"
-    	class="gradeB">
+        <tr tal:repeat="entry view/getCertificates" class="gradeC">
           <td>
         	<a href=""
@@ -55,5 +52,4 @@
       </tbody>
     </table>
-    <br /><br />
     </div>
 </div>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultiescontainermanagepage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultiescontainermanagepage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultiescontainermanagepage.pt	(revision 7459)
@@ -3,5 +3,5 @@
     tal:content="view/label">Label</h2>
 
-<div class="form-status"
+<div class="alert-message error"
     tal:define="status view/status"
     tal:condition="status">
@@ -13,51 +13,39 @@
 
 <form action="." tal:attributes="action request/URL" method="POST"
-      class="edit-form" enctype="multipart/form-data">
+      enctype="multipart/form-data">
 
-  <div id="tabs">
-    <ul>
-      <li><a href="#tab-1">
-        <span tal:content="view/subunits">Contents</span>
-      </a></li>
-    </ul>
-
-    <div id="tab-1">
-      <h3 tal:content="view/subunits">Faculties</h3>
-      <table class="zebra">
-        <thead>
-          <tr>
-            <th>&nbsp;</th><th>Code</th><th>Title</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr tal:repeat="dep context/values">
-            <td>
-              <input type="checkbox"
-                     name="val_id"
-                     tal:attributes="value dep/code" />
-            </td>
-            <td>
-              <a tal:attributes="href python: view.url(dep)"
-                 tal:content="dep/__name__">
-                ID
-              </a>
-            </td>
-            <td>
-              <span tal:content="dep/title">
-                ID
-              </span>
-            </td>
-          </tr>
-        </tbody>
-      </table>
-      <div class="actionButtons" 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>
+  <table>
+    <thead>
+      <tr>
+        <th>&nbsp;</th><th>Code</th><th>Title</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr tal:repeat="dep context/values">
+        <td>
+          <input type="checkbox"
+                 name="val_id"
+                 tal:attributes="value dep/code" />
+        </td>
+        <td>
+          <a tal:attributes="href python: view.url(dep)"
+             tal:content="dep/__name__">
+            ID
+          </a>
+        </td>
+        <td>
+          <span tal:content="dep/title">
+            ID
+          </span>
+        </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.taboneactions"
+             tal:replace="structure action/render"/>
+    </span>
   </div>
 </form>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultymanagepage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultymanagepage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultymanagepage.pt	(revision 7459)
@@ -1,40 +1,40 @@
 <h2 i18n:translate="" tal:condition="view/label" tal:content="view/label">Label</h2>
-<div class="form-status" tal:define="status view/status" tal:condition="status"> Form Status:
+<div class="alert-message error" tal:define="status view/status"
+     tal:condition="status"> Form Status:
   <span i18n:translate="" tal:content="view/status"> Form status summary
   </span>
 </div>
-<form action="." tal:attributes="action request/URL" method="POST" class="edit-form" enctype="multipart/form-data">
-  <div id="tabs">
-    <ul>
-      <li>
-      <a href="#tab-1">
-        <span>Settings
-        </span></a>
-      </li>
-      <li>
-      <a href="#tab-2">
-        <span tal:content="view/subunits">Contents
-        </span> </a>
-      </li>
-      <li>
-      <a href="#tab-3">
-        <span>Local Roles
-        </span></a>
-      </li>
-    </ul>
-    <div id="tab-1">
-      <table class="zebra">
+<form action="." tal:attributes="action request/URL" method="POST" enctype="multipart/form-data">
+  <ul class="tabs" data-tabs="tabs">
+    <li class="active">
+    <a href="#tab-1">
+      <span>Settings
+      </span></a>
+    </li>
+    <li>
+    <a href="#tab-2">
+      <span tal:content="view/subunits">Contents
+      </span> </a>
+    </li>
+    <li>
+    <a href="#tab-3">
+      <span>Local Roles
+      </span></a>
+    </li>
+  </ul>
+  <div class="tab-content">
+    <div id="tab-1" class="active">
+      <table class="form-table">
         <tbody>
           <tal:block repeat="widget view/widgets">
             <tr>
-              <td class="label">
-                <label tal:attributes="for widget/name">
-                  <span class="required" tal:condition="widget/required">*
-                  </span>
-                  <span i18n:translate="" tal:content="widget/label">label
-                  </span>:
-                </label> </td>
-              <td class="field">
-                <span class="widget" tal:content="structure widget">
+              <td class="fieldname">
+                <span tal:condition="widget/required">*
+                </span>
+                <span i18n:translate="" tal:content="widget/label">label
+                </span>:
+              </td>
+              <td>
+                <span tal:content="structure widget">
                   <input type="text" />
                 </span>
@@ -44,5 +44,5 @@
                 </tal:error>
                 <tal:hint tal:condition="widget/hint">
-                  <span class="hint" tal:content="structure widget/hint">hint
+                  <span tal:content="structure widget/hint">hint
                   </span>
                 </tal:hint> </td>
@@ -51,7 +51,8 @@
         </tbody>
       </table>
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <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"/>
+          <input tal:condition="python:action.label in view.taboneactions"
+                 tal:replace="structure action/render"/>
         </span>
       </div>
@@ -59,5 +60,5 @@
     <div id="tab-2">
       <h3 tal:content="view/subunits">Departments</h3>
-      <table class="zebra">
+      <table>
         <thead>
           <tr>
@@ -72,6 +73,8 @@
         <tbody>
           <tr tal:repeat="dep context/values"> <td>
-              <input type="checkbox" name="val_id" tal:attributes="value dep/code" /> </td> <td>
-              <a tal:attributes="href python: view.url(dep)" tal:content="dep/__name__"> ID</a> </td> <td>
+              <input type="checkbox" name="val_id"
+                     tal:attributes="value dep/code" /> </td> <td>
+              <a tal:attributes="href python: view.url(dep)"
+                 tal:content="dep/__name__"> ID</a> </td> <td>
               <span tal:content="dep/title">ID
               </span> </td>
@@ -79,7 +82,8 @@
         </tbody>
       </table>
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <div tal:condition="view/availableActions">
         <span tal:repeat="action view/actions" tal:omit-tag="">
-          <input tal:condition="python:action.label in view.tabtwoactions" tal:replace="structure action/render"/>
+          <input tal:condition="python:action.label in view.tabtwoactions"
+                 tal:replace="structure action/render"/>
         </span>
       </div>
@@ -100,6 +104,7 @@
         </thead>
         <tbody>
-          <tr tal:repeat="entry view/getUsersWithLocalRoles" class="gradeB"> <td>
-              <input type="checkbox" name="role_id" tal:attributes="value python: entry['user_name']+'|'+entry['local_role']" /> </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>
             <td tal:content="entry/user_name"> USERNAME </td>
             <td tal:content="entry/user_title"> USERTITLE </td>
@@ -108,10 +113,11 @@
         </tbody>
       </table>
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <div tal:condition="view/availableActions">
         <span tal:repeat="action view/actions" tal:omit-tag="">
-          <input tal:condition="python:action.label in view.tabthreeactions1" tal:replace="structure action/render"/>
+          <input tal:condition="python:action.label in view.tabthreeactions1"
+                 tal:replace="structure action/render"/>
         </span>
       </div><br /><br />
-      <table class="zebra">
+      <table class="form-table">
         <tr> <td>
             <select id="user" name="user">
@@ -122,5 +128,6 @@
             </select> </td> <td>
             <select id="local_role" name="local_role">
-              <option tal:repeat="localrole view/getLocalRoles" tal:attributes="value localrole/name">
+              <option tal:repeat="localrole view/getLocalRoles"
+                      tal:attributes="value localrole/name">
               <span tal:replace="localrole/title">LOCALROLETITLE
               </span>
@@ -129,5 +136,6 @@
             <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"/>
+                <input tal:condition="python:action.label in view.tabthreeactions2"
+                       tal:replace="structure action/render"/>
               </span>
             </div> </td>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultypage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultypage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultypage.pt	(revision 7459)
@@ -5,5 +5,5 @@
 </div>
 
-<table class="zebra">
+<table>
   <thead>
     <tr>
@@ -14,5 +14,6 @@
   <tbody>
     <tr tal:repeat="value context/values">
-      <td> <a tal:attributes="href value/__name__"> <span tal:content="value/code">Name</span></a></td>
+      <td> <a tal:attributes="href value/__name__">
+          <span tal:content="value/code">Name</span></a></td>
       <td tal:content="value/longtitle">Title</td>
     </tr>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/loginpage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/loginpage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/loginpage.pt	(revision 7459)
@@ -1,18 +1,19 @@
 <h2 i18n:translate=""  tal:condition="view/label"  tal:content="view/label">Label</h2>
 <form method="post">
-  <table id="login" class="form"   summary="Table for entering login information">
+  <table id="login" class="form-table" summary="Table for entering login information">
     <tbody>
       <tr>
-        <th>
-          <label for="form.login">User Name or Student Id
-          </label>
-        </th> <td>
-          <input type="text" id="login" name="form.login" size="20" /> </td>
+        <td class="fieldname">
+          User Name or Student Id:
+        </td>
+        <td>
+          <input type="text" id="login" name="form.login" size="20" />
+        </td>
       </tr>
       <tr>
-        <th>
-          <label for="form.password">Password
-          </label>
-        </th><td>
+        <td class="fieldname">
+          Password:
+        </td>
+        <td>
           <input type="password" id="password" name="form.password"  size="20" value="" />
           &nbsp;&nbsp;
@@ -23,5 +24,5 @@
   </table>
   <input type="hidden" name="camefrom"   tal:attributes="value view/camefrom" />
-  <input type="submit" name="SUBMIT" value="Login" /><br /><br />
+  <input class="btn primary" type="submit" name="SUBMIT" value="Login" /><br /><br />
   <p>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.sirp/trunk/src/waeup/sirp/browser/templates/messages.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/messages.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/messages.pt	(revision 7459)
@@ -1,7 +1,6 @@
-<ul>
-  <li
-    tal:repeat="message view/messages"
-    tal:attributes="class message/type"
-    tal:content="structure message/message">Sauron will arrive soon!
-  </li>
-</ul>
+<div
+  tal:repeat="message view/messages"
+  tal:attributes="class message/type"
+  tal:content="structure message/message">Sauron will arrive soon!
+</div>
+
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/myrolespage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/myrolespage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/myrolespage.pt	(revision 7459)
@@ -1,9 +1,13 @@
 <h3 i18n:translate="">My Portal Roles:</h3>
-<span tal:repeat="role view/getSiteRoles">
-  <div tal:content="role" >ROLE</div>
-</span>
-<br /><br />
+<table class="form-table">
+<tr tal:repeat="role view/getSiteRoles">
+    <td>
+      <div tal:content="role" >ROLE</div>
+    </td>
+  </tr>
+</table>
+
 <h3 i18n:translate="">My Local Roles:</h3>
-<table>
+<table class="form-table">
   <tr tal:repeat="role view/getLocalRoles">
     <td valign="top" ><span tal:content="role" >ROLE</span>:</td>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/notfound.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/notfound.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/notfound.pt	(revision 7459)
@@ -3,5 +3,5 @@
 </h2>
 
-<div class="error"><b>Please note the following:</b></div>
+<div><b>Please note the following:</b></div>
 <div>
   <ol class="list">
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/plainactionbutton.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/plainactionbutton.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/plainactionbutton.pt	(revision 7459)
@@ -1,4 +1,4 @@
-<span class="yui-button" tal:condition="viewlet/target_url">
-  <span class="first-child">
+<span tal:condition="viewlet/target_url">
+  <span>
     <a href=""
        tal:attributes="href viewlet/target_url">
Index: in/waeup.sirp/trunk/src/waeup/sirp/browser/templates/removesubobjectspage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/removesubobjectspage.pt	(revision 7458)
+++ 	(revision )
@@ -1,32 +1,0 @@
-  <div tal:condition="python: not len(context.keys())">
-    There are no subobjects registered yet.
-  </div>
-  <form method="POST" tal:condition="python: len(context.keys())">
-    <div tal:condition="python: not len(context.keys())">
-    There are no faculties registered yet.
-    </div>
-    
-    <table>
-      <thead>
-        <tr>
-          <th>&nbsp;</th>
-          <th>Code</th>
-          <th>Title</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr tal:repeat="value context/values"
-    	tal:attributes="class python: repeat['value'].odd() and 'odd' or 'even'">
-    	  <td>
-    	  <input type="checkbox"
-    		 name="val_id"
-    		 tal:attributes="value value/__name__" />
-    	  </td>    	
-          <td> <a tal:attributes="href value/__name__"> <span tal:content="value/code">Name</span></a></td>
-          <td tal:content="value/title">Title</td>
-        </tr>
-      </tbody>
-    </table>
-    <input type="submit" name="REMOVE" value="Remove selected" onclick="return confirmPost('All sububjects will be removed too. Are you sure?')"/>
-    <input type="submit" name="CANCEL" value="Cancel" />
-  </form>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/searchpage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/searchpage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/searchpage.pt	(revision 7459)
@@ -3,5 +3,5 @@
   <input type="text" name="query"
 	 tal:attributes="value view/query" />
-    <input type="submit" name="SUBMIT" value="Search" />
+    <input class="btn primary" type="submit" name="SUBMIT" value="Search" />
 </form>
 <br />
@@ -31,5 +31,3 @@
         </tbody>
     </table>
-    <div class="actionButtons">
-    </div>
 </span>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/staffsitelayout.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/staffsitelayout.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/staffsitelayout.pt	(revision 7459)
@@ -13,100 +13,80 @@
         tal:attributes="title string:RSS feed of ${layout/getAppTitle};
             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:content="layout/getAppAcronym">Acronym</a>
+          <ul class="nav">
+            <tal:primary_nav content="structure provider:primary_nav" />
+          </ul>
+          <ul class="nav secondary-nav">
+            <li tal:condition="not: layout/isAuthenticated">
+            <a href="#" tal:attributes="href python: view.url(layout.site, 'login')">
+                Login
+            </a>
+            </li>
+            <li tal:condition="layout/isAuthenticated">
+            <a href="#" tal:attributes="href python: view.url(layout.site, '@@contactadmin')">
+                Contact
+            </a>
+            </li>
+            <li tal:condition="layout/isAuthenticated">
+            <a href="#" tal:attributes="href python: view.url(context, '@@logout')">Logout</a>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
 
-  </head>
-  <body class="rounded yui-skin-sam">
-    <div id="doc3" class="yui-t1">
-      <div id="hd" role="banner">
-        <div id="hd">
-          <h1 id="logo">
-            <a href="" tal:attributes="href view/application_url">
-              <span class="uni-logo">
-              </span> </a>
-            <span id="uni-title" tal:content="layout/getAppTitle"> Sample University
-            </span> </h1>
-          <div id="navigation" class="yui-navset" style="text-align:right;">
-            <ul id="primary-navigation">
-              <tal:primary_nav content="structure provider:primary_nav" />
+    <ul class="breadcrumb">
+      <tal:breadcrumbs
+            tal:condition="python: layout.isAuthenticated()"
+            tal:content="structure provider:breadcrumbs" />
+      <span tal:condition="layout/getStudentName" class="wfstatus">
+            Student Id:
+          <span tal:replace="python:context.getStudent().student_id">Id
+          </span>&nbsp;&nbsp;
+          State:
+          <span tal:replace="python:context.getStudent().state">State
+          </span>
+      </span>
+    </ul>
+
+    <div class="container-fluid">
+      <div class="sidebar">
+        <div class="well">
+          <div tal:condition="layout/getStudentName">
+            <h5 tal:content="layout/getStudentName">Student name</h5>
+            <ul>
+              <tal:left content="structure provider:left_studentmanage" />
             </ul>
-            <ul id="user-navigation">
-              <li tal:condition="not: layout/isAuthenticated">
-              <a href="#" tal:attributes="href python: view.url(layout.site, 'login')">
-                  Login
-              </a>
-              </li>
-              <li tal:condition="layout/isAuthenticated">
-              <a href="#" tal:attributes="href python: view.url(layout.site, '@@contactadmin')">
-                  Contact
-              </a>
-              </li>
-              <li tal:condition="layout/isAuthenticated">
-              <a href="#" tal:attributes="href python: view.url(context, '@@logout')">Logout</a>
-              </li>
+          </div>
+          <div tal:condition="layout/isAuthenticated">
+            <h5 tal:content="layout/getUserTitle">Username</h5>
+            <ul>
+              <tal:left content="structure provider:left" />
             </ul>
-            <div class="clear">
-            </div>
           </div>
         </div>
       </div>
-      <div id="bd" role="main">
-        <span tal:condition="python: layout.isAuthenticated()"
-              tal:content="structure provider:breadcrumbs" />
-
-        <div class="yui-b">
-          <div class="block" tal:condition="layout/getStudentName">
-            <div class="hd">
-              <h2 tal:content="layout/getStudentName">Student name</h2>
-            </div>
-            <div class="bd">
-              <tal:left content="structure provider:left_studentmanage" />
-            </div>
-          </div>
-          <div class="block" tal:condition="layout/isAuthenticated">
-            <div class="hd">
-              <h2 tal:content="layout/getUserTitle">Username</h2>
-            </div>
-            <div class="bd">
-              <tal:left content="structure provider:left" />
-            </div>
+      <div class="span13 content">
+        <div
+            tal:define="message context/@@messages"
+            tal:condition="python: len(message)>11">
+          <div tal:content="structure message">
           </div>
         </div>
-
-        <div id="yui-main">
-          <div class="yui-b">
-            <div class="yui-g">
-              <div class="block">
-                <div class="hd" tal:condition="python: layout.isAuthenticated()">
-                  <span tal:content="view/title"> THE CONTENT TITLE </span>
-                  <span tal:condition="layout/getStudentName" class="wfstatus">
-                  Sudent Id: <span tal:content="python:context.getStudent().student_id">Student Id</span>
-                  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                  State: <span tal:content="python:context.getStudent().state">State</span>
-                  </span>
-                </div>
-                <div class="bd">
-                  <div class="actionbar">
-                    <tal:actionbar content="structure provider:actionbar" />
-                  </div>
-                  <div class="alert warning ui-state-error"
-                      tal:define="message context/@@messages"
-                      tal:condition="python: len(message)>11">
-                    <span class="ui-icon ui-icon-alert">A
-                    </span>
-                    <span tal:content="structure message">
-                    </span>
-                  </div>
-                  <div tal:replace="structure view/content"> THE CONTENT
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
+        <span tal:replace="structure provider:actionbar" />
+        <div tal:content="structure view/content"> THE CONTENT
         </div>
-
-      </div>
-      <div id="ft" role="contentinfo">
-        <p>Student Information and Registration Portal<br />
-            Copyright &copy; WAeUP Group, 2008-2011
-        </p>
+        <div class="footer">
+          <p class="pull-right"><a href="#">Back to top</a></p>
+          <p>
+            Student Information and Registration Portal<br />
+            Copyright &copy; WAeUP Group, 2008-2012
+          </p>
+        </div>
       </div>
     </div>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/studentsitelayout.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/studentsitelayout.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/studentsitelayout.pt	(revision 7459)
@@ -10,5 +10,6 @@
     <meta name="viewport" content="width=320, initial-scale=1, maximum-scale=1"/>
     <link rel="stylesheet" media="only screen and (max-device-width: 480px)"
-        tal:attributes="href python: view.url(layout.site, '@@/waeup.sirp.browser/mobile.css')" type="text/css" />
+        tal:attributes="href python: view.url(layout.site, '@@/waeup.sirp.browser/mobile.css')"
+        type="text/css" />
     <link rel="shortcut icon" tal:attributes="href static/favicon.ico" type="image/x-icon" />
     <link rel="alternate" type="application/rss+xml" title="RSS"
@@ -16,94 +17,62 @@
         tal:attributes="title string:RSS feed of ${layout/getAppTitle};
             href python: view.url(layout.site, 'feed.rss')" />
-
   </head>
-  <body class="rounded yui-skin-sam">
-    <div id="doc3" class="yui-t7">
-      <div id="hd" role="banner">
-        <div id="hd">
-          <h1 id="logo">
-            <a href="" tal:attributes="href view/application_url">
-              <span class="uni-logo">
-              </span> </a>
-            <span id="uni-title" tal:content="layout/getAppTitle"> Sample University
-            </span> </h1>
-          <div id="navigation" class="yui-navset" style="text-align:right;">
-            <ul id="primary-navigation">
+  <body>
+    <div class="topbar" data-scrollspy="scrollspy" >
+      <div class="topbar-inner">
+        <div  class="container">
+          <a class="brand" href="#" tal:content="layout/getAppAcronym">Acronym</a>
+          <ul class="nav">
               <tal:primary_nav content="structure provider:primary_nav" />
               <tal:primary_nav content="structure provider:primary_nav_student" />
-            </ul>
-            <ul id="user-navigation">
-              <li tal:condition="not: layout/isAuthenticated">
-              <a href="#" tal:attributes="href python: view.url(layout.site, 'login')">
-                  Login
-              </a>
-              </li>
-              <li tal:condition="layout/isAuthenticated">
-              <a href="#" tal:attributes="href python: view.url(layout.site, '@@contactadmin')">
-                  Contact
-              </a>
-              </li>
-              <li tal:condition="layout/isAuthenticated">
-              <a href="#" tal:attributes="href python: view.url(context, '@@logout')">Logout</a>
-              </li>
-            </ul>
-            <div class="clear">
-            </div>
+          </ul>
+          <ul class="nav secondary-nav">
+            <li tal:condition="not: layout/isAuthenticated">
+            <a href="#" tal:attributes="href python: view.url(layout.site, 'login')">
+                Login
+            </a>
+            </li>
+            <li tal:condition="layout/isAuthenticated">
+            <a href="#" tal:attributes="href python: view.url(layout.site, '@@contactadmin')">
+                Contact
+            </a>
+            </li>
+            <li tal:condition="layout/isAuthenticated">
+            <a href="#" tal:attributes="href python: view.url(context, '@@logout')">Logout</a>
+            </li>
+          </ul>
+        </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">
+              Student Id:
+            <span tal:replace="python:context.getStudent().student_id">Id
+            </span>&nbsp;&nbsp;
+            State:
+            <span tal:replace="python:context.getStudent().state">State
+            </span>
+        </span>
+      </ul>
+      <div class="content">
+        <div tal:define="message context/@@messages"
+             tal:condition="python: len(message)>11">
+          <div tal:content="structure message">
           </div>
         </div>
-      </div>
-      <div id="bd" role="main">
-
-        <div class="yui-b">
-          <div class="block" >
-            <div class="studentmenu">
-              <div tal:condition="layout/getStudentName"
-                   tal:replace="structure provider:top_student">
-                Student Links
-              </div>
-              <div tal:content="structure provider:actionbar">
-                Student Actions
-              </div>
-            </div>
-          </div>
+        <span tal:replace="structure provider:actionbar" />
+        <div tal:content="structure view/content"> THE CONTENT
         </div>
-
-        <div id="yui-main">
-          <div class="yui-b">
-            <div class="yui-g">
-              <div class="block">
-                <div class="bd">
-                  <div class="actionbar">
-                    <span tal:condition="layout/getStudentName" class="wfstatus">
-                    Id:
-                    <span tal:replace="python:context.getStudent().student_id"
-                        class="wfstatus">Id</span>
-                    &nbsp;&nbsp;
-                    State:
-                    <span tal:replace="python:context.getStudent().state"
-                        class="wfstatus">State</span>
-                    </span>
-                  </div>
-                  <div class="alert warning ui-state-error"
-                      tal:define="message context/@@messages"
-                      tal:condition="python: len(message)>11">
-                    <span class="ui-icon ui-icon-alert">A
-                    </span>
-                    <span tal:content="structure message">
-                    </span>
-                  </div>
-                  <div tal:replace="structure view/content"> THE CONTENT
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
+        <div class="footer">
+          <p class="pull-right"><a href="#">Back to top</a></p>
+          <p>
+            Student Information and Registration Portal<br />
+            Copyright &copy; WAeUP Group, 2008-2012
+          </p>
         </div>
-
-      </div>
-      <div id="ft" role="contentinfo">
-        <p>Student Information and Registration Portal<br />
-            Copyright &copy; WAeUP Group, 2008-2011
-        </p>
       </div>
     </div>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/subobjectlist.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/subobjectlist.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/subobjectlist.pt	(revision 7459)
@@ -8,6 +8,5 @@
   </thead>
   <tbody>
-    <tr tal:repeat="row viewletmanager/rows"
-	tal:attributes="class python: repeat['row'].odd() and 'odd' or 'even'">
+    <tr tal:repeat="row viewletmanager/rows">
       <td tal:repeat="viewlet row">
 	<div tal:replace="structure viewlet/render">
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/universitypage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/universitypage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/universitypage.pt	(revision 7459)
@@ -1,3 +1,3 @@
-<h2 tal:content="view/label">Title</h2>
+<h1 tal:content="view/label">Title</h1>
 
 <span tal:replace="structure view/frontpage">Frontpage</span>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/usereditformpage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/usereditformpage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/usereditformpage.pt	(revision 7459)
@@ -1,4 +1,4 @@
 <form action="." tal:attributes="action request/URL" method="post"
-      class="edit-form" enctype="multipart/form-data">
+      enctype="multipart/form-data">
 
   <h2 i18n:translate=""
@@ -6,5 +6,5 @@
     tal:content="view/label">Label</h2>
 
-  <div class="form-status"
+  <div class="alert-message error"
       tal:define="status view/status"
       tal:condition="status">
@@ -20,16 +20,14 @@
   </div>
 
-  <table class="zebra">
+  <table class="form-table">
     <tbody>
       <tal:block repeat="widget view/widgets">
         <tr>
-          <td class="label">
-            <label tal:attributes="for widget/name">
-              <span class="required" tal:condition="widget/required">*</span>
-              <span i18n:translate="" tal:content="widget/label">label</span>:
-            </label>
+          <td class="fieldname">
+            <span tal:condition="widget/required">*</span>
+            <span i18n:translate="" tal:content="widget/label">label</span>:
           </td>
-          <td class="field">
-            <span class="widget" tal:content="structure widget">
+          <td>
+            <span tal:content="structure widget">
               <input type="text" />
             </span>
@@ -38,5 +36,5 @@
             </tal:error>
             <tal:hint tal:condition="widget/hint">
-              <span class="hint" tal:content="structure widget/hint">hint</span>
+              <span tal:content="structure widget/hint">hint</span>
             </tal:hint>
           </td>
@@ -44,5 +42,5 @@
       </tal:block>
       <tr>
-        <td class="label"><label>Password:</label></td>
+        <td class="fieldname">Password:</td>
         <td>
           <input name="password" type="password"  />
@@ -50,5 +48,5 @@
       </tr>
       <tr>
-        <td class="label"><label>Retype password:</label></td>
+        <td class="fieldname">Retype password:</td>
         <td>
           <input name="control_password" type="password" />
@@ -58,5 +56,5 @@
     </tbody>
   </table>
-  <div class="actionButtons" tal:condition="view/availableActions">
+  <div tal:condition="view/availableActions">
     <input tal:repeat="action view/actions"
            tal:replace="structure action/render"
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/userscontainerpage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/userscontainerpage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/userscontainerpage.pt	(revision 7459)
@@ -1,14 +1,9 @@
 <h2>Portal Users</h2>
 
-<p>
-  Here you can manage portal users.  
-</p>
-
-<table class="zebra">
+<table>
   <thead>
     <tr>
       <th>User ID</th>
       <th>Name</th>
-      <th>Description</th>
       <th>Portal Roles</th>
       <th>Local Roles</th>
@@ -20,5 +15,4 @@
       <td tal:content="account/name">User name</td>
       <td tal:content="account/title">Title</td>
-      <td tal:content="account/description">Description</td>
       <td tal:content="structure python:view.getSiteRoles(account)">SITE ROLES</td>
       <td tal:content="structure python:view.getLocalRoles(account)">LOCAL ROLES</td>
@@ -27,6 +21,6 @@
           <input type="hidden" name="userid"
            tal:attributes="value account/name"/>
-            <input type="submit" name="manage" value="manage" />
-            <input type="submit" name="delete" value="delete" />
+            <input class="btn" type="submit" name="manage" value="manage" />
+            <input class="btn" type="submit" name="delete" value="delete" />
         </form>
       </td>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/theming.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/theming.py	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/theming.py	(revision 7459)
@@ -26,6 +26,5 @@
 from waeup.sirp.browser.interfaces import ITheme
 from waeup.sirp.browser.resources import (
-    waeuptheme_red1, waeuptheme_gray1, waeuptheme_empty,
-    waeup_base_css,
+    waeuptheme_empty, waeup_base_css,
     )
 
@@ -39,21 +38,21 @@
         return [waeup_base_css]
 
-class SIRPThemeRed1(grok.GlobalUtility):
-    grok.implements(ITheme)
-    grok.name('red waeup theme')
+#class SIRPThemeRed1(grok.GlobalUtility):
+#    grok.implements(ITheme)
+#    grok.name('red waeup theme')
 
-    description = u"Uli's Red Theme"
+#    description = u"Uli's Red Theme"
 
-    def getResources(self):
-        return [waeuptheme_red1]
+#    def getResources(self):
+#        return [waeuptheme_red1]
 
-class SIRPThemeGray1(grok.GlobalUtility):
-    grok.implements(ITheme)
-    grok.name('gray waeup theme')
+#class SIRPThemeGray1(grok.GlobalUtility):
+#    grok.implements(ITheme)
+#    grok.name('gray waeup theme')
 
-    description = u"Henrik's Gray Theme"
+#    description = u"Henrik's Gray Theme"
 
-    def getResources(self):
-        return [waeuptheme_gray1]
+#    def getResources(self):
+#        return [waeuptheme_gray1]
 
 class SIRPThemeEmpty(grok.GlobalUtility):
Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/viewlets.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/viewlets.py	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/viewlets.py	(revision 7459)
@@ -195,8 +195,9 @@
         breadcrumbs = IBreadcrumbContainer(self.view)
         for breadcrumb in breadcrumbs:
-            yield dict(
-                title = breadcrumb.title,
-                url = self.view.url(breadcrumb.context, breadcrumb.target)
-                )
+            if breadcrumb.target:
+                yield dict(
+                    title = breadcrumb.title,
+                    url = self.view.url(breadcrumb.context, breadcrumb.target)
+                    )
 
 
@@ -264,8 +265,8 @@
         if self.url:
             if self.icon_url:
-                return u'<div class="portlet"><a href="%s"><img src="%s" /> %s </a></div>' % (
+                return u'<li><a href="%s"><img src="%s" /> %s </a></li>' % (
                     self.url, self.icon_url, self.title)
             else:
-                return u'<div class="portlet"><a href="%s">%s </a></div>' % (
+                return u'<li><a href="%s">%s </a></li>' % (
                     self.url, self.title)
         else:
@@ -290,5 +291,5 @@
             return ''
         url = self.view.url(grok.getSite(), self.link)
-        return u'<div class="portlet"><a href="%s">%s</a></div>' % (
+        return u'<li"><a href="%s">%s</a></li>' % (
                 url, self.text)
 
@@ -325,5 +326,5 @@
     def render(self):
         url = self.view.url(grok.getSite(), self.link)
-        return u'<div class="portlet"><a href="%s">%s</a></div>' % (
+        return u'<li><a href="%s">%s</a></li>' % (
                 url, self.text)
 
Index: /main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser.py	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser.py	(revision 7459)
@@ -29,5 +29,5 @@
 from waeup.sirp.browser.viewlets import (
     ManageActionButton, PrimaryNavTab)
-from waeup.sirp.browser.layout import jsaction, JSAction
+from waeup.sirp.browser.layout import jsaction, action
 from waeup.sirp.interfaces import ISIRPObject
 from waeup.sirp.hostels.vocabularies import NOT_OCCUPIED
@@ -141,5 +141,5 @@
         return
 
-    @grok.action('Add hostel', validator=NullValidator)
+    @action('Add hostel', validator=NullValidator)
     def addSubunit(self, **data):
         self.redirect(self.url(self.context, 'addhostel'))
@@ -158,5 +158,5 @@
     pnav = 5
 
-    @grok.action('Create hostel')
+    @action('Create hostel')
     def addHostel(self, **data):
         hostel = Hostel()
@@ -230,10 +230,10 @@
         return
 
-    @grok.action('Save')
+    @action('Save')
     def save(self, **data):
         msave(self, **data)
         return
 
-    @grok.action('Update all beds')
+    @action('Update all beds')
     def updateBeds(self, **data):
         removed, added, modified, modified_beds = self.context.updateBeds()
@@ -245,5 +245,5 @@
         return
 
-    @grok.action('Switch reservation of selected beds')
+    @action('Switch reservation of selected beds')
     def switchReservations(self, **data):
         form = self.request.form
@@ -273,5 +273,5 @@
         return
 
-    @grok.action('Release selected beds')
+    @action('Release selected beds')
     def releaseBeds(self, **data):
         form = self.request.form
@@ -316,5 +316,5 @@
             self.context.__parent__.hostel_name, co[1], co[2], co[3])
 
-    @grok.action('Save')
+    @action('Save')
     def save(self, **data):
         msave(self, **data)
Index: /main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser_templates/containermanagepage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser_templates/containermanagepage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser_templates/containermanagepage.pt	(revision 7459)
@@ -1,9 +1,9 @@
 <h2 i18n:translate="" tal:condition="view/label" tal:content="view/label">Label</h2>
-<div class="form-status" tal:define="status view/status" tal:condition="status"> Form Status:
+<div class="alert-message error" tal:define="status view/status" tal:condition="status"> Form Status:
   <span i18n:translate="" tal:content="view/status"> Form status summary
   </span>
 </div>
-<form action="." tal:attributes="action request/URL" method="POST" class="edit-form" enctype="multipart/form-data">
-  <table class="zebra">
+<form action="." tal:attributes="action request/URL" method="POST" enctype="multipart/form-data">
+  <table>
     <thead>
       <tr>
@@ -25,5 +25,5 @@
     </tbody>
   </table>
-  <div class="actionButtons" tal:condition="view/availableActions">
+  <div tal:condition="view/availableActions">
     <span tal:repeat="action view/actions" tal:omit-tag="">
       <input tal:replace="structure action/render"/>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser_templates/containerpage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser_templates/containerpage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser_templates/containerpage.pt	(revision 7459)
@@ -5,5 +5,5 @@
 </div>
 
-<table class="zebra">
+<table>
   <thead>
     <tr>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser_templates/hostelmanagepage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser_templates/hostelmanagepage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/hostels/browser_templates/hostelmanagepage.pt	(revision 7459)
@@ -3,5 +3,5 @@
   tal:content="view/label">Label</h2>
 
-  <div class="form-status"
+  <div class="alert-message error"
       tal:define="status view/status"
       tal:condition="status">
@@ -18,24 +18,22 @@
 
   <form action="." tal:attributes="action request/URL" method="POST"
-        class="edit-form" enctype="multipart/form-data">
+        enctype="multipart/form-data">
 
-  <div id="tabs">
-    <ul>
-      <li><a href="#tab-1"><span>Hostel Data</span></a></li>
-      <li><a href="#tab-2"><span>Beds</span></a></li>
-    </ul>
+  <ul class="tabs" data-tabs="tabs">
+    <li class="active"><a href="#tab-1"><span>Hostel Data</span></a></li>
+    <li><a href="#tab-2"><span>Beds</span></a></li>
+  </ul>
 
-    <div id="tab-1">
-      <table class="zebra">
+  <div class="tab-content">
+    <div id="tab-1" class="active">
+      <table class="form-table">
       <tbody>
       <tal:block repeat="widget view/widgets">
         <tr>
-          <td class="label">
-            <label tal:attributes="for widget/name">
-              <span class="required" tal:condition="widget/required">*</span>
-              <span i18n:translate="" tal:content="widget/label">label</span>:
-            </label>
+          <td class="fieldname">
+            <span class="required" tal:condition="widget/required">*</span>
+            <span i18n:translate="" tal:content="widget/label">label</span>:
           </td>
-          <td class="field">
+          <td>
             <span class="widget" tal:content="structure widget">
               <input type="text" />
@@ -45,5 +43,5 @@
             </tal:error>
             <tal:hint tal:condition="widget/hint">
-              <span class="hint" tal:content="structure widget/hint">hint</span>
+              <span tal:content="structure widget/hint">hint</span>
             </tal:hint>
           </td>
@@ -52,5 +50,5 @@
       </tbody>
       </table>
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <div tal:condition="view/availableActions">
         <span tal:repeat="action view/actions"
               tal:omit-tag="">
@@ -97,5 +95,5 @@
       </table>
 
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <div tal:condition="view/availableActions">
         <span tal:repeat="action view/actions"
               tal:omit-tag="">
Index: /main/waeup.sirp/trunk/src/waeup/sirp/interfaces.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/interfaces.py	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/interfaces.py	(revision 7459)
@@ -53,5 +53,5 @@
 def year_range():
     curr_year = datetime.now().year
-    return range(curr_year - 2, curr_year + 5)
+    return range(curr_year - 4, curr_year + 5)
 
 def academic_sessions():
@@ -292,6 +292,5 @@
 
     title = schema.TextLine(
-        title = u'Name',
-        description = u'Real name of user',
+        title = u'Full Name',
         required = False,)
 
@@ -359,4 +358,10 @@
         title = u'Name of University',
         default = u'Sample University',
+        required = True,
+        )
+
+    acronym = schema.TextLine(
+        title = u'Abbreviated Title of University',
+        default = u'WAeUP.SIRP',
         required = True,
         )
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py	(revision 7459)
@@ -36,10 +36,10 @@
     SIRPPage, SIRPEditFormPage, SIRPAddFormPage, SIRPDisplayFormPage,
     ContactAdminForm, SIRPForm)
-from waeup.sirp.browser.interfaces import ICaptchaManager
+from waeup.sirp.browser.interfaces import ICaptchaManager, IBreadcrumbIgnorable
 from waeup.sirp.browser.breadcrumbs import Breadcrumb
 from waeup.sirp.browser.resources import datepicker, datatable, tabs, warning
 from waeup.sirp.browser.viewlets import (
     ManageActionButton, AddActionButton)
-from waeup.sirp.browser.layout import jsaction, JSAction
+from waeup.sirp.browser.layout import jsaction, action, UtilityView
 from waeup.sirp.interfaces import (
     ISIRPObject, IUserAccount, IExtFileStore, IPasswordValidator, IContactForm,
@@ -64,4 +64,5 @@
 from waeup.sirp.applicants.interfaces import IApplicantBaseData
 from waeup.sirp.hostels.hostel import NOT_OCCUPIED
+from waeup.sirp.utils.helpers import get_current_principal
 
 def write_log_message(view, message):
@@ -96,4 +97,13 @@
     grok.context(IStudentsContainer)
     title = 'Students'
+    #grok.implements(IBreadcrumbIgnorable)
+
+    @property
+    def target(self):
+        user = get_current_principal()
+        #import pdb; pdb.set_trace()
+        if getattr(user, 'user_type', None) == 'student':
+            return None
+        return self.viewname
 
 class StudentBreadcrumb(Breadcrumb):
@@ -131,14 +141,4 @@
     grok.context(IStudentAccommodation)
     title = 'Accommodation'
-
-    #@property
-    #def target(self):
-    #    prm = get_principal_role_manager()
-    #    principal = get_current_principal()
-    #    roles = [x[0] for x in prm.getRolesForPrincipal(principal.id)]
-    #    if 'waeup.Student' in roles:
-    #        return 'index'
-    #    else:
-    #        return 'manage'
 
 class BedTicketBreadcrumb(Breadcrumb):
@@ -293,4 +293,6 @@
             if not self.hitlist:
                 self.flash('No student found.')
+            if 'remove' in form:
+                self.flash('No item selected.')
             return
         entries = form['entries']
@@ -328,5 +330,5 @@
     pnav = 4
 
-    @grok.action('Create student record')
+    @action('Create student record', style='primary')
     def addStudent(self, **data):
         student = createObject(u'waeup.Student')
@@ -383,5 +385,5 @@
         return u'Send message to %s' % self.context.display_fullname
 
-    @grok.action('Send message now')
+    @action('Send message now', style='primary')
     def send(self, *args, **data):
         try:
@@ -442,5 +444,5 @@
             dict(name=x, title=y) for x, y in allowed_transitions]
 
-    @grok.action('Save')
+    @action('Save', style='primary')
     def save(self, **data):
         form = self.request.form
@@ -576,10 +578,10 @@
         return super(StudentClearanceManageFormPage, self).update()
 
-    @grok.action('Save')
+    @action('Save', style='primary')
     def save(self, **data):
         msave(self, **data)
         return
 
-class StudentClearPage(grok.View):
+class StudentClearPage(UtilityView, grok.View):
     """ Clear student by clearance officer
     """
@@ -600,5 +602,5 @@
         return
 
-class StudentRejectClearancePage(grok.View):
+class StudentRejectClearancePage(UtilityView, grok.View):
     """ Reject clearance by clearance officers
     """
@@ -662,5 +664,5 @@
     pnav = 4
 
-    @grok.action('Save')
+    @action('Save', style='primary')
     def save(self, **data):
         msave(self, **data)
@@ -732,5 +734,5 @@
         return 
 
-    @grok.action('Save')
+    @action('Save', style='primary')
     def save(self, **data):
         msave(self, **data)
@@ -744,5 +746,5 @@
             yield(dict(code=code, title=title))
 
-    @grok.action('Add study level')
+    @action('Add study level')
     def addStudyLevel(self, **data):
         level_code = self.request.form.get('addlevel', None)
@@ -754,4 +756,5 @@
         except KeyError:
             self.flash('This level exists.')
+        self.flash('Study level has been added.')
         self.redirect(self.url(self.context, u'@@manage')+'#tab-2')
         return
@@ -821,5 +824,5 @@
     target = 'course_registration.pdf'
 
-class ExportPDFCourseRegistrationSlipPage(grok.View):
+class ExportPDFCourseRegistrationSlipPage(UtilityView, grok.View):
     """Deliver a PDF slip of the context.
     """
@@ -921,10 +924,10 @@
         return 'Manage study level %s' % self.context.level_title
 
-    @grok.action('Save')
+    @action('Save', style='primary')
     def save(self, **data):
         msave(self, **data)
         return
 
-    @grok.action('Add course ticket')
+    @action('Add course ticket')
     def addCourseTicket(self, **data):
         self.redirect(self.url(self.context, '@@add'))
@@ -954,5 +957,5 @@
         return
 
-class ValidateCoursesPage(grok.View):
+class ValidateCoursesPage(UtilityView, grok.View):
     """ Validate course list by course adviser
     """
@@ -975,5 +978,5 @@
         return
 
-class RejectCoursesPage(grok.View):
+class RejectCoursesPage(UtilityView, grok.View):
     """ Reject course list by course adviser
     """
@@ -1022,5 +1025,5 @@
         return 'Study Level %s' % self.context.level_title
 
-    @grok.action('Add course ticket')
+    @action('Add course ticket')
     def addCourseTicket(self, **data):
         ticket = CourseTicket()
@@ -1046,5 +1049,5 @@
         return
 
-    @grok.action('Cancel')
+    @action('Cancel')
     def cancel(self, **data):
         self.redirect(self.url(self.context))
@@ -1095,5 +1098,5 @@
         return 'Manage course ticket %s' % self.context.code
 
-    @grok.action('Save')
+    @action('Save', style='primary')
     def save(self, **data):
         msave(self, **data)
@@ -1176,5 +1179,5 @@
         return
 
-    @grok.action('Add online payment ticket')
+    @action('Add online payment ticket')
     def addPaymentTicket(self, **data):
         self.redirect(self.url(self.context, '@@addop'))
@@ -1200,5 +1203,5 @@
     pnav = 4
     
-    @grok.action('Create ticket')
+    @action('Create ticket', style='primary')
     def createTicket(self, **data):
         p_category = data['p_category']
@@ -1296,5 +1299,5 @@
         return self.view.url(self.view.context, self.target)
 
-class OnlinePaymentCallbackPage(grok.View):
+class OnlinePaymentCallbackPage(UtilityView, grok.View):
     """ Callback view
     """
@@ -1345,5 +1348,5 @@
         return
 
-class ExportPDFPaymentSlipPage(grok.View):
+class ExportPDFPaymentSlipPage(UtilityView, grok.View):
     """Deliver a PDF slip of the context.
     """
@@ -1576,5 +1579,5 @@
     target = 'bed_allocation.pdf'
 
-class ExportPDFBedTicketSlipPage(grok.View):
+class ExportPDFBedTicketSlipPage(UtilityView, grok.View):
     """Deliver a PDF slip of the context.
     """
@@ -1608,5 +1611,5 @@
     target = 'relocate'
 
-class BedTicketRelocationPage(grok.View):
+class BedTicketRelocationPage(UtilityView, grok.View):
     """ Callback view
     """
@@ -1735,5 +1738,5 @@
     pnav = 4
 
-    @grok.action('Save')
+    @action('Save', style='primary')
     def save(self, **data):
         msave(self, **data)
@@ -1751,5 +1754,5 @@
     pnav = 4
 
-    @grok.action('Save')
+    @action('Save', style='primary')
     def save(self, **data):
         form = self.request.form
@@ -1898,5 +1901,5 @@
         return super(StudentClearanceEditFormPage, self).update()
 
-    @grok.action('Save')
+    @action('Save', style='primary')
     def save(self, **data):
         self.applyData(self.context, **data)
@@ -1911,5 +1914,5 @@
         return False
 
-    @grok.action('Save and request clearance')
+    @action('Save and request clearance', style='primary')
     def requestClearance(self, **data):
         self.applyData(self.context, **data)
@@ -2063,5 +2066,5 @@
         return
 
-    @grok.action('Create course list now')
+    @action('Create course list now', style='primary')
     def addStudyLevel(self, **data):
         studylevel = StudentStudyLevel()
@@ -2127,5 +2130,5 @@
         return total_credits
 
-    @grok.action('Add course ticket')
+    @action('Add course ticket')
     def addCourseTicket(self, **data):
         self.redirect(self.url(self.context, 'ctadd'))
@@ -2157,5 +2160,5 @@
         return
 
-    @grok.action('Register course list')
+    @action('Register course list', style='primary')
     def RegisterCourses(self, **data):
         IWorkflowInfo(self.context.getStudent()).fireTransition('register_courses')
@@ -2172,5 +2175,5 @@
         'grade', 'score', 'core_or_elective', 'automatic')
 
-    @grok.action('Add course ticket')
+    @action('Add course ticket')
     def addCourseTicket(self, **data):
         ticket = CourseTicket()
@@ -2211,5 +2214,5 @@
         return
 
-    @grok.action('Get login credentials')
+    @action('Get login credentials', style='primary')
     def request(self, **data):
         if not self.captcha_result.is_valid:
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/accommodationmanagepage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/accommodationmanagepage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/accommodationmanagepage.pt	(revision 7459)
@@ -3,5 +3,5 @@
 tal:content="view/label">Label</h2>
 
-<div class="form-status"
+<div class="alert-message error"
     tal:define="status view/status"
     tal:condition="status">
@@ -13,5 +13,5 @@
 
 <form action="." tal:attributes="action request/URL" method="POST"
-      class="edit-form" enctype="multipart/form-data"> 
+      enctype="multipart/form-data">
 
   <table class="display dataTableManage">
@@ -41,5 +41,5 @@
   </table>
 
-  <div class="actionButtons" tal:condition="view/availableActions">
+  <div tal:condition="view/availableActions">
     <span tal:repeat="action view/selected_actions"
           tal:omit-tag="">
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/basemanagepage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/basemanagepage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/basemanagepage.pt	(revision 7459)
@@ -4,7 +4,7 @@
 
 <form action="." tal:attributes="action request/URL" method="post"
-      class="edit-form" enctype="multipart/form-data">
+      enctype="multipart/form-data">
 
-  <div class="form-status"
+  <div class="alert-message error"
     tal:define="status view/status"
     tal:condition="status">
@@ -15,23 +15,21 @@
   </div>
 
-  <div id="tabs">
-    <ul>
-      <li><a href="#tab-1"><span>Base Data</span></a></li>
-      <li><a href="#tab-2"><span>Passport Picture</span></a></li>
-    </ul>
+  <ul class="tabs" data-tabs="tabs">
+    <li class="active"><a href="#tab-1"><span>Base Data</span></a></li>
+    <li><a href="#tab-2"><span>Passport Picture</span></a></li>
+  </ul>
 
-    <div id="tab-1">
-      <table class="form-fields zebra">
+  <div class="tab-content">
+    <div id="tab-1" class="active">
+      <table class="form-table">
         <tbody>
           <tal:block repeat="widget view/widgets">
             <tr>
-              <td class="label">
-                <label tal:attributes="for widget/name">
-                  <span class="required" tal:condition="widget/required">*</span>
-                  <span i18n:translate="" tal:content="widget/label">label</span>:
-                </label>
+              <td class="fieldname">
+                <span tal:condition="widget/required">*</span>
+                <span i18n:translate="" tal:content="widget/label">label</span>:
               </td>
-              <td class="field">
-                <span class="widget" tal:content="structure widget">
+              <td>
+                <span tal:content="structure widget">
                   <input type="text" />
                 </span>
@@ -40,5 +38,5 @@
                 </tal:error>
                 <tal:hint tal:condition="widget/hint">
-                  <span class="hint" tal:content="structure widget/hint">hint</span>
+                  <span tal:content="structure widget/hint">hint</span>
                 </tal:hint>
               </td>
@@ -46,5 +44,5 @@
           </tal:block>
           <tr>
-            <td class="label"><label>Password:</label></td>
+            <td class="fieldname">Password:</td>
             <td>
               <input name="password" type="password"  />
@@ -52,5 +50,5 @@
           </tr>
           <tr>
-            <td class="label"><label>Retype password:</label></td>
+            <td class="fieldname">Retype password:</td>
             <td>
               <input name="control_password" type="password" />
@@ -58,5 +56,5 @@
           </tr>
           <tr>
-            <td class="label"><label>Registration Transition:</label></td>
+            <td class="fieldname">Registration Transition:</td>
             <td>
               <select id="transition" name="transition">
@@ -72,5 +70,5 @@
       </table>
 
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <div tal:condition="view/availableActions">
         <input tal:repeat="action view/actions"
                tal:replace="structure action/render"
@@ -80,6 +78,5 @@
 
     <div id="tab-2">
-      <h2>Upload passport picture</h2>
-      <table class="form-fields zebra">
+      <table class="form-table">
         <tbody>
           <tal:files content="structure provider:files" />
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/basepage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/basepage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/basepage.pt	(revision 7459)
@@ -3,5 +3,5 @@
     tal:content="view/label">Label</h2>
 
-<table class="zebra">
+<table class="form-table">
   <tbody>
     <tal:block repeat="widget view/widgets">
@@ -16,5 +16,5 @@
     </tal:block>
     <tr>
-      <td class="fieldname" width="33%">
+      <td class="fieldname">
           Password:
       </td>
@@ -26,6 +26,6 @@
   </tbody>
   <tfoot>
-    <tr class="controls">
-      <td colspan="2" class="align-right">
+    <tr>
+      <td>
         <input tal:repeat="action view/actions"
                tal:replace="structure action/render" />
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/change_password.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/change_password.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/change_password.pt	(revision 7459)
@@ -4,13 +4,13 @@
 
 <form action="." tal:attributes="action request/URL" method="post"
-      class="edit-form" enctype="multipart/form-data">
+      enctype="multipart/form-data">
 
   <input type="hidden" name="student_id" value=""
          tal:attributes="value context/student_id" />
 
-  <table class="form-fields zebra">
+  <table class="form-table">
     <tbody>
       <tr>
-        <td class="label"><label>Password:</label></td>
+        <td class="fieldname">Password:</td>
         <td>
           <input name="change_password" type="password"  />
@@ -18,5 +18,5 @@
       </tr>
       <tr>
-        <td class="label"><label>Retype password:</label></td>
+        <td class="fieldname">Retype password:</td>
         <td>
           <input name="change_password_repeat" type="password" />
@@ -26,5 +26,5 @@
   </table>
 
-  <div class="actionButtons" tal:condition="view/availableActions">
+  <div tal:condition="view/availableActions">
     <input tal:repeat="action view/actions"
            tal:replace="structure action/render"
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/changepw.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/changepw.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/changepw.pt	(revision 7459)
@@ -1,4 +1,4 @@
 <form action="." tal:attributes="action request/URL" method="post"
-      class="edit-form" enctype="multipart/form-data">
+      enctype="multipart/form-data">
 
   <h2 i18n:translate=""
@@ -6,5 +6,5 @@
     tal:content="view/label">Label</h2>
 
-  <div class="form-status"
+  <div class="alert-message error"
     tal:define="status view/status"
     tal:condition="status">
@@ -15,16 +15,14 @@
   </div>
 
-  <table class="zebra">
+  <table class="form-table">
     <tbody>
       <tal:block repeat="widget view/widgets">
         <tr>
-          <td class="label">
-            <label tal:attributes="for widget/name">
-              <span class="required" tal:condition="widget/required">*</span>
+          <td class="fieldname">
+              <span tal:condition="widget/required">*</span>
               <span i18n:translate="" tal:content="widget/label">label</span>:
-            </label>
           </td>
-          <td class="field">
-            <span class="widget" tal:content="structure widget">
+          <td>
+            <span tal:content="structure widget">
               <input type="text" />
             </span>
@@ -33,5 +31,5 @@
             </tal:error>
             <tal:hint tal:condition="widget/hint">
-              <span class="hint" tal:content="structure widget/hint">hint</span>
+              <span tal:content="structure widget/hint">hint</span>
             </tal:hint>
           </td>
@@ -51,5 +49,5 @@
   </table>
 
-  <div class="actionButtons" tal:condition="view/availableActions">
+  <div tal:condition="view/availableActions">
     <input tal:repeat="action view/actions"
            tal:replace="structure action/render"
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/clearanceeditpage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/clearanceeditpage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/clearanceeditpage.pt	(revision 7459)
@@ -4,7 +4,7 @@
 
 <form action="." tal:attributes="action request/URL" method="post"
-      class="edit-form" enctype="multipart/form-data">
+      enctype="multipart/form-data">
 
-  <div class="form-status"
+  <div class="alert-message error"
     tal:define="status view/status"
     tal:condition="status">
@@ -15,23 +15,20 @@
   </div>
 
-  <div id="tabs">
-    <ul>
-      <li><a href="#tab-1"><span>Clearance Data</span></a></li>
-      <li><a href="#tab-2"><span>Scans</span></a></li>
-    </ul>
-
-    <div id="tab-1">
-      <table class="form-fields zebra">
+  <ul class="tabs" data-tabs="tabs">
+    <li class="active"><a href="#tab-1"><span>Clearance Data</span></a></li>
+    <li><a href="#tab-2"><span>Scans</span></a></li>
+  </ul>
+  <div class="tab-content">
+    <div id="tab-1" class="active">
+      <table class="form-table">
         <tbody>
           <tal:block repeat="widget view/widgets">
             <tr>
-              <td class="label">
-                <label tal:attributes="for widget/name">
-                  <span class="required" tal:condition="widget/required">*</span>
+              <td class="fieldname">
+                  <span tal:condition="widget/required">*</span>
                   <span i18n:translate="" tal:content="widget/label">label</span>:
-                </label>
               </td>
-              <td class="field">
-                <span class="widget" tal:content="structure widget">
+              <td>
+                <span tal:content="structure widget">
                   <input type="text" />
                 </span>
@@ -40,5 +37,5 @@
                 </tal:error>
                 <tal:hint tal:condition="widget/hint">
-                  <span class="hint" tal:content="structure widget/hint">hint</span>
+                  <span tal:content="structure widget/hint">hint</span>
                 </tal:hint>
               </td>
@@ -48,5 +45,5 @@
       </table>
 
-      <div class="actionButtons" tal:condition="view/availableActions">
+      <div tal:condition="view/availableActions">
         <input tal:repeat="action view/actions"
                tal:replace="structure action/render"
@@ -56,6 +53,5 @@
 
     <div id="tab-2">
-      <h2>Upload scans</h2>
-      <table class="form-fields zebra">
+      <table class="form-table">
         <tbody>
           <tal:files content="structure provider:files" />
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/containermanagepage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/containermanagepage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/containermanagepage.pt	(revision 7459)
@@ -4,5 +4,5 @@
 <br />
 
-  <input type="submit" name="search" value="Search" />
+  <input class="btn primary" type="submit" name="search" value="Search" />
   for students
 
@@ -48,8 +48,6 @@
     </table>
     
-    <div class="actionButtons">
-        <input type="submit" name="remove" value="Remove selected"
-               onclick="return confirmPost('Are you sure?')"/>
-    </div>
+    <input type="submit" name="remove" value="Remove selected" class="btn"
+           onclick="return confirmPost('Are you sure?')"/>
 
   </div>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/containerpage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/containerpage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/containerpage.pt	(revision 7459)
@@ -4,5 +4,5 @@
 <br />
 
-  <input type="submit" name="search" value="Search" />
+  <input class="btn primary" type="submit" name="search" value="Search" />
   for students
 
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/courseticketmanagepage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/courseticketmanagepage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/courseticketmanagepage.pt	(revision 7459)
@@ -1,4 +1,4 @@
 <form action="." tal:attributes="action request/URL" method="post"
-      class="edit-form" enctype="multipart/form-data">
+      enctype="multipart/form-data">
 
   <h2 i18n:translate=""
@@ -6,5 +6,5 @@
     tal:content="view/label">Label</h2>
 
-  <div class="form-status"
+  <div class="alert-message error"
     tal:define="status view/status"
     tal:condition="status">
@@ -15,6 +15,5 @@
   </div>
 
-
-  <table class="zebra">
+  <table class="form-table">
     <tbody>
       <tr>
@@ -68,12 +67,10 @@
       <tal:block repeat="widget view/widgets">
         <tr>
-          <td class="label">
-            <label tal:attributes="for widget/name">
-              <span class="required" tal:condition="widget/required">*</span>
+          <td class="fieldname">
+              <span tal:condition="widget/required">*</span>
               <span i18n:translate="" tal:content="widget/label">label</span>:
-            </label>
           </td>
-          <td class="field">
-            <span class="widget" tal:content="structure widget">
+          <td>
+            <span tal:content="structure widget">
               <input type="text" />
             </span>
@@ -82,5 +79,5 @@
             </tal:error>
             <tal:hint tal:condition="widget/hint">
-              <span class="hint" tal:content="structure widget/hint">hint</span>
+              <span tal:content="structure widget/hint">hint</span>
             </tal:hint>
           </td>
@@ -89,5 +86,5 @@
     </tbody>
   </table>
-  <div class="actionButtons" tal:condition="view/availableActions">
+  <div tal:condition="view/availableActions">
     <input tal:repeat="action view/actions"
            tal:replace="structure action/render"
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/courseticketpage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/courseticketpage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/courseticketpage.pt	(revision 7459)
@@ -3,5 +3,5 @@
     tal:content="view/label">Label</h2>
 
-<table class="zebra">
+<table class="form-table">
   <tbody>
     <tr>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/enterpin.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/enterpin.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/enterpin.pt	(revision 7459)
@@ -2,8 +2,8 @@
     tal:content="view/label">Label</h2>
 <form method="POST">
-  <table>
+  <table class="form-table">
     <tbody>
       <tr><td>
-        <label for="ac_series">Activation Code:</label>
+        Activation Code:
         </td><td>
         <span tal:replace="view/ac_prefix">PIN Prefix</span> -
@@ -18,7 +18,7 @@
       <tr>
         <td colspan="2">
-          <input type="submit" name="SUBMIT"
+          <input type="submit" name="SUBMIT" class="btn primary"
                  tal:attributes="value view/buttonname" />
-                 </td>
+        </td>
       </tr>
     </tbody>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/filedisplay.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/filedisplay.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/filedisplay.pt	(revision 7459)
@@ -1,9 +1,7 @@
 <tr tal:condition = "viewlet/file_exists">
-  <td class="label">
-    <label i18n:translate="">
-        <span tal:replace="viewlet/label">FILENAME</span>:
-    </label>
+  <td class="fieldname">
+    <span tal:replace="viewlet/label">FILENAME</span>:
   </td>
-  <td class="field">
+  <td>
     <span class="widget">
       <a tal:attributes="href viewlet/download_name"
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/filesuploadpage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/filesuploadpage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/filesuploadpage.pt	(revision 7459)
@@ -4,6 +4,6 @@
 
 <form action="." tal:attributes="action request/URL" method="post"
-      class="edit-form" enctype="multipart/form-data">
-  <table class="zebra">
+      enctype="multipart/form-data">
+  <table class="form-table">
     <tbody>
       <tal:files content="structure provider:files" />
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/fileupload.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/fileupload.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/fileupload.pt	(revision 7459)
@@ -1,9 +1,7 @@
 <tr>
-  <td class="label">
-    <label i18n:translate="" tal:attributes="for viewlet/input_name">
-        <span tal:replace="viewlet/label">FILENAME</span>:
-    </label>
+  <td class="fieldname">
+    <span tal:replace="viewlet/label">FILENAME</span>:
   </td>
-  <td class="field">
+  <td>
     <span class="widget">
 
@@ -17,13 +15,13 @@
       <br />
       <input type="file" tal:attributes="name viewlet/input_name"/>
-      <br />
+      <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="Delete attachment" class="button" />
+             value="Delete attachment" class="btn error" />
       <input type="submit"
                tal:attributes="id python:('upload_%s' % viewlet.input_name);
                   name python:('upload_%s' % viewlet.input_name)"
-               value="Upload new file" class="button" />
+               value="Upload new file" class="btn primary" />
       <span i18n:translate="">
         Max. file size:
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/imagedisplay.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/imagedisplay.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/imagedisplay.pt	(revision 7459)
@@ -1,13 +1,9 @@
 <tr>
-  <td class="label">
-    <label i18n:translate="">
+  <td class="fieldname">
         <span tal:replace="viewlet/label">FILENAME</span>:
-    </label>
   </td>
-  <td class="field">
-    <span class="widget">
+  <td>
       <img height="125px" tal:attributes="src viewlet/download_name" />
       <br />
-    </span>
   </td>
 </tr>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/imageupload.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/imageupload.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/imageupload.pt	(revision 7459)
@@ -1,9 +1,7 @@
 <tr>
-  <td class="label">
-    <label i18n:translate="" tal:attributes="for viewlet/input_name">
-        <span tal:replace="viewlet/label">FILENAME</span>:
-    </label>
+  <td class="fieldname">
+    <span tal:replace="viewlet/label">FILENAME</span>:
   </td>
-  <td class="field">
+  <td>
     <span class="widget">
       <img align="middle" height="125px"
@@ -12,11 +10,12 @@
        tal:attributes="id python:('delete_%s' % viewlet.input_name);
           name python:('delete_%s' % viewlet.input_name)"
-       value="Delete" class="button" />
+       value="Delete" class="btn error" />
       <br /><br />
       <input type="file" tal:attributes="name viewlet/input_name"/>
+      <br /><br />
       <input type="submit"
                tal:attributes="id python:('upload_%s' % viewlet.input_name);
                   name python:('upload_%s' % viewlet.input_name)"
-               value="Upload" class="button" />
+               value="Upload" class="btn primary" />
       <span i18n:translate="">
         Max. file size:
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/mydatadropdowntabs.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/mydatadropdowntabs.pt	(revision 7459)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/mydatadropdowntabs.pt	(revision 7459)
@@ -0,0 +1,9 @@
+<li tal:attributes="class viewlet/active" data-dropdown="dropdown" >
+  <a href="#" class="dropdown-toggle" tal:content="viewlet/tab_title">Tab Title</a>
+  <ul class="dropdown-menu">
+    <li tal:repeat="target viewlet/targets">
+      <a tal:attributes="href target/url"
+         tal:content="target/title">Link Title</a>
+    </li>
+  </ul>
+</li>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/paymentsmanagepage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/paymentsmanagepage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/paymentsmanagepage.pt	(revision 7459)
@@ -3,5 +3,5 @@
 tal:content="view/label">Label</h2>
 
-<div class="form-status"
+<div class="alert-message error"
     tal:define="status view/status"
     tal:condition="status">
@@ -13,5 +13,5 @@
 
 <form action="." tal:attributes="action request/URL" method="POST"
-      class="edit-form" enctype="multipart/form-data"> 
+      enctype="multipart/form-data">
 
   <table class="display dataTableManage">
@@ -46,5 +46,5 @@
   </table>
 
-  <div class="actionButtons" tal:condition="view/availableActions">
+  <div tal:condition="view/availableActions">
     <span tal:repeat="action view/actions"
           tal:omit-tag="">
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/paymentspage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/paymentspage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/paymentspage.pt	(revision 7459)
@@ -1,7 +1,4 @@
 <h2 tal:content="view/label">TITLE</h2>
 
-<table class="zebra">
-<thead>
-</thead>
 <table class="display dataTable">
   <thead>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/setpassword.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/setpassword.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/setpassword.pt	(revision 7459)
@@ -2,16 +2,20 @@
     tal:content="view/label">Label</h2>
 <form method="POST">
-  <table>
+  <table class="form-table">
     <tbody>
-      <tr><td>
-          <label for="reg_number">Registration Number:
-          </label></td> <td>
+      <tr>
+      <td>
+          Registration Number:
+      </td>
+      <td>
           <input name="reg_number" type="text" size="15" maxlength="15"
                  value="" tal:attributes="value view/reg_number"/>
-      </td></tr>
+      </td>
+      </tr>
       <tr>
         <td>
-          <label for="ac_series">Access Code:
-          </label></td> <td>
+          Access Code:
+        </td>
+        <td>
           <span tal:replace="view/ac_prefix">PIN Prefix
           </span> -
@@ -23,5 +27,5 @@
       <tr>
         <td colspan="2">
-        <input type="submit" name="SUBMIT"
+        <input type="submit" name="SUBMIT" class="btn primary"
                value="Show Student Id and set password" /> </td>
       </tr>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studentpage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studentpage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studentpage.pt	(revision 7459)
@@ -3,5 +3,5 @@
     tal:content="view/label">Label</h2>
 
-<table class="zebra">
+<table class="form-table">
   <tbody>
     <tal:block repeat="widget view/widgets">
@@ -17,5 +17,5 @@
   </tbody>
   <tfoot>
-    <tr class="controls">
+    <tr>
       <td colspan="2" class="align-right">
         <input tal:repeat="action view/actions"
@@ -24,5 +24,4 @@
     </tr>
   </tfoot>
-
 </table>
 
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studycoursemanagepage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studycoursemanagepage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studycoursemanagepage.pt	(revision 7459)
@@ -3,5 +3,5 @@
 tal:content="view/label">Label</h2>
 
-<div class="form-status"
+<div class="alert-message error"
     tal:define="status view/status"
     tal:condition="status">
@@ -13,100 +13,95 @@
 
 <form action="." tal:attributes="action request/URL" method="POST"
-      class="edit-form" enctype="multipart/form-data"> 
+      enctype="multipart/form-data"> 
 
-<div id="tabs">
-<ul>
-  <li><a href="#tab-1"><span>Study Course Data</span></a></li>
-  <li><a href="#tab-2"><span>Study Levels</span></a></li>
-</ul>
-   
-<div id="tab-1">        
-  <table class="zebra">
-  <tbody>
-  <tal:block repeat="widget view/widgets">
-    <tr>
-      <td class="label">
-        <label tal:attributes="for widget/name">
-          <span class="required" tal:condition="widget/required">*</span>
-          <span i18n:translate="" tal:content="widget/label">label</span>:
-        </label>
-      </td>
-      <td class="field">
-        <span class="widget" tal:content="structure widget">
-          <input type="text" />
+  <ul class="tabs" data-tabs="tabs">
+    <li class="active"><a href="#tab-1"><span>Study Course Data</span></a></li>
+    <li><a href="#tab-2"><span>Study Levels</span></a></li>
+  </ul>
+
+  <div class="tab-content">
+    <div id="tab-1" class="active">
+      <table class="form-table">
+      <tbody>
+      <tal:block repeat="widget view/widgets">
+        <tr>
+          <td class="fieldname">
+            <span class="required" tal:condition="widget/required">*</span>
+            <span i18n:translate="" tal:content="widget/label">label</span>:
+          </td>
+          <td>
+            <span tal:content="structure widget">
+              <input type="text" />
+            </span>
+            <tal:error tal:condition="widget/error">
+              <span tal:replace="structure widget/error">error</span>
+            </tal:error>
+            <tal:hint tal:condition="widget/hint">
+              <span tal:content="structure widget/hint">hint</span>
+            </tal:hint>
+          </td>
+        </tr>
+      </tal:block>
+      </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>
-        <tal:error tal:condition="widget/error">
-          <span tal:replace="structure widget/error">error</span>
-        </tal:error>
-        <tal:hint tal:condition="widget/hint">
-          <span class="hint" tal:content="structure widget/hint">hint</span>
-        </tal:hint>
-      </td>
-    </tr>
-  </tal:block>
-  </tbody>
-  </table>
-  <div class="actionButtons" 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 id="tab-2">
+      <h3>Study Levels (Course Lists)</h3>
+      <table class="display dataTableManage">
+        <thead>
+          <tr>
+            <th>&nbsp;</th><th>Level Code</th><th>Level Title</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr tal:repeat="cl context/values">
+             <td>
+              <input type="checkbox"
+        		 name="val_id"
+        		 tal:attributes="value cl/__name__" />
+            </td>
+            <td> <a tal:attributes="href cl/__name__">
+              <span tal:content="cl/level">CODE</span></a>
+            </td>
+            <td>
+              <span tal:content="cl/level_title">TITLE</span>
+            </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.tabtwoactions"
+                 tal:replace="structure action/render"/>
+        </span>
+      </div>
+      <br /><br /><br />
+      <div>
+        <span tal:condition="view/availableActions">
+          <span tal:repeat="action view/actions"
+                tal:omit-tag="">
+            <input tal:condition="python:action.label in view.tabthreeactions"
+                   tal:replace="structure action/render"/>
+          </span>
+        </span>
+        <select id="addlevel" name="addlevel">
+          <option tal:attributes="value level/code" tal:repeat="level view/level_dict">
+            <span tal:replace="level/title">LEVELTITLE
+          </span>
+          </option>
+        </select>
+      </div>
+    </div>
   </div>
-</div>    
-    
-<div id="tab-2">
-  <h3>Study Levels (Course Lists)</h3>
-  <table class="display dataTableManage">
-    <thead>
-      <tr>
-        <th>&nbsp;</th><th>Level Code</th><th>Level Title</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr tal:repeat="cl context/values">
-         <td>
-          <input type="checkbox"
-    		 name="val_id"
-    		 tal:attributes="value cl/__name__" />
-        </td>
-        <td> <a tal:attributes="href cl/__name__">
-          <span tal:content="cl/level">CODE</span></a>
-        </td>
-        <td>
-          <span tal:content="cl/level_title">TITLE</span>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-
-  <div class="actionButtons" tal:condition="view/availableActions">
-    <span tal:repeat="action view/actions"
-          tal:omit-tag="">
-      <input tal:condition="python:action.label in view.tabtwoactions"
-             tal:replace="structure action/render"/>
-    </span>
-  </div>
-  <br /><br /><br />
-  <div>
-    <span class="actionButtons" tal:condition="view/availableActions">
-      <span tal:repeat="action view/actions"
-            tal:omit-tag="">
-        <input tal:condition="python:action.label in view.tabthreeactions"
-               tal:replace="structure action/render"/>
-      </span>
-    </span>
-    <select id="addlevel" name="addlevel">
-      <option tal:attributes="value level/code" tal:repeat="level view/level_dict">
-        <span tal:replace="level/title">LEVELTITLE
-      </span>
-      </option>
-    </select>
-  </div>
-
-
-
-</div>
-</div>
 </form>  
 
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studycoursepage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studycoursepage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studycoursepage.pt	(revision 7459)
@@ -1,5 +1,5 @@
 <h2 tal:content="view/label">TITLE</h2>
 
-<table class="zebra">
+<table class="form-table">
 <thead>
 </thead>
@@ -7,11 +7,8 @@
   <tal:block repeat="widget view/widgets">
     <tr>
-      <td>
-        <label tal:attributes="for widget/name">
-          <span i18n:translate=""
-                         tal:content="widget/label">label</span>:
-        </label>
+      <td class="filedname">
+        <span i18n:translate="" tal:content="widget/label">label</span>:
       </td>
-      <td class="field" tal:on-error="default">
+      <td tal:on-error="default">
         <div class="widget" tal:content="structure widget">
           <input type="text" />
@@ -22,7 +19,5 @@
     <tr>
       <td>
-        <label>
           Study Mode:
-        </label>
       </td>
       <td class="field">
@@ -34,7 +29,5 @@
     <tr tal:condition="python: view.department is not None">
       <td>
-        <label>
           Department:
-        </label>
       </td>
       <td class="field">
@@ -47,7 +40,5 @@
     <tr tal:condition="python: view.faculty is not None">
       <td>
-        <label>
           Faculty:
-        </label>
       </td>
       <td class="field">
@@ -64,5 +55,5 @@
 
 
-<table class="zebra">
+<table>
   <thead>
     <tr>
@@ -72,5 +63,5 @@
   </thead>
   <tbody>
-    <tr tal:repeat="value context/values">
+    <tr class="gradeC" tal:repeat="value context/values">
       <td> <a tal:attributes="href value/__name__">
       <span tal:content="value/level">CODE</span></a></td>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studyleveladdpage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studyleveladdpage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studyleveladdpage.pt	(revision 7459)
@@ -3,5 +3,5 @@
 tal:content="view/label">Label</h2>
 
-<div class="form-status"
+<div class="alert-message error"
     tal:define="status view/status"
     tal:condition="status">
@@ -13,5 +13,5 @@
 
 <form action="." tal:attributes="action request/URL" method="POST"
-      class="edit-form" enctype="multipart/form-data"> 
+      enctype="multipart/form-data"> 
 
   <p>Text to explain course registration procedure.</p>
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studyleveleditpage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studyleveleditpage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studyleveleditpage.pt	(revision 7459)
@@ -3,5 +3,5 @@
 tal:content="view/label">Label</h2>
 
-<div class="form-status"
+<div class="alert-message error"
     tal:define="status view/status"
     tal:condition="status">
@@ -13,5 +13,5 @@
 
 <form action="." tal:attributes="action request/URL" method="POST"
-      class="edit-form" enctype="multipart/form-data"> 
+      enctype="multipart/form-data"> 
 
   <h3>Course Tickets (Total Credits: <span tal:replace="view/total_credits">TOTAL</span>)</h3>
@@ -30,5 +30,5 @@
   </thead>
   <tbody>
-    <tr tal:repeat="value context/values">
+    <tr tal:repeat="value context/values" class="gradeC">
        <td>
         <input type="checkbox" name="val_id"
@@ -49,5 +49,5 @@
   </table>
 
-  <div class="actionButtons" tal:condition="view/availableActions">
+  <div tal:condition="view/availableActions">
     <span tal:repeat="action view/actions"
           tal:omit-tag="">
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studylevelmanagepage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studylevelmanagepage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studylevelmanagepage.pt	(revision 7459)
@@ -3,5 +3,5 @@
 tal:content="view/label">Label</h2>
 
-<div class="form-status"
+<div class="alert-message error"
     tal:define="status view/status"
     tal:condition="status">
@@ -13,95 +13,93 @@
 
 <form action="." tal:attributes="action request/URL" method="POST"
-      class="edit-form" enctype="multipart/form-data"> 
+      enctype="multipart/form-data"> 
 
-<div id="tabs">
-<ul>
-  <li><a href="#tab-1"><span>Study Level Data</span></a></li>
-  <li><a href="#tab-2"><span>Course Tickets</span></a></li>
-</ul>
-   
-<div id="tab-1">        
-  <table class="zebra">
-  <tbody>
-  <tal:block repeat="widget view/widgets">
-    <tr>
-      <td class="label">
-        <label tal:attributes="for widget/name">
-          <span class="required" tal:condition="widget/required">*</span>
-          <span i18n:translate="" tal:content="widget/label">label</span>:
-        </label>
-      </td>
-      <td class="field">
-        <span class="widget" tal:content="structure widget">
-          <input type="text" />
+  <ul class="tabs" data-tabs="tabs">
+    <li class="active"><a href="#tab-1"><span>Study Level Data</span></a></li>
+    <li><a href="#tab-2"><span>Course Tickets</span></a></li>
+  </ul>
+
+  <div class="tab-content">
+    <div id="tab-1" class="active">
+      <table class="form-table">
+      <tbody>
+      <tal:block repeat="widget view/widgets">
+        <tr>
+          <td class="fieldname">
+            <span class="required" tal:condition="widget/required">*</span>
+            <span i18n:translate="" tal:content="widget/label">label</span>:
+          </td>
+          <td>
+            <span tal:content="structure widget">
+              <input type="text" />
+            </span>
+            <tal:error tal:condition="widget/error">
+              <span tal:replace="structure widget/error">error</span>
+            </tal:error>
+            <tal:hint tal:condition="widget/hint">
+              <span tal:content="structure widget/hint">hint</span>
+            </tal:hint>
+          </td>
+        </tr>
+      </tal:block>
+      </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>
-        <tal:error tal:condition="widget/error">
-          <span tal:replace="structure widget/error">error</span>
-        </tal:error>
-        <tal:hint tal:condition="widget/hint">
-          <span class="hint" tal:content="structure widget/hint">hint</span>
-        </tal:hint>
-      </td>
-    </tr>
-  </tal:block>
-  </tbody>
-  </table>
-  <div class="actionButtons" 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 id="tab-2">
+      <h3>Course Tickets</h3>
+      <table class="display dataTableManage">
+      <thead>
+        <tr>
+          <th>&nbsp;</th>
+          <th>Sem.</th>
+          <th>Code</th>
+          <th>Title</th>
+          <th>Department</th>
+          <th>Faculty</th>
+          <th>Credits</th>
+          <th>Mandatory</th>
+          <th>Score</th>
+          <th>Auto</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr tal:repeat="value context/values" class="gradeC">
+          <td>
+            <input type="checkbox" name="val_id"
+      		  tal:attributes="value value/__name__" />
+          </td>
+          <td tal:content="value/semester">SEMESTER</td>
+          <td> <a tal:attributes="href value/__name__">
+          <span tal:content="value/code">CODE</span>
+          </a></td>
+          <td tal:content="value/title">TITLE</td>
+          <td tal:content="value/department">DEPARTMENT</td>
+          <td tal:content="value/faculty">FACULTY</td>
+          <td tal:content="value/credits">CREDITS</td>
+          <td tal:content="value/core_or_elective">MANDATORY</td>
+          <td tal:content="value/score">SCORE</td>
+          <td tal:content="value/automatic">AUTO</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.tabtwoactions"
+                 tal:replace="structure action/render"/>
+        </span>
+      </div>
+
+    </div>
   </div>
-</div>    
-    
-<div id="tab-2">
-  <h3>Course Tickets</h3>
-  <table class="display dataTableManage">
-  <thead>
-    <tr>
-      <th>&nbsp;</th>
-      <th>Sem.</th>
-      <th>Code</th>
-      <th>Title</th>
-      <th>Department</th>
-      <th>Faculty</th>
-      <th>Credits</th>
-      <th>Mandatory</th>
-      <th>Score</th>
-      <th>Auto</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr tal:repeat="value context/values">
-      <td>
-        <input type="checkbox" name="val_id"
-  		  tal:attributes="value value/__name__" />
-      </td>
-      <td tal:content="value/semester">SEMESTER</td>
-      <td> <a tal:attributes="href value/__name__">
-      <span tal:content="value/code">CODE</span>
-      </a></td>
-      <td tal:content="value/title">TITLE</td>
-      <td tal:content="value/department">DEPARTMENT</td>
-      <td tal:content="value/faculty">FACULTY</td>
-      <td tal:content="value/credits">CREDITS</td>
-      <td tal:content="value/core_or_elective">MANDATORY</td>
-      <td tal:content="value/score">SCORE</td>
-      <td tal:content="value/automatic">AUTO</td>
-    </tr>
-  </tbody>
-  </table>
-
-  <div class="actionButtons" tal:condition="view/availableActions">
-    <span tal:repeat="action view/actions"
-          tal:omit-tag="">
-      <input tal:condition="python:action.label in view.tabtwoactions"
-             tal:replace="structure action/render"/>
-    </span>
-  </div>
-
-</div>
-</div>
 </form>  
 
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studylevelpage.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studylevelpage.pt	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studylevelpage.pt	(revision 7459)
@@ -1,5 +1,5 @@
 <h2 tal:content="view/label">TITLE</h2>
 
-<table class="zebra">
+<table class="form-table">
 <thead>
 </thead>
@@ -7,11 +7,8 @@
   <tal:block repeat="widget view/widgets">
     <tr>
-      <td>
-        <label tal:attributes="for widget/name">
-          <span i18n:translate=""
-                         tal:content="widget/label">label</span>:
-        </label>
+      <td class="fieldname">
+        <span i18n:translate="" tal:content="widget/label">label</span>:
       </td>
-      <td class="field" tal:on-error="default">
+      <td tal:on-error="default">
         <div class="widget" tal:content="structure widget">
           <input type="text" />
@@ -22,5 +19,5 @@
   <tr>
     <td>
-      <label>Total Credits:</label>
+      Total Credits:
     </td>
     <td>
@@ -33,5 +30,5 @@
 <h3>Course Tickets</h3>
 
-<table class="display dataTable" >
+<table class="display dataTable">
   <thead>
     <tr>
@@ -48,5 +45,5 @@
   </thead>
   <tbody>
-    <tr tal:repeat="value context/values">
+    <tr tal:repeat="value context/values" class="gradeC">
       <td tal:content="value/semester">SEMESTER</td>
       <td> <a tal:attributes="href value/__name__">
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py	(revision 7459)
@@ -807,5 +807,5 @@
         self.browser.getLink("Clear student").click()
         self.assertTrue('Student has been cleared' in self.browser.contents)
-        self.assertTrue('State: <span>cleared</span>' in self.browser.contents)
+        self.assertTrue('cleared' in self.browser.contents)
         self.browser.getLink("Reject clearance").click()
         self.assertTrue('Clearance has been annulled' in self.browser.contents)
@@ -814,6 +814,5 @@
         self.assertEqual(self.browser.url, self.student_path +
             '/contactstudent?subject=%s' % urlmessage)
-        self.assertTrue('State: <span>clearance started</span>'
-            in self.browser.contents)
+        self.assertTrue('clearance started' in self.browser.contents)
         IWorkflowInfo(self.student).fireTransition('request_clearance')
         self.browser.open(self.clearance_student_path)
@@ -821,6 +820,5 @@
         self.assertTrue('Clearance request has been rejected'
             in self.browser.contents)
-        self.assertTrue('State: <span>clearance started</span>'
-            in self.browser.contents)
+        self.assertTrue('clearance started' in self.browser.contents)
         # CO does now also see the contact form and can send a message
         self.browser.getControl(name="form.subject").value = 'Important subject'
@@ -917,5 +915,5 @@
         self.browser.getLink("Validate courses").click()
         self.assertTrue('Course list has been validated' in self.browser.contents)
-        self.assertTrue('State: <span>courses validated</span>' in self.browser.contents)
+        self.assertTrue('courses validated' in self.browser.contents)
         self.browser.getLink("Reject courses").click()
         self.assertTrue('Course list request has been annulled'
@@ -924,6 +922,5 @@
         self.assertEqual(self.browser.url, self.student_path +
             '/contactstudent?subject=%s' % urlmessage)
-        self.assertTrue('State: <span>school fee paid</span>'
-            in self.browser.contents)
+        self.assertTrue('school fee paid' in self.browser.contents)
         IWorkflowInfo(self.student).fireTransition('register_courses')
         self.browser.open(L110_student_path)
@@ -931,6 +928,5 @@
         self.assertTrue('Course list request has been rejected'
             in self.browser.contents)
-        self.assertTrue('State: <span>school fee paid</span>'
-            in self.browser.contents)
+        self.assertTrue('school fee paid' in self.browser.contents)
         # CA does now see the contact form and can send a message
         self.browser.getControl(name="form.subject").value = 'Important subject'
@@ -977,5 +973,5 @@
         self.assertTrue('Password changed' in self.browser.contents)
         # We are still logged in. Changing the password hasn't thrown us out.
-        self.browser.getLink("My Data").click()
+        self.browser.getLink("Base Data").click()
         self.assertEqual(self.browser.url, self.student_path)
         # We can logout
Index: /main/waeup.sirp/trunk/src/waeup/sirp/students/viewlets.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/students/viewlets.py	(revision 7458)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/students/viewlets.py	(revision 7459)
@@ -57,14 +57,9 @@
     def render(self):
         url = self.view.url(self.context.getStudent(), self.link)
-        return u'<div class="portlet"><a href="%s">%s</a></div>' % (
+        return u'<li><a href="%s">%s</a></li>' % (
                 url, self.text)
 
-class StudentManageBaseLink(StudentManageLink):
-    grok.order(1)
-    link = 'index'
-    text = u'Base Data'
-
 class StudentManageApplicationLink(StudentManageLink):
-    grok.order(2)
+    grok.order(1)
     link = 'application_slip'
     text = u'Application Slip'
@@ -75,7 +70,12 @@
         if slip:
             url = self.view.url(self.context,self.link)
-            return u'<div class="portlet"><a href="%s">%s</a></div>' % (
+            return u'<li><a href="%s">%s</a></li>' % (
                     url, self.text)
         return ''
+
+class StudentManageBaseLink(StudentManageLink):
+    grok.order(2)
+    link = 'index'
+    text = u'Base Data'
 
 class StudentManageClearanceLink(StudentManageLink):
@@ -104,80 +104,7 @@
     grok.require('waeup.handleAccommodation')
     link = 'accommodation'
-    text = u'Accommodation Data'
+    text = u'Accommodation'
 
 class StudentManageHistoryLink(StudentManageLink):
-    grok.order(8)
-    link = 'history'
-    text = u'History'
-
-
-class StudentMenu(grok.ViewletManager):
-    grok.name('top_student')
-
-class StudentLink(PlainActionButton):
-    """A link displayed in the student box which shows up for StudentNavigation
-    objects.
-
-    """
-    grok.baseclass()
-    grok.viewletmanager(StudentMenu)
-    grok.context(ISIRPObject)
-    grok.view(Interface)
-    grok.order(5)
-    grok.require('waeup.viewStudent')
-
-    link = 'index'
-    text = u'Base Data'
-
-    @property
-    def target_url(self):
-        """Get a URL to the target...
-        """
-        return self.view.url(self.context.getStudent(), self.link)
-
-class StudentBaseLink(StudentLink):
-    grok.order(1)
-    link = 'index'
-    text = u'Base Data'
-
-class ApplicationSlipLink(StudentLink):
-    grok.order(2)
-    link = 'application_slip'
-    text = u'Application Slip'
-
-    @property
-    def target_url(self):
-        slip = getUtility(IExtFileStore).getFileByContext(
-            self.context.getStudent(), attr=self.link)
-        if slip:
-            return self.view.url(self.context,self.link)
-        return
-
-class StudentClearanceLink(StudentLink):
-    grok.order(3)
-    link = 'view_clearance'
-    text = u'Clearance Data'
-
-class StudentPersonalLink(StudentLink):
-    grok.order(4)
-    link = 'view_personal'
-    text = u'Personal Data'
-
-class StudentStudyCourseLink(StudentLink):
-    grok.order(5)
-    link = 'studycourse'
-    text = u'Study Course'
-
-class StudentPaymentsLink(StudentLink):
-    grok.order(6)
-    link = 'payments'
-    text = u'Payments'
-
-class StudentAccommodationLink(StudentLink):
-    grok.order(7)
-    link = 'accommodation'
-    text = u'Accommodation'
-
-class StudentHistoryLink(StudentLink):
     grok.order(8)
     link = 'history'
@@ -227,15 +154,38 @@
 
 class MyStudentDataTab(PrimaryStudentNavTab):
-    """MyData-tab in primary navigation.
+    """MyData dropdown tab in primary navigation.
     """
     grok.order(3)
     grok.require('waeup.viewMyStudentDataTab')
+    grok.template('mydatadropdowntabs')
     pnav = 4
     tab_title = u'My Data'
 
     @property
-    def link_target(self):
-        rel_link = '/students/%s' % self.request.principal.id
-        return self.view.application_url() + rel_link
+    def active(self):
+        view_pnav = getattr(self.view, 'pnav', 0)
+        if view_pnav == self.pnav:
+            return 'active dropdown'
+        return 'dropdown'
+
+    @property
+    def targets(self):
+        student_url = self.view.application_url() + (
+            '/students/%s' % self.request.principal.id)
+        #app_slip = getUtility(IExtFileStore).getFileByContext(
+        #    self.context.getStudent(), 'application_slip')
+        targets = []
+        #if app_slip:
+        #    targets = [{'url':student_url + '/application_slip', 'title':'Application Slip'},]
+        targets += [
+            {'url':student_url, 'title':'Base Data'},
+            {'url':student_url + '/view_clearance', 'title':'Clearance Data'},
+            {'url':student_url + '/view_personal', 'title':'Personal Data'},
+            {'url':student_url + '/studycourse', 'title':'Study Course'},
+            {'url':student_url + '/payments', 'title':'Payments'},
+            {'url':student_url + '/accommodation', 'title':'Accommodation Data'},
+            {'url':student_url + '/history', 'title':'History'},
+            ]
+        return targets
 
 def handle_file_delete(context, view, download_name):
