diff --git a/css/download.css b/css/download.css index 049040b..785c90f 100644 --- a/css/download.css +++ b/css/download.css @@ -19,12 +19,15 @@ } .download-graph { - width: 80%; + width: 30%; margin-top: 5px; margin-bottom: 5px; margin-left: auto; margin-right: auto; } +.large-graph { + width: 80%; +} .stats { margin-top: 0px; margin-bottom: 0px; diff --git a/index.html b/index.html index 6cd3c05..59eda5e 100755 --- a/index.html +++ b/index.html @@ -170,6 +170,18 @@ ng-click="changeGSettings()" href="#"> Global Settings + +
  • + Server info +
  • + +
  • + About and contribute +
  • @@ -225,12 +237,26 @@ -
    -

    Currently no downloads in line to display, use the Add download button to start downloading files!

    + +
    + Currently no download in line to display, use the 'Add' download button to start downloading files!
    + +

    Global Statistics

    + +
    +
    + + + +

    Download List

    @@ -543,36 +569,7 @@
    - -

    Global Statistics

    -
    -
    - - - - -

    Miscellaneous

    - Aria2 Version {{miscellaneous.version}} -

    - Features Enabled - -
    -

    - To download the latest version of the project, add issues or to contribute back head on to - http://github.com/ziahamza/webui-aria2 -
    - Or you can open the latest version in browser through http://ziahamza.github.io/webui-aria2 -

    - @@ -779,8 +776,57 @@ http://ex1.com/f2.mp4 http://ex2.com/f2.mp4 + + + + + + + + +




    + diff --git a/js/ctrls/modal.js b/js/ctrls/modal.js index 41349c7..dff3b1a 100644 --- a/js/ctrls/modal.js +++ b/js/ctrls/modal.js @@ -143,9 +143,26 @@ angular }; }); + _.each(['server_info', 'about'], function(name) { + scope[name] = { + shown: false, + init: function(cb) { + this.shown = this.open = true; + }, + + close: function() { + this.shown = this.open = false; + } + }; + }); + + rpc.once('getVersion', [], function(data) { + scope.miscellaneous = data[0]; + }); + _.each([ 'getUris', 'getTorrents', 'getMetalinks', - 'settings', 'connection' + 'settings', 'connection', 'server_info', 'about' ], function(name) { modals.register(name, function(cb) { if (scope[name].open) { diff --git a/js/ctrls/nav.js b/js/ctrls/nav.js index bfd52a0..551b8ae 100644 --- a/js/ctrls/nav.js +++ b/js/ctrls/nav.js @@ -118,4 +118,17 @@ angular }); }); }; + + scope.showServerInfo = function() { + modals.invoke( + 'server_info' + ); + }; + + scope.showAbout = function() { + modals.invoke( + 'about' + ); + } + }]); diff --git a/js/directives/dgraph.js b/js/directives/dgraph.js index 183f805..61bc4a0 100644 --- a/js/directives/dgraph.js +++ b/js/directives/dgraph.js @@ -1,5 +1,5 @@ // graph takes dspeed and uspeed, it queries them every second and draws -// the last 20 secs, it also takes draw as an optional attribute and only +// the last 180 secs, it also takes draw as an optional attribute and only // draws the graph when it is true, if not given then graph is always drawn angular .module('webui.directives.dgraph', ['webui.filters.bytes', 'webui.services.deps']) @@ -7,7 +7,7 @@ angular return function(scope, elem, attrs) { var canDraw = true; - var graphSize = 20 + var graphSize = 180 , dspeed = 0, uspeed = 0 , dconf = { label: "Download Speed",