From e27a407297b4d87a923ce6274fe7b50db2c74e4e Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Tue, 25 Dec 2012 20:05:42 +0100
Subject: improved header, moved notifications

---
 module/web/templates/default/base.html | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'module/web/templates')

diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html
index 33b09751d..8d6ff8c14 100644
--- a/module/web/templates/default/base.html
+++ b/module/web/templates/default/base.html
@@ -37,9 +37,13 @@
         </div>
         <div class="right">
             {% if user %}
-                <div class="header_block">
-                    <a class="header-link" href="/settings"><i class="icon-cog icon-white"></i> Settings</a>
-                    <a class="header-link" href="#"><i class="icon-list-alt icon-white"></i> Accounts</a>
+                <div class="header_block menu-block">
+                    <div id="notifications-area">
+                        Notifications
+                        <span class="badge badge-info">88</span>
+                    </div>
+{#                    <a class="header-link" href="/settings"><i class="icon-cog icon-white"></i> Settings</a>#}
+{#                    <a class="header-link" href="#"><i class="icon-list-alt icon-white"></i> Accounts</a>#}
                     <br/>
 
                     <a class="btn btn-success btn-grabber" href="#"><i class="icon-plus icon-white"></i> Add</a>
@@ -74,12 +78,7 @@
                     <i class="icon-download-alt icon-white"></i> Downloads: <br>
                 </div>
 
-                <div id="notification_div">
-                    <div class="notifications-area">
-                        Notifications
-                        <span class="badge badge-info">88</span>
-                    </div>
-
+                <div id="progress-area" style="margin-top: 16px">
                     <div class="progress" id="globalprogress">
                         <div class="bar" style="width: 48%">downloading... (48%)</div>
                     </div>
@@ -88,7 +87,6 @@
 {#                        <span class="pull-left">3,65 MB of 5,30 MB</span>#}
 {#                        <span class="pull-right">420,7 kB / sec</span>#}
 {#                    </div>#}
-
                 </div>
 
             {% endif %}
-- 
cgit v1.2.3