From 84d4743ef00484b9e8f4518738bc2849341d8982 Mon Sep 17 00:00:00 2001 From: MaysWind Date: Sun, 22 May 2016 11:47:47 +0800 Subject: [PATCH] support display aria2 status --- app/index.html | 4 ++++ app/scripts/controllers/status.js | 13 +++++++++++++ app/scripts/core/router.js | 4 ++++ app/scripts/langs/en-US.js | 3 +++ app/scripts/langs/zh-CN.js | 3 +++ app/styles/aria-ng.css | 12 ++++++++++++ app/views/status.html | 20 ++++++++++++++++++++ 7 files changed, 59 insertions(+) create mode 100644 app/scripts/controllers/status.js create mode 100644 app/views/status.html diff --git a/app/index.html b/app/index.html index f58f890..8794a63 100644 --- a/app/index.html +++ b/app/index.html @@ -141,6 +141,9 @@ +
  • + Aria2 Status +
    • @@ -217,6 +220,7 @@ + diff --git a/app/scripts/controllers/status.js b/app/scripts/controllers/status.js new file mode 100644 index 0000000..4b4dcc0 --- /dev/null +++ b/app/scripts/controllers/status.js @@ -0,0 +1,13 @@ +(function () { + 'use strict'; + + angular.module('ariaNg').controller('Aria2StatusController', ['$scope', 'SweetAlert', 'aria2RpcService', 'ariaNgSettingService', function ($scope, SweetAlert, aria2RpcService, ariaNgSettingService) { + $scope.loadPromise = (function () { + return aria2RpcService.getVersion({ + callback: function (result) { + $scope.serverStatus = result; + } + }) + })(); + }]); +})(); diff --git a/app/scripts/core/router.js b/app/scripts/core/router.js index 385e247..10fe6ca 100644 --- a/app/scripts/core/router.js +++ b/app/scripts/core/router.js @@ -35,6 +35,10 @@ templateUrl: 'views/settings-aria2.html', controller: 'Aria2SettingsController' }) + .when('/status', { + templateUrl: 'views/status.html', + controller: 'Aria2StatusController' + }) .otherwise({ redirectTo: '/downloading' }); diff --git a/app/scripts/langs/en-US.js b/app/scripts/langs/en-US.js index cad013b..830c0c6 100644 --- a/app/scripts/langs/en-US.js +++ b/app/scripts/langs/en-US.js @@ -26,6 +26,7 @@ 'BitTorrent Settings': 'BitTorrent Settings', 'RPC Settings': 'RPC Settings', 'Advanced Settings': 'Advanced Settings', + 'Aria2 Status': 'Aria2 Status', 'File Name': 'File Name', 'File Size': 'File Size', 'Completed Percent': 'Percent', @@ -38,6 +39,8 @@ 'Aria2 RPC Protocol': 'Aria2 RPC Protocol', 'Global Stat Refresh Interval': 'Global Stat Refresh Interval', 'Download Task Refresh Interval': 'Download Task Refresh Interval', + 'Aria2 Version': 'Aria2 Version', + 'Enabled Features': 'Enabled Features', 'Toggle Navigation': 'Toggle Navigation', 'Loading': 'Loading...', 'More Than One Day': 'More than 1 day', diff --git a/app/scripts/langs/zh-CN.js b/app/scripts/langs/zh-CN.js index 444932f..1aae199 100644 --- a/app/scripts/langs/zh-CN.js +++ b/app/scripts/langs/zh-CN.js @@ -26,6 +26,7 @@ 'BitTorrent Settings': 'BitTorrent 设置', 'RPC Settings': 'RPC 设置', 'Advanced Settings': '高级设置', + 'Aria2 Status': 'Aria2 状态', 'File Name': '文件名', 'File Size': '大小', 'Completed Percent': '进度', @@ -38,6 +39,8 @@ 'Aria2 RPC Protocol': 'Aria2 RPC 协议', 'Global Stat Refresh Interval': '全局状态刷新间隔', 'Download Task Refresh Interval': '下载任务刷新间隔', + 'Aria2 Version': 'Aria2 版本', + 'Enabled Features': '已启用的功能', 'Toggle Navigation': '切换导航', 'Loading': '正在加载...', 'More Than One Day': '超过1天', diff --git a/app/styles/aria-ng.css b/app/styles/aria-ng.css index ff30515..16f743d 100644 --- a/app/styles/aria-ng.css +++ b/app/styles/aria-ng.css @@ -357,6 +357,10 @@ td { display: block; } +.settings-table .wholeline { + display: block; +} + .settings-table .tip { background-color: #fff !important; font-size: 12px; @@ -367,6 +371,14 @@ td { } @media (max-width: 767px) { + .settings-table .setting-key { + font-weight: bold; + } + + .settings-table .status-key { + font-weight: bold; + } + .settings-table .description { display: inline-block; } diff --git a/app/views/status.html b/app/views/status.html new file mode 100644 index 0000000..b29a689 --- /dev/null +++ b/app/views/status.html @@ -0,0 +1,20 @@ +
    +
    +
    +
    + Aria2 Version +
    +
    + +
    +
    +
    +
    + Enabled Features +
    +
    + +
    +
    +
    +