From 46140cb8295870db4ad78f7cfdd7a5617e3b8275 Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Sun, 10 Jul 2016 17:37:34 +0800
Subject: [PATCH] modify style

---
 src/scripts/services/aria2TaskService.js |  2 ++
 src/styles/controls/piece-bar-map.css    | 12 ++++++------
 src/styles/theme/default.css             |  3 ++-
 src/views/list.html                      |  5 ++---
 src/views/task-detail.html               |  9 +++------
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/scripts/services/aria2TaskService.js b/src/scripts/services/aria2TaskService.js
index 5f1d354..957cb18 100644
--- a/src/scripts/services/aria2TaskService.js
+++ b/src/scripts/services/aria2TaskService.js
@@ -71,6 +71,7 @@
 
             task.idle = task.downloadSpeed == 0;
             task.remainTime = calculateDownloadRemainTime(task.remainLength, task.downloadSpeed);
+            task.seeder = (task.seeder === true || task.seeder === 'true');
 
             var taskNameResult = getTaskName(task);
             task.taskName = taskNameResult.name;
@@ -116,6 +117,7 @@
                 peer.completePercent = completedPieceCount / task.numPieces * 100;
                 peer.downloadSpeed = upstreamToSpeed;
                 peer.uploadSpeed = downstreamFromSpeed;
+                peer.seeder = (peer.seeder === true || peer.seeder === 'true');
 
                 if (completedPieceCount == localTaskCompletedPieceCount && peer.completePercent != localTaskCompletedPercent) {
                     peer.completePercent = localTaskCompletedPercent;
diff --git a/src/styles/controls/piece-bar-map.css b/src/styles/controls/piece-bar-map.css
index 0e8e634..18b69f3 100644
--- a/src/styles/controls/piece-bar-map.css
+++ b/src/styles/controls/piece-bar-map.css
@@ -24,11 +24,7 @@
     margin-right: 4px;
 }
 
-.piece-legend .piece {
-    margin-right: 2px;
-}
-
-.piece-map .piece, .piece-legend .piece {
+.piece-map .piece, .piece-legend > .piece {
     width: 10px;
     height: 10px;
     background-color: #eef2f4;
@@ -37,7 +33,11 @@
     margin-right: 1px;
 }
 
-.piece-map .piece.piece-completed, .piece-legend .piece.piece-completed {
+.piece-map .piece.piece-completed, .piece-legend > .piece.piece-completed {
     background-color: #b8dd69;
     border-color: #b8dd69;
 }
+
+.piece-legend > .piece {
+    margin-right: 4px;
+}
diff --git a/src/styles/theme/default.css b/src/styles/theme/default.css
index dfc3651..c58ffe1 100644
--- a/src/styles/theme/default.css
+++ b/src/styles/theme/default.css
@@ -238,7 +238,8 @@
 }
 
 .skin-aria-ng .icon-seeder {
-    color: #da7362;
+    margin-left: 4px;
+    color: #da412c;
 }
 
 .skin-aria-ng .nav-tabs-custom {
diff --git a/src/views/list.html b/src/views/list.html
index cdef392..4f837ee 100644
--- a/src/views/list.html
+++ b/src/views/list.html
@@ -39,8 +39,7 @@
                         <input id="{{'task_' + task.gid}}" type="checkbox" ng-model="taskContext.selected[task.gid]"/>
                         <label for="{{'task_' + task.gid}}">
                             <span class="task-name" ng-bind="task.taskName" title="{{task.taskName}}"></span>
-                        </label>
-                        <i class="icon-seeder fa fa-magnet" title="{{'Seeding' | translate}}" ng-if="task && task.status == 'active' && (task.seeder === true || task.seeder === 'true')"></i>
+                        </label><i class="icon-seeder fa fa-angle-double-up" title="{{'Seeding' | translate}}" ng-if="task && task.status == 'active' && task.seeder"></i>
                     </div>
                     <div class="task-files">
                         <span ng-bind="task.totalLength | readableVolumn"></span>
@@ -67,7 +66,7 @@
                     </div>
                 </div>
                 <div class="col-sm-2 hidden-xs">
-                    <span class="task-download-speed" ng-bind="(task.downloadSpeed | readableVolumn) + '/s'"></span>
+                    <span class="task-download-speed" ng-bind="(!task.seeder || task.downloadSpeed > 0 ? (task.downloadSpeed | readableVolumn) + '/s' : '-')"></span>
                 </div>
             </div>
         </div>
diff --git a/src/views/task-detail.html b/src/views/task-detail.html
index 0874cf0..8120e8e 100644
--- a/src/views/task-detail.html
+++ b/src/views/task-detail.html
@@ -140,12 +140,10 @@
             <div class="tab-pane" ng-class="{'active': context.currentTab == 'blocks'}">
                 <div class="piece-legends">
                     <div class="piece-legend">
-                        <div class="piece piece-completed"></div>
-                        <span translate>Completed</span>
+                        <div class="piece piece-completed"></div><span translate>Completed</span>
                     </div>
                     <div class="piece-legend">
-                        <div class="piece"></div>
-                        <span translate>Uncompleted</span>
+                        <div class="piece"></div><span translate>Uncompleted</span>
                     </div>
                 </div>
                 <ng-piece-map bit-field="task.bitfield" piece-count="task.numPieces"></ng-piece-map>
@@ -258,8 +256,7 @@
                     <div class="task-table-body">
                         <div class="row" ng-repeat="peer in context.btPeers | peerOrderBy: getPeerListOrderType()">
                             <div class="col-sm-3">
-                                <span ng-bind="peer.name | translate"></span>
-                                <i class="icon-seeder fa fa-magnet" title="{{'Seeding' | translate}}" ng-if="peer && (peer.seeder === true || peer.seeder === 'true')"></i>
+                                <span ng-bind="peer.name | translate"></span><i class="icon-seeder fa fa-angle-double-up" title="{{'Seeding' | translate}}" ng-if="peer && peer.seeder"></i>
                             </div>
                             <div class="col-sm-3">
                                 <div class="piece-bar-wrapper">