From dbf995480a6f503744f4a82a4659462ece90bf8f Mon Sep 17 00:00:00 2001
From: buinsky <vix_booja@tut.by>
Date: Wed, 13 Jan 2016 23:12:28 +0300
Subject: [PATCH] WebUI: Change the order of the values of speed labels

---
 src/webui/www/private/index.html       |  5 +++--
 src/webui/www/public/css/Layout.css    |  9 +++++++--
 src/webui/www/public/scripts/client.js | 14 ++++++--------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/webui/www/private/index.html b/src/webui/www/private/index.html
index 95262b825..8c2855988 100644
--- a/src/webui/www/private/index.html
+++ b/src/webui/www/private/index.html
@@ -136,9 +136,10 @@
                     <td class="statusBarSeparator"></td>
                     <td style="cursor:pointer;"><img id="alternativeSpeedLimits" alt="QBT_TR(Alternative speed limits)QBT_TR" src="images/slow_off.png" /></td>
                     <td class="statusBarSeparator"></td>
-                    <td style="cursor:pointer; min-width: 200px"><img src="images/skin/download.png" alt="" style="padding-right: 5px; margin-bottom: -4px;"><span id="DlInfos"></span></td>
+                    <td class="speedLabel"><img src="images/skin/download.png" alt="" style="padding-right: 5px; margin-bottom: -4px;"><span id="DlInfos"></span></td>
                     <td class="statusBarSeparator"></td>
-                    <td style="cursor:pointer; min-width: 200px"><img src="images/skin/seeding.png" alt="" style="padding-right: 5px; margin-bottom: -3px;"><span id="UpInfos"></span></td></tr>
+                    <td class="speedLabel"><img src="images/skin/seeding.png" alt="" style="padding-right: 5px; margin-bottom: -3px;"><span id="UpInfos"></span></td>
+                </tr>
             </table>
         </div>
     </div>
diff --git a/src/webui/www/public/css/Layout.css b/src/webui/www/public/css/Layout.css
index c9d8bf7a4..b533fc2b0 100644
--- a/src/webui/www/public/css/Layout.css
+++ b/src/webui/www/public/css/Layout.css
@@ -420,9 +420,14 @@ div.toolbox.divider { /* Have to specify div here for IE6's sake */
 	background: url(../images/skin/spinner.gif) no-repeat;
 	width: 16px;
 	height: 16px;
-}	
+}
 
 #desktopFooter td {
 	vertical-align: top;
-	text-align: center;
+	text-align: left;
 }
+
+td.speedLabel {
+    cursor:pointer;
+    min-width: 18em;
+}
\ No newline at end of file
diff --git a/src/webui/www/public/scripts/client.js b/src/webui/www/public/scripts/client.js
index 2498ceeae..58caa7767 100644
--- a/src/webui/www/public/scripts/client.js
+++ b/src/webui/www/public/scripts/client.js
@@ -373,17 +373,15 @@ window.addEvent('load', function () {
     }
 
     var processServerState = function () {
-        var transfer_info = "";
+        var transfer_info = friendlyUnit(serverState.dl_info_speed, true);
         if (serverState.dl_rate_limit > 0)
-            transfer_info += "[" + friendlyUnit(serverState.dl_rate_limit, true) + "] ";
-        transfer_info += friendlyUnit(serverState.dl_info_speed, true);
-        transfer_info += " (" + friendlyUnit(serverState.dl_info_data, false) + ")"
+            transfer_info += " [" + friendlyUnit(serverState.dl_rate_limit, true) + "]";
+        transfer_info += " (" + friendlyUnit(serverState.dl_info_data, false) + ")";
         $("DlInfos").set('html', transfer_info);
-        transfer_info = "";
+        transfer_info = friendlyUnit(serverState.up_info_speed, true);
         if (serverState.up_rate_limit > 0)
-            transfer_info += "[" + friendlyUnit(serverState.up_rate_limit, true) + "] ";
-        transfer_info += friendlyUnit(serverState.up_info_speed, true)
-        transfer_info += " (" + friendlyUnit(serverState.up_info_data, false) + ")"
+            transfer_info += " [" + friendlyUnit(serverState.up_rate_limit, true) + "]";
+        transfer_info += " (" + friendlyUnit(serverState.up_info_data, false) + ")";
         $("UpInfos").set('html', transfer_info);
         if (speedInTitle) {
             document.title = "QBT_TR([D:%1 U:%2])QBT_TR".replace("%1", friendlyUnit(serverState.dl_info_speed, true)).replace("%2", friendlyUnit(serverState.up_info_speed, true));