From 68f1510f5a6ab632db19fc63f29c0475de9feb9d Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Mon, 17 Sep 2012 15:46:42 +0200
Subject: nav + search bar for dashboard

---
 module/web/templates/default/dashboard.html | 34 +++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 module/web/templates/default/dashboard.html

(limited to 'module/web/templates/default/dashboard.html')

diff --git a/module/web/templates/default/dashboard.html b/module/web/templates/default/dashboard.html
new file mode 100644
index 000000000..a962011cd
--- /dev/null
+++ b/module/web/templates/default/dashboard.html
@@ -0,0 +1,34 @@
+{% extends 'default/base.html' %}
+{% block require %}
+    App.initPackageTree();
+{% endblock %}
+
+{% block content %}
+    <ul id="dash-nav" class="nav nav-pills">
+        <li class="active">
+            <a class="active">All</a>
+        </li>
+        <li>
+            <a>Active</a>
+        </li>
+        <li class="dropdown">
+            <a class="dropdown-toggle"
+               data-toggle="dropdown"
+               href="#">
+                Dropdown
+                <b class="caret"></b>
+            </a>
+            <ul class="dropdown-menu">
+                <!-- links -->
+            </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>
+    </ul>
+{% endblock %}
\ No newline at end of file
-- 
cgit v1.2.3


From 8a0d6e4660481740efe47a0a3dd91c8c76c4e4dc Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Mon, 17 Sep 2012 17:15:45 +0200
Subject: breadcrumbs for dashboard

---
 module/web/templates/default/dashboard.html | 31 +++++++++++++++--------------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to 'module/web/templates/default/dashboard.html')

diff --git a/module/web/templates/default/dashboard.html b/module/web/templates/default/dashboard.html
index a962011cd..6bfa2eb5a 100644
--- a/module/web/templates/default/dashboard.html
+++ b/module/web/templates/default/dashboard.html
@@ -5,23 +5,14 @@
 
 {% block content %}
     <ul id="dash-nav" class="nav nav-pills">
-        <li class="active">
-            <a class="active">All</a>
-        </li>
         <li>
-            <a>Active</a>
-        </li>
-        <li class="dropdown">
-            <a class="dropdown-toggle"
-               data-toggle="dropdown"
-               href="#">
-                Dropdown
-                <b class="caret"></b>
-            </a>
-            <ul class="dropdown-menu">
-                <!-- links -->
-            </ul>
+        <ul class="breadcrumb">
+            <li><a href="#">Home</a> <span class="divider">/</span></li>
+            <li><a href="#">Library</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">
@@ -30,5 +21,15 @@
                 </div>
             </form>
         </li>
+        <li style="float: right;">
+            <a>Unfinished</a>
+        </li>
+        <li style="float: right;">
+            <a>Active</a>
+        </li>
+        <li class="active" style="float: right;">
+            <a>All</a>
+        </li>
+
     </ul>
 {% endblock %}
\ No newline at end of file
-- 
cgit v1.2.3


From 6b4ef3af1319efd8e2069f4c67332378b8a1c64e Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Mon, 17 Sep 2012 17:39:26 +0200
Subject: removed unneeded css, new login style

---
 module/web/templates/default/dashboard.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'module/web/templates/default/dashboard.html')

diff --git a/module/web/templates/default/dashboard.html b/module/web/templates/default/dashboard.html
index 6bfa2eb5a..777e73ae7 100644
--- a/module/web/templates/default/dashboard.html
+++ b/module/web/templates/default/dashboard.html
@@ -1,4 +1,8 @@
 {% extends 'default/base.html' %}
+{% block title %}
+    {{_("Dashboard")}} - {{ super()}}}
+{% endblock %}
+
 {% block require %}
     App.initPackageTree();
 {% endblock %}
-- 
cgit v1.2.3


From ab2b8b65572aa2338411c98f68e41d7b0adcfd60 Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Mon, 17 Sep 2012 19:00:23 +0200
Subject: different bg pattern

---
 module/web/templates/default/dashboard.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/web/templates/default/dashboard.html')

diff --git a/module/web/templates/default/dashboard.html b/module/web/templates/default/dashboard.html
index 777e73ae7..74d6a70f3 100644
--- a/module/web/templates/default/dashboard.html
+++ b/module/web/templates/default/dashboard.html
@@ -1,6 +1,6 @@
 {% extends 'default/base.html' %}
 {% block title %}
-    {{_("Dashboard")}} - {{ super()}}}
+    {{_("Dashboard")}} - {{ super()}}
 {% endblock %}
 
 {% block require %}
-- 
cgit v1.2.3


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/templates/default/dashboard.html | 30 +++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

(limited to 'module/web/templates/default/dashboard.html')

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