From 26e8055317e7654f3c85225cb0843429b72b87fa Mon Sep 17 00:00:00 2001
From: hamza zia <ziahamza2007@gmail.com>
Date: Mon, 2 Jun 2014 18:58:58 +0800
Subject: [PATCH] more ui refinements, global statistics moved to the new
 sidebar

---
 index.html              | 38 ++++++++++++++++++++++++++------------
 js/directives/dgraph.js |  3 +--
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/index.html b/index.html
index f5b4a63..3d55299 100755
--- a/index.html
+++ b/index.html
@@ -75,8 +75,6 @@
   <script src="js/ctrls/nav.js"></script>
   <script src="js/ctrls/alert.js"></script>
   <script src="js/ctrls/props.js"></script>
-
-
 </head>
 <!-- }}} -->
 
@@ -231,6 +229,8 @@
   <div class="span3">
     <!-- {{{ nav side bar -->
     <div class="well sidebar-nav">
+
+      <!-- {{{ download filters -->
       <ul id="filters" class="clearfix nav nav-list">
         <li class="nav-header">Download Filters</li>
         <li>
@@ -286,9 +286,12 @@
           </p>
         </li>
       </ul>
+      <!-- }}} -->
 
+      <br>
+
+      <!-- {{{ starred properties -->
       <ul class="clearfix nav nav-list" ng-controller="StarredPropsCtrl" ng-show="properties.length">
-
         <li class="nav-header">Quick Access Settings</li>
         <li ng-repeat="prop in properties">
           <label title="{{prop.desc}}">
@@ -303,6 +306,26 @@
           <button ng-disabled="!enabled()" ng-click="save()" class="btn btn-small">Save settings</button>
         </li>
       </ul>
+      <!-- }}} -->
+
+      <br>
+
+      <!-- {{{ global statistics -->
+      <ul class="nav nav-list">
+        <li class="nav-header">Global Statistics</li>
+        <li>
+          <div
+            dspeed="gstats.downloadSpeed"
+            uspeed="gstats.uploadSpeed"
+            dgraph ng-show="totalAria2Downloads()"
+            nolabel="true"
+            draw="true">
+          </div>
+        </li>
+      </ul>
+      <!-- }}} -->
+
+
     </div>
     <!-- }}} -->
   </div>
@@ -314,15 +337,6 @@
       Currently no download in line to display, use the '<strong>Add</strong>' download button to start downloading files!
     </div>
 
-    <!-- {{{ global statistics -->
-    <div ng-class="{'large-graph': large_graph}" id="download-graph" class="download-graph"
-      dspeed="gstats.downloadSpeed"
-      uspeed="gstats.uploadSpeed"
-      dgraph ng-show="totalAria2Downloads()"
-      draw="true"
-      ng-click="large_graph = !large_graph">
-    </div>
-    <!-- }}} -->
 
     <!-- {{{ download template -->
 
diff --git a/js/directives/dgraph.js b/js/directives/dgraph.js
index 36e60da..ec10b0f 100644
--- a/js/directives/dgraph.js
+++ b/js/directives/dgraph.js
@@ -39,10 +39,9 @@ angular
 
     // hack for the null height for flot elem
     elem.height(elem.width() * ratio);
-
     var graph = $.plot(elem, [dconf, uconf], {
       legend: {
-        show: true,
+        show: (attrs.nolabel == undefined),
         backgroundOpacity: 0,
         margin: [10, 20],
         labelFormatter: function(label, series) {