support display tracker servers in task detail page

This commit is contained in:
MaysWind 2016-07-10 20:42:21 +08:00
parent b23e7afc15
commit b103e121b0
6 changed files with 36 additions and 3 deletions

View file

@ -17,6 +17,8 @@
"Display Order": "显示顺序", "Display Order": "显示顺序",
"Search": "搜索", "Search": "搜索",
"Default": "默认", "Default": "默认",
"Expand": "展开",
"Collapse": "折叠",
"Remove Task": "删除任务", "Remove Task": "删除任务",
"Clear Stopped Tasks": "清空已结束任务", "Clear Stopped Tasks": "清空已结束任务",
"By File Name": "按文件名", "By File Name": "按文件名",
@ -71,6 +73,7 @@
"Connections": "连接数", "Connections": "连接数",
"Seed Creation Time": "种子创建时间", "Seed Creation Time": "种子创建时间",
"Download Dir": "下载路径", "Download Dir": "下载路径",
"BT Tracker Servers": "BT 服务器",
"(Choose Files)": "(选择文件)", "(Choose Files)": "(选择文件)",
"Videos": "视频", "Videos": "视频",
"Audios": "音频", "Audios": "音频",
@ -82,6 +85,7 @@
"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.": "修改一些任务状态时失败.",

View file

@ -21,6 +21,8 @@
'Display Order': 'Display Order', 'Display Order': 'Display Order',
'Search': 'Search', 'Search': 'Search',
'Default': 'Default', 'Default': 'Default',
'Expand': 'Expand',
'Collapse': 'Collapse',
'Remove Task': 'Remove Task', 'Remove Task': 'Remove Task',
'Clear Stopped Tasks': 'Clear Stopped Tasks', 'Clear Stopped Tasks': 'Clear Stopped Tasks',
'By File Name': 'By File Name', 'By File Name': 'By File Name',
@ -75,6 +77,7 @@
'Connections': 'Connections', 'Connections': 'Connections',
'Seed Creation Time': 'Seed Creation Time', 'Seed Creation Time': 'Seed Creation Time',
'Download Dir': 'Download Dir', 'Download Dir': 'Download Dir',
'BT Tracker Servers': 'BT Tracker Servers',
'(Choose Files)': '(Choose Files)', '(Choose Files)': '(Choose Files)',
'Videos': 'Videos', 'Videos': 'Videos',
'Audios': 'Audios', 'Audios': 'Audios',
@ -86,6 +89,7 @@
'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.',

View file

@ -130,6 +130,7 @@
showChooseFilesToolbar: false, showChooseFilesToolbar: false,
btPeers: [], btPeers: [],
healthPercent: 0, healthPercent: 0,
collapseTrackers: true,
statusData: ariaNgMonitorService.getEmptyStatsData($routeParams.gid), statusData: ariaNgMonitorService.getEmptyStatsData($routeParams.gid),
availableOptions: [], availableOptions: [],
options: [] options: []

View file

@ -22,13 +22,20 @@
color: red; color: red;
} }
.settings-table .description { .settings-table .description, .settings-table .description-inline {
color: #888; color: #888;
font-size: 12px; font-size: 12px;
font-weight: normal; font-weight: normal;
}
.settings-table .description {
display: block; display: block;
} }
.settings-table .description-inline {
display: inline-block;
}
.settings-table em { .settings-table em {
color: #888; color: #888;
font-size: 12px; font-size: 12px;

View file

@ -242,6 +242,10 @@
color: #da412c; color: #da412c;
} }
.skin-aria-ng .icon-expand {
color: #5399e8 ;
}
.skin-aria-ng .nav-tabs-custom { .skin-aria-ng .nav-tabs-custom {
-webkit-box-shadow: none; -webkit-box-shadow: none;
-moz-box-shadow: none; -moz-box-shadow: none;

View file

@ -128,6 +128,19 @@
<span ng-bind="task.dir"></span> <span ng-bind="task.dir"></span>
</div> </div>
</div> </div>
<div class="row" ng-if="task && task.bittorrent && task.bittorrent.announceList && task.bittorrent.announceList.length > 0">
<div class="setting-key col-sm-4">
<span translate>BT Tracker Servers</span>
<span class="description-inline" ng-bind="'format.settings.total-count' | translate: {count: task.bittorrent.announceList.length}"></span>
<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-click="context.collapseTrackers = !context.collapseTrackers"
ng-tooltip="{{(context.collapseTrackers ? 'Expand' : 'Collapse') | translate}}"></i>
</div>
<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>
</div>
<div class="row no-hover no-background" ng-if="task && task.status == 'active'"> <div class="row no-hover no-background" ng-if="task && task.status == 'active'">
<div class="col-sm-12"> <div class="col-sm-12">
<div class="task-status-chart-wrapper"> <div class="task-status-chart-wrapper">
@ -239,11 +252,11 @@
<div class="col-sm-3"> <div class="col-sm-3">
<span translate>Status</span> <span translate>Status</span>
</div> </div>
<div class="col-sm-2 col-xs-4"> <div class="col-sm-2">
<a ng-click="changePeerListDisplayOrder('percent:desc', true)" translate>Progress</a> <a ng-click="changePeerListDisplayOrder('percent:desc', true)" translate>Progress</a>
<i class="fa" ng-class="{'fa-sort-asc fa-order-asc': isSetPeerListDisplayOrder('percent:asc'), 'fa-sort-desc fa-order-desc': isSetPeerListDisplayOrder('percent:desc')}"></i> <i class="fa" ng-class="{'fa-sort-asc fa-order-asc': isSetPeerListDisplayOrder('percent:asc'), 'fa-sort-desc fa-order-desc': isSetPeerListDisplayOrder('percent:desc')}"></i>
</div> </div>
<div class="col-sm-4 col-xs-4"> <div class="col-sm-4">
<a ng-click="changePeerListDisplayOrder('dspeed:desc', true)" translate>Download</a> <a ng-click="changePeerListDisplayOrder('dspeed:desc', true)" translate>Download</a>
<i class="fa" ng-class="{'fa-sort-asc fa-order-asc': isSetPeerListDisplayOrder('dspeed:asc'), 'fa-sort-desc fa-order-desc': isSetPeerListDisplayOrder('dspeed:desc')}"></i> <i class="fa" ng-class="{'fa-sort-asc fa-order-asc': isSetPeerListDisplayOrder('dspeed:asc'), 'fa-sort-desc fa-order-desc': isSetPeerListDisplayOrder('dspeed:desc')}"></i>
<span>/</span> <span>/</span>