diff options
Diffstat (limited to 'modules-available/systemstatus/templates')
| -rw-r--r-- | modules-available/systemstatus/templates/_page.html | 27 | ||||
| -rw-r--r-- | modules-available/systemstatus/templates/ajax-reboot.html | 14 |
2 files changed, 25 insertions, 16 deletions
diff --git a/modules-available/systemstatus/templates/_page.html b/modules-available/systemstatus/templates/_page.html index 3d0f9dfb..f879ea7a 100644 --- a/modules-available/systemstatus/templates/_page.html +++ b/modules-available/systemstatus/templates/_page.html @@ -100,7 +100,16 @@ </button> <div class="hidden" id="confirm-reboot">{{lang_areYouSureReboot}}</div> </form> - <div id="dmsd-users"></div> + <div id="dmsd-users"> + {{lang_runningUploads}}: <span class="uploads">??</span>, + {{lang_runningDownloads}}: <span class="downloads">??</span> + <div class="alert alert-warning collapse">{{lang_dmsdUnreachable}}</div> + </div> + <div> + {{#packages}} + {{lang_updatedPackages}}: {{packages}} + {{/packages}} + </div> </div> </div> </div> @@ -123,7 +132,6 @@ $('#addresses').load('?do=SystemStatus&action=AddressList'); $('#systeminfo').load('?do=SystemStatus&action=SystemInfo'); $('#services').load('?do=SystemStatus&action=Services'); - $('#dmsd-users').load('?do=SystemStatus&action=DmsdUsers'); var slxDone = {}; $('.ajax-tab').on('shown.bs.tab', function (e) { var $this = $(this); @@ -134,5 +142,20 @@ $pane.load('?do=SystemStatus&action=' + w.substring(3)); } }); + var $dmsd = $('#dmsd-users'); + $.ajax({ + url: '?do=dozmod§ion=special&action=dmsd-status', + timeout: 3000, + dataType: 'json' + }).done(function (data) { + if (!data || data.error) { + $dmsd.find('.alert').show(); + } else { + if (data.downloads !== null) $dmsd.find('.downloads').text(data.downloads); + if (data.uploads !== null) $dmsd.find('.uploads').text(data.uploads); + } + }).fail(function () { + $dmsd.find('.alert').show(); + }); }, false); //--></script> diff --git a/modules-available/systemstatus/templates/ajax-reboot.html b/modules-available/systemstatus/templates/ajax-reboot.html deleted file mode 100644 index a1aaf1e6..00000000 --- a/modules-available/systemstatus/templates/ajax-reboot.html +++ /dev/null @@ -1,14 +0,0 @@ -<div> - {{^dmsd_error}} - {{lang_uploads}}: {{uploads}}, - {{lang_downloads}}: {{downloads}} - {{/dmsd_error}} - {{#dmsd_error}} - <div class="alert alert-warning">{{lang_dmsdUnreachable}}</div> - {{/dmsd_error}} -</div> -<div> - {{#packages}} - {{lang_updatedPackages}}: {{packages}} - {{/packages}} -</div>
\ No newline at end of file |