From 40b05174b69de8b0f8366b49d43a3cbc97563fda Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Wed, 30 Jan 2013 22:11:10 +0100
Subject: added actionbar, two-column dashboard

---
 module/web/templates/default/base.html      |   9 +++
 module/web/templates/default/dashboard.html | 120 ++++++++++++++++------------
 2 files changed, 77 insertions(+), 52 deletions(-)

(limited to 'module/web/templates/default')

diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html
index 3b6cfd07b..bb03eaf81 100644
--- a/module/web/templates/default/base.html
+++ b/module/web/templates/default/base.html
@@ -129,6 +129,15 @@
             {% endif %}
         </div>
     </header>
+    <div id="actionbar-container" class="container-fluid">
+        <div class="row-fluid">
+        <div class="span2 offset1">
+            <h5>Notifcations or something</h5>
+        </div>
+        {% block actionbar %}
+        {% endblock %}
+        </div>
+    </div>
     <div id="content">
         {% for msg in messages %}
             <p>{{ msg }}</p>
diff --git a/module/web/templates/default/dashboard.html b/module/web/templates/default/dashboard.html
index 875178931..2400d9bde 100644
--- a/module/web/templates/default/dashboard.html
+++ b/module/web/templates/default/dashboard.html
@@ -72,60 +72,76 @@
     </script>
 {% endblock %}
 
-{% block content %}
-    <ul id="dash-nav" class="nav nav-pills">
-        <li>
-            <ul class="breadcrumb">
-                <li><a href="#">{{ _("Home") }}</a> <span class="divider">/</span></li>
-                <li class="active">Data</li>
-            </ul>
-        </li>
+{% block actionbar %}
+    <ul id="actionbar" class="nav nav-pills span9">
+    <li>
+        <ul class="breadcrumb">
+            <li><a href="#">{{ _("Home") }}</a> <span class="divider">/</span></li>
+            <li class="active">Data</li>
+        </ul>
+    </li>
 
-        <li style="float: right;">
-            <form class="form-search">
-                <div class="input-append">
-                    <input type="text" class="span2 search-query">
-                    <button type="submit" class="btn">{{ _("Search") }}</button>
-                </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><i class="icon-ok"></i>&nbsp;Audio</a></li>
-                <li><a><i class="icon-remove"></i>&nbsp;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;">
+        <form class="form-search">
+            <div class="input-append">
+                <input type="text" class="search-query" style="width: 100px">
+                <button type="submit" class="btn">{{ _("Search") }}</button>
+            </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><i class="icon-ok"></i>&nbsp;Audio</a></li>
+            <li><a><i class="icon-remove"></i>&nbsp;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>Failed</a>
-        </li>
-        <li style="float: right;">
-            <a>Unfinished</a>
-        </li>
-        <li class="active" style="float: right;">
-            <a href="#" id="show_active">All</a>
-        </li>
+    <li style="float: right;">
+        <a>Failed</a>
+    </li>
+    <li style="float: right;">
+        <a>Unfinished</a>
+    </li>
+    <li class="active" style="float: right;">
+        <a href="#" id="show_active">All</a>
+    </li>
     </ul>
-    <div id="dashboard">
-        {#  Build up by js #}
+{% endblock %}
+
+
+{% block content %}
+
+    <div class="container-fluid">
+        <div class="row-fluid">
+            <div class="span3">
+                <div class="well">
+                    Packages
+                </div>
+            </div>
+            <div class="span9">
+                <div id="dashboard">
+                    {#  Build up by js #}
+                </div>
+            </div>
+        </div>
     </div>
 {% endblock %}
\ No newline at end of file
-- 
cgit v1.2.3