From b3c5fa9924907cd0515e98b79882eb89973e9423 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Mon, 17 Sep 2012 22:07:17 +0200
Subject: dropdowns in navbar

---
 module/web/static/css/default/style.less         |  8 +++----
 module/web/templates/default/backbone/modal.html |  2 +-
 module/web/templates/default/dashboard.html      | 30 ++++++++++++++++++++++--
 3 files changed, 33 insertions(+), 7 deletions(-)

(limited to 'module')

diff --git a/module/web/static/css/default/style.less b/module/web/static/css/default/style.less
index 08ae11f9e..203135e97 100644
--- a/module/web/static/css/default/style.less
+++ b/module/web/static/css/default/style.less
@@ -3,7 +3,7 @@
     General
  */
 
-@width: 1000px;
+@min-width: 1000px;
 @header-height: 70px;
 @footer-height: 100px;
 @margin-side: 150px;
@@ -29,7 +29,7 @@ body {
     font-family: 'Abel', sans-serif;
     font-size: 16px;
     background: url("../../img/default/bgpattern.png") repeat scroll 0 0 transparent;
-    min-width: @width;
+    min-width: @min-width;
 }
 
 h1, h2, h3 {
@@ -54,7 +54,7 @@ a:hover {
 
 #content {
     margin-left: @margin-side;
-    margin-right: @margin-side;
+    margin-right: @margin-side ;
     padding-bottom: @footer-height;
 }
 
@@ -76,7 +76,7 @@ header {
     vertical-align: top;
     width: 100%;
     z-index: 10;
-    min-width: @width;
+    min-width: @min-width;
     color: #ffffff;
 }
 
diff --git a/module/web/templates/default/backbone/modal.html b/module/web/templates/default/backbone/modal.html
index 97a5a4d97..afc5d7b58 100644
--- a/module/web/templates/default/backbone/modal.html
+++ b/module/web/templates/default/backbone/modal.html
@@ -2,7 +2,7 @@
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
     <h3><%- header %></h3>
 </div>
-<div class="modal-body" tabindex="0">
+<div class="modal-body">
     <%- content %>
 </div>
 <div class="modal-footer">
diff --git a/module/web/templates/default/dashboard.html b/module/web/templates/default/dashboard.html
index 74d6a70f3..05f5b85a3 100644
--- a/module/web/templates/default/dashboard.html
+++ b/module/web/templates/default/dashboard.html
@@ -25,11 +25,37 @@
                 </div>
             </form>
         </li>
+        <li class="dropdown" style="float: right;">
+            <a class="dropdown-toggle"
+               data-toggle="dropdown"
+               href="#">
+                Type
+                <b class="caret"></b>
+            </a>
+            <ul class="dropdown-menu">
+                <li><a>Audio</a></li>
+                <li><a>Video</a></li>
+                <li><a>Archive</a></li>
+            </ul>
+        </li>
+        <li class="dropdown" style="float: right;">
+            <a class="dropdown-toggle"
+               data-toggle="dropdown"
+               href="#">
+                More
+                <b class="caret"></b>
+            </a>
+            <ul class="dropdown-menu">
+                <li><a>Active</a></li>
+                <li><a>Failed</a></li>
+            </ul>
+        </li>
+
         <li style="float: right;">
-            <a>Unfinished</a>
+            <a>Failed</a>
         </li>
         <li style="float: right;">
-            <a>Active</a>
+            <a>Unfinished</a>
         </li>
         <li class="active" style="float: right;">
             <a>All</a>
-- 
cgit v1.2.3