simon/AriaNg
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

modify style

Browse source
This commit is contained in:
MaysWind 2016-07-16 22:33:49 +08:00
parent 4f17b86659
commit 5429f160a2
5 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/langs/zh_CN.json
View file

@ -86,7 +86,6 @@
"Status": "状态", "Status": "状态",
"Speed": "速度", "Speed": "速度",
"(local)": "(本机)", "(local)": "(本机)",
"Unknown Client": "未知客户端",
"No Data": "无数据", "No Data": "无数据",
"No connected peers": "没有连接到其他节点", "No connected peers": "没有连接到其他节点",
"Failed to change some tasks state.": "修改一些任务状态时失败.", "Failed to change some tasks state.": "修改一些任务状态时失败.",

1
src/scripts/config/defaultLanguage.js
View file

@ -90,7 +90,6 @@
'Status': 'Status', 'Status': 'Status',
'Speed': 'Speed', 'Speed': 'Speed',
'(local)': '(local)', '(local)': '(local)',
'Unknown Client': 'Unknown Client',
'No Data': 'No Data', 'No Data': 'No Data',
'No connected peers': 'No connected peers', 'No connected peers': 'No connected peers',
'Failed to change some tasks state.': 'Failed to change some tasks state.', 'Failed to change some tasks state.': 'Failed to change some tasks state.',

16
src/scripts/services/aria2TaskService.js
View file

@ -150,7 +150,7 @@
task.selectedFileCount = selectedFileCount; task.selectedFileCount = selectedFileCount;
} }
return task; return task;
}; };
@ -182,13 +182,17 @@
if (peer.peerId) { if (peer.peerId) {
var peerId = ariaNgCommonService.decodePercentEncodedString(peer.peerId); var peerId = ariaNgCommonService.decodePercentEncodedString(peer.peerId);
var client = (peerId ? bittorrentPeeridService.parseClient(peerId) : null); var clientInfo = (peerId ? bittorrentPeeridService.parseClient(peerId) : null);
if (client && client.client != 'unknown') { if (clientInfo && clientInfo.client != 'unknown') {
peer.client = { var client = {
name: (client.client ? client.client.trim() : ''), name: (clientInfo.client ? clientInfo.client.trim() : ''),
version: (client.version ? client.version.trim() : '') version: (clientInfo.version ? clientInfo.version.trim() : '')
}; };
client.info = client.name + (client.version ? ' ' + client.version : '');
peer.client = client;
} }
} }
} }

4
src/views/list.html
View file

@ -38,8 +38,8 @@
<div class="checkbox checkbox-primary" ng-class="{'checkbox-hide': !taskContext.selected[task.gid]}"> <div class="checkbox checkbox-primary" ng-class="{'checkbox-hide': !taskContext.selected[task.gid]}">
<input id="{{'task_' + task.gid}}" type="checkbox" ng-model="taskContext.selected[task.gid]"/> <input id="{{'task_' + task.gid}}" type="checkbox" ng-model="taskContext.selected[task.gid]"/>
<label for="{{'task_' + task.gid}}"> <label for="{{'task_' + task.gid}}">
<span class="task-name" ng-bind="task.taskName" ng-tooltip="{{task.taskName}}" ng-tooltip-container="body"></span> <span class="task-name" ng-bind="task.taskName" title="{{task.taskName}}"></span>
</label><i class="icon-seeder fa fa-angle-double-up" ng-if="task && task.status == 'active' && task.seeder" ng-tooltip="{{'Seeding' | translate}}" ng-tooltip-container="body"></i> </label><i class="icon-seeder fa fa-angle-double-up" ng-if="task && task.status == 'active' && task.seeder" title="{{'Seeding' | translate}}"></i>
</div> </div>
<div class="task-files"> <div class="task-files">
<span ng-bind="task.totalLength | readableVolumn"></span> <span ng-bind="task.totalLength | readableVolumn"></span>

11
src/views/task-detail.html
View file

@ -135,7 +135,7 @@
<i class="icon-expand pointer-cursor fa" ng-if="task.bittorrent.announceList.length > 1" <i class="icon-expand pointer-cursor fa" ng-if="task.bittorrent.announceList.length > 1"
ng-class="{'fa-plus': context.collapseTrackers, 'fa-minus': !context.collapseTrackers}" ng-class="{'fa-plus': context.collapseTrackers, 'fa-minus': !context.collapseTrackers}"
ng-click="context.collapseTrackers = !context.collapseTrackers" ng-click="context.collapseTrackers = !context.collapseTrackers"
ng-tooltip="{{(context.collapseTrackers ? 'Expand' : 'Collapse') | translate}}"></i> title="{{(context.collapseTrackers ? 'Expand' : 'Collapse') | translate}}"></i>
</div> </div>
<div class="setting-value col-sm-8"> <div class="setting-value col-sm-8">
<div ng-bind="serverAddress" ng-repeat="serverAddress in task.bittorrent.announceList | limitTo: (context.collapseTrackers ? 1 : task.bittorrent.announceList.length)"></div> <div ng-bind="serverAddress" ng-repeat="serverAddress in task.bittorrent.announceList | limitTo: (context.collapseTrackers ? 1 : task.bittorrent.announceList.length)"></div>
@ -152,10 +152,10 @@
</div> </div>
<div class="tab-pane" ng-class="{'active': context.currentTab == 'blocks'}"> <div class="tab-pane" ng-class="{'active': context.currentTab == 'blocks'}">
<div class="piece-legends"> <div class="piece-legends">
<div class="piece-legend" ng-tooltip="{{('format.task.pieceinfo' | translate: {completed: task.completedPieces, total: task.numPieces})}}" ng-tooltip-container="body"> <div class="piece-legend" title="{{('format.task.pieceinfo' | translate: {completed: task.completedPieces, total: task.numPieces})}}">
<div class="piece piece-completed"></div><span translate>Completed</span> <div class="piece piece-completed"></div><span translate>Completed</span>
</div> </div>
<div class="piece-legend" ng-tooltip="{{('format.task.pieceinfo' | translate: {completed: task.completedPieces, total: task.numPieces})}}" ng-tooltip-container="body"> <div class="piece-legend" title="{{('format.task.pieceinfo' | translate: {completed: task.completedPieces, total: task.numPieces})}}">
<div class="piece"></div><span translate>Uncompleted</span> <div class="piece"></div><span translate>Uncompleted</span>
</div> </div>
</div> </div>
@ -221,7 +221,7 @@
<div class="checkbox checkbox-primary"> <div class="checkbox checkbox-primary">
<input id="{{'file_' + file.index}}" type="checkbox" ng-disabled="!task || !task.files || task.files.length < 2 || (task.status != 'waiting' && task.status != 'paused')" <input id="{{'file_' + file.index}}" type="checkbox" ng-disabled="!task || !task.files || task.files.length < 2 || (task.status != 'waiting' && task.status != 'paused')"
ng-model="file.selected" ng-change="setSelectedFile()"/> ng-model="file.selected" ng-change="setSelectedFile()"/>
<label for="{{'file_' + file.index}}" ng-bind="file.fileName" ng-tooltip="{{file.fileName}}" ng-tooltip-container="body"></label> <label for="{{'file_' + file.index}}" ng-bind="file.fileName" title="{{file.fileName}}"></label>
</div> </div>
</div> </div>
<div class="col-sm-2"> <div class="col-sm-2">
@ -276,8 +276,7 @@
<div class="task-table-body"> <div class="task-table-body">
<div class="row" ng-repeat="peer in context.btPeers | peerOrderBy: getPeerListOrderType()"> <div class="row" ng-repeat="peer in context.btPeers | peerOrderBy: getPeerListOrderType()">
<div class="col-md-4 col-sm-4 col-xs-12"> <div class="col-md-4 col-sm-4 col-xs-12">
<div class="peer-name-wrapper" ng-tooltip-if="{{!!peer.client}}" ng-tooltip-container="body" <div class="peer-name-wrapper" title="{{(peer.client ? peer.client.info : '') + (peer.seeder ? (peer.client.info ? ', ' : '') + ('Seeding' | translate) : '')}}">
ng-tooltip="{{(peer.client ? (peer.client.name + (peer.client.version ? ' ' + peer.client.version : '')) : ('Unknown Client' | translate)) + (peer.seeder ? ', ' + ('Seeding' | translate) : '')}}">
<span ng-bind="peer.name | translate"></span><i class="icon-seeder fa fa-angle-double-up" ng-if="peer && peer.seeder"></i> <span ng-bind="peer.name | translate"></span><i class="icon-seeder fa fa-angle-double-up" ng-if="peer && peer.seeder"></i>
<span class="peer-client" ng-if="!!peer.client" <span class="peer-client" ng-if="!!peer.client"
ng-bind="peer.client ? ('(' + peer.client.name + (peer.client.version ? ' ' + peer.client.version : '') + ')') : ''"></span> ng-bind="peer.client ? ('(' + peer.client.name + (peer.client.version ? ' ' + peer.client.version : '') + ')') : ''"></span>