From 393bc84c584018cbbc634fb36e6ee42fe1a4acbb Mon Sep 17 00:00:00 2001
From: godofdream <soilfiction@gmail.com>
Date: Sun, 12 Aug 2012 16:16:22 +0200
Subject: changed colors of 2 icons added settings and logoutbutton

---
 module/web/static/css/default/style.css            |  92 ++++++++++-----------
 .../static/img/default/downloading-icon-green.png  | Bin 903 -> 1029 bytes
 .../static/img/default/downloading-icon-red.png    | Bin 896 -> 1016 bytes
 module/web/static/img/default/gear-icon-white.png  | Bin 0 -> 769 bytes
 .../static/img/default/icon_clock_small_white.png  | Bin 1523 -> 0 bytes
 .../static/img/default/icon_speed_small_white.png  | Bin 1535 -> 0 bytes
 .../static/img/default/reconnecting-icon-green.png | Bin 851 -> 945 bytes
 .../static/img/default/reconnecting-icon-red.png   | Bin 842 -> 914 bytes
 module/web/static/img/default/user-icon-white.png  | Bin 0 -> 474 bytes
 module/web/templates/default/base.html             |  14 +++-
 10 files changed, 53 insertions(+), 53 deletions(-)
 create mode 100644 module/web/static/img/default/gear-icon-white.png
 delete mode 100644 module/web/static/img/default/icon_clock_small_white.png
 delete mode 100644 module/web/static/img/default/icon_speed_small_white.png
 create mode 100644 module/web/static/img/default/user-icon-white.png

(limited to 'module/web')

diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css
index 0e7c5d98d..862b2d2c7 100644
--- a/module/web/static/css/default/style.css
+++ b/module/web/static/css/default/style.css
@@ -117,18 +117,10 @@ header img.logo {
 
 .header_block {
     float: right;
-    margin: 12px 12px 0;
+    margin: 8px 8px 0;
     font-family: SansationRegular, sans-serif;
     color: #ffffff;
 }
-.icon_info {
-    padding-bottom: 5px;
-}
-
-.icon_info img {
-    margin-bottom: -4px;
-    padding-right: 5px;
-}
 
 #notification_div {
     position: absolute;
@@ -148,6 +140,48 @@ header img.logo {
     font-family: sans-serif
 }
 
+#speedmeter, #downloads{
+	height: 26px;
+	margin: 0 2px 4px 2px;
+}
+.header-icon, #check_reconnecting, #check_downloading{
+	padding: 0;
+	margin: 0 4px 3px 0;
+	float: left;
+	width: 26px;
+	height: 26px;
+}
+.header_text {
+	vertical-align: middle;
+}
+#downloads_icon {
+    background: url("../../img/default/queue-icon-white.png");
+}
+#speedmeter_icon {
+    background: url("../../img/default/speed-icon-white.png");
+}
+#button_settings {
+    background: url("../../img/default/gear-icon-white.png");
+}
+#button_user {
+    background: url("../../img/default/user-icon-white.png");
+}
+
+.pyload-icon-reconnecting-activated {
+    background: url("../../img/default/reconnecting-icon-green.png");
+}
+.pyload-icon-reconnecting-deactivated {
+    background: url("../../img/default/reconnecting-icon-red.png");
+}
+
+.pyload-icon-downloading-activated {
+    background: url("../../img/default/downloading-icon-green.png");
+}
+.pyload-icon-downloading-deactivated {
+    background: url("../../img/default/downloading-icon-red.png");
+}
+
+
 /*
     Footer
 */
@@ -211,43 +245,3 @@ footer h2 {
     padding-bottom: 6px;
 }
 
-.header_block input {
-	width: 26px;
-	height: 26px;
-}
-#speedmeter, #downloads{
-	height: 26px;
-	margin: 0 2px 4px 2px;
-}
-.header-icon, #check_reconnecting, #check_downloading {
-	padding: 0;
-	margin: 0 3px 0 0;
-	float: left;
-	width: 26px;
-	height: 26px;
-}
-.header_text {
-	vertical-align:middle;
-	color: #FFFFFF;
-}
-#downloads_icon {
-    background: url("../../img/default/queue-icon-white.png");
-}
-#speedmeter_icon{
-    background: url("../../img/default/speed-icon-white.png");
-}
-
-
-.pyload-icon-reconnecting-activated {
-    background: url("../../img/default/reconnecting-icon-green.png");
-}
-.pyload-icon-reconnecting-deactivated {
-    background: url("../../img/default/reconnecting-icon-red.png");
-}
-
-.pyload-icon-downloading-activated {
-    background: url("../../img/default/downloading-icon-green.png");
-}
-.pyload-icon-downloading-deactivated {
-    background: url("../../img/default/downloading-icon-red.png");
-}
\ No newline at end of file
diff --git a/module/web/static/img/default/downloading-icon-green.png b/module/web/static/img/default/downloading-icon-green.png
index 84e47dc3b..3c65e5c71 100644
Binary files a/module/web/static/img/default/downloading-icon-green.png and b/module/web/static/img/default/downloading-icon-green.png differ
diff --git a/module/web/static/img/default/downloading-icon-red.png b/module/web/static/img/default/downloading-icon-red.png
index ec66e56ef..d332ebb57 100644
Binary files a/module/web/static/img/default/downloading-icon-red.png and b/module/web/static/img/default/downloading-icon-red.png differ
diff --git a/module/web/static/img/default/gear-icon-white.png b/module/web/static/img/default/gear-icon-white.png
new file mode 100644
index 000000000..3a41217b2
Binary files /dev/null and b/module/web/static/img/default/gear-icon-white.png differ
diff --git a/module/web/static/img/default/icon_clock_small_white.png b/module/web/static/img/default/icon_clock_small_white.png
deleted file mode 100644
index b6c3535e8..000000000
Binary files a/module/web/static/img/default/icon_clock_small_white.png and /dev/null differ
diff --git a/module/web/static/img/default/icon_speed_small_white.png b/module/web/static/img/default/icon_speed_small_white.png
deleted file mode 100644
index a82639113..000000000
Binary files a/module/web/static/img/default/icon_speed_small_white.png and /dev/null differ
diff --git a/module/web/static/img/default/reconnecting-icon-green.png b/module/web/static/img/default/reconnecting-icon-green.png
index 93e3732f0..209a80348 100644
Binary files a/module/web/static/img/default/reconnecting-icon-green.png and b/module/web/static/img/default/reconnecting-icon-green.png differ
diff --git a/module/web/static/img/default/reconnecting-icon-red.png b/module/web/static/img/default/reconnecting-icon-red.png
index e97a10270..04f7ce018 100644
Binary files a/module/web/static/img/default/reconnecting-icon-red.png and b/module/web/static/img/default/reconnecting-icon-red.png differ
diff --git a/module/web/static/img/default/user-icon-white.png b/module/web/static/img/default/user-icon-white.png
new file mode 100644
index 000000000..e062d7c87
Binary files /dev/null and b/module/web/static/img/default/user-icon-white.png differ
diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html
index 94b574046..993a788bb 100644
--- a/module/web/templates/default/base.html
+++ b/module/web/templates/default/base.html
@@ -60,16 +60,22 @@
             <div id="speedgraph"></div>
 			
 			<div class="header_block">
-                <div id="check_reconnecting" class="pyload-icon-reconnecting-deactivated"></div>
-                <div id="check_downloading" class="pyload-icon-downloading-deactivated"></div>
+				<div>
+					<div id="check_reconnecting" class="pyload-icon-reconnecting-deactivated" title="{{ _('Reconnect') }}"></div>
+					<div id="check_downloading" class="pyload-icon-downloading-deactivated" title="{{ _('Download') }}"></div>
+				</div>
+				<div>
+					<div id="button_settings" class="header-icon" title="{{ _('Settings') }}"></div>
+					<div id="button_user" class="header-icon" title="{{ _('Logout') }}"></div>
+				</div>
             </div>
 			
             <div class="header_block">
-                <div id="speedmeter">
+				<div id="speedmeter" title="{{ _('Speed') }}">
 					<div id="speedmeter_icon" class="header-icon"></div>
 					<span id="speedmeter_value" class="header_text">250KiB/s</span>
 				</div>
-                <div id="downloads">
+				<div id="downloads" title="{{ _('Queue') }}">
 					<div id="downloads_icon" class="header-icon"></div>
 					<span id="downloads_value" class="header_text">3/126/212</span>
 				</div>
-- 
cgit v1.2.3