diff options
Diffstat (limited to 'modules-available/dnbd3/templates')
8 files changed, 169 insertions, 78 deletions
diff --git a/modules-available/dnbd3/templates/page-proxy-altservers.html b/modules-available/dnbd3/templates/page-proxy-altservers.html index 00a884cc..d2e520f9 100644 --- a/modules-available/dnbd3/templates/page-proxy-altservers.html +++ b/modules-available/dnbd3/templates/page-proxy-altservers.html @@ -1,11 +1,11 @@ -<div class="col-md-6"> +<div role="tabpanel" class="tab-pane" id="tab-altservers"> <h2>{{lang_altservers}}</h2> <table class="table table-condensed"> <tr> - <th>{{lang_proxyServerTHead}}</th> - <th>{{lang_numFails}}</th> - <th class="text-right">{{lang_latency}}</th> - <th>{{lang_flags}}</th> + <th class="slx-smallcol">{{lang_proxyServerTHead}}</th> + <th class="slx-smallcol">{{lang_numFails}}</th> + <th class="text-right slx-smallcol">{{lang_latency}}</th> + <th class="slx-smallcol">{{lang_flags}}</th> <th>{{lang_comment}}</th> </tr> {{#altservers}} @@ -21,7 +21,7 @@ {{rtt}} ms {{/isClientOnly}} </td> - <td> + <td class="text-nowrap"> {{#isClientOnly}} [CO] {{/isClientOnly}} diff --git a/modules-available/dnbd3/templates/page-proxy-clients.html b/modules-available/dnbd3/templates/page-proxy-clients.html index 9e7cec4c..6733a056 100644 --- a/modules-available/dnbd3/templates/page-proxy-clients.html +++ b/modules-available/dnbd3/templates/page-proxy-clients.html @@ -1,20 +1,53 @@ -<div class="col-md-6"> - <h2>{{lang_clientList}}</h2> +<div role="tabpanel" class="tab-pane active" id="tab-clients"> + <div class="row"> + <div class="col-md-6"> + {{#loclist.0}} + <h2>{{lang_clientsByLocation}}</h2> - <table class="table table-condensed"> - <tr> - <th>{{lang_client}}</th> - <th class="text-right">{{lang_bytesSent}}</th> - </tr> - {{#clients}} - <tr> - <td> - {{address}} - </td> - <td data-sort="int" data-sort-value="{{bytesSent}}" class="text-right"> - {{bytesSent_s}} - </td> - </tr> - {{/clients}} - </table> + <table class="table table-condensed"> + <tr> + <th>{{lang_location}}</th> + <th class="text-right">{{lang_count}}</th> + <th class="text-right">{{lang_recursiveCount}}</th> + </tr> + {{#loclist}} + <tr> + <td> + {{#depth}} + <div style="display:inline-block;width:{{depth}}em"></div> + {{/depth}} + {{locationname}} + </td> + <td class="text-right"> + {{clientCount}} + </td> + <td class="text-right"> + {{recCount}} + </td> + </tr> + {{/loclist}} + </table> + {{/loclist.0}} + </div> + <div class="col-md-6"> + <h2>{{lang_clientList}}</h2> + + <table class="table table-condensed"> + <tr> + <th>{{lang_client}}</th> + <th class="text-right">{{lang_bytesSent}}</th> + </tr> + {{#clients}} + <tr> + <td> + {{address}} + </td> + <td data-sort="int" data-sort-value="{{bytesSent}}" class="text-right"> + {{bytesSent_s}} + </td> + </tr> + {{/clients}} + </table> + </div> + </div> </div>
\ No newline at end of file diff --git a/modules-available/dnbd3/templates/page-proxy-config.html b/modules-available/dnbd3/templates/page-proxy-config.html index adc73a57..f258e030 100644 --- a/modules-available/dnbd3/templates/page-proxy-config.html +++ b/modules-available/dnbd3/templates/page-proxy-config.html @@ -1,4 +1,18 @@ -<div class="col-md-6"> +<style> +.tt { font-family:monospace } +.tt .eq { margin:0 1ex } +.tt .usel { user-select:none } +.tt .usel::before { content: attr(data-con) } +</style> +<div role="tabpanel" class="tab-pane" id="tab-config"> <h2>{{lang_proxyConfig}}</h2> - <pre>{{config}}</pre> -</div>
\ No newline at end of file + <div class="well tt" style="font-family:monospace"> + {{#config}} + <span class="{{class1}}">{{text1}}</span>{{#text2}}<span class="eq">=</span>{{/text2}}<span class="{{class2}}">{{text2}}</span> + {{#extra}} + <span class="text-muted usel" data-con=" ; {{extra}}"></span> + {{/extra}} + <br> + {{/config}} + </div> +</div> diff --git a/modules-available/dnbd3/templates/page-proxy-header.html b/modules-available/dnbd3/templates/page-proxy-header.html index 6f3f1b7f..7f3418cc 100644 --- a/modules-available/dnbd3/templates/page-proxy-header.html +++ b/modules-available/dnbd3/templates/page-proxy-header.html @@ -1 +1,2 @@ -<h1>{{ip}}</h1>
\ No newline at end of file +<h1>{{ip}}</h1> + diff --git a/modules-available/dnbd3/templates/page-proxy-images.html b/modules-available/dnbd3/templates/page-proxy-images.html new file mode 100644 index 00000000..7e30de20 --- /dev/null +++ b/modules-available/dnbd3/templates/page-proxy-images.html @@ -0,0 +1,31 @@ +<div role="tabpanel" class="tab-pane" id="tab-images"> + <h2>{{lang_imageList}}</h2> + <table class="table table-condensed"> + <tr> + <th>{{lang_image}}</th> + <th class="text-right slx-smallcol">{{lang_clients}}</th> + <th class="text-right slx-smallcol">{{lang_size}}</th> + <th class="text-right slx-smallcol">{{lang_complete}}</th> + <th class="slx-smallcol">{{lang_uplink}}</th> + </tr> + {{#images}} + <tr> + <td class="text-nowrap"> + {{name}}:{{rid}} + </td> + <td class="text-right text-nowrap"> + {{users}} + </td> + <td class="text-right text-nowrap"> + {{size_s}} + </td> + <td class="text-right text-nowrap"> + {{complete}} % + </td> + <td class="text-nowrap"> + {{uplinkServer}} + </td> + </tr> + {{/images}} + </table> +</div>
\ No newline at end of file diff --git a/modules-available/dnbd3/templates/page-proxy-loclist.html b/modules-available/dnbd3/templates/page-proxy-loclist.html deleted file mode 100644 index 67c90683..00000000 --- a/modules-available/dnbd3/templates/page-proxy-loclist.html +++ /dev/null @@ -1,27 +0,0 @@ -<div class="col-md-6"> - <h2>{{lang_clientsByLocation}}</h2> - - <table class="table table-condensed"> - <tr> - <th>{{lang_location}}</th> - <th class="text-right">{{lang_count}}</th> - <th class="text-right">{{lang_recursiveCount}}</th> - </tr> - {{#list}} - <tr> - <td> - {{#depth}} - <div style="display:inline-block;width:{{depth}}em"></div> - {{/depth}} - {{locationname}} - </td> - <td class="text-right"> - {{clientCount}} - </td> - <td class="text-right"> - {{recCount}} - </td> - </tr> - {{/list}} - </table> -</div>
\ No newline at end of file diff --git a/modules-available/dnbd3/templates/page-proxy-stats.html b/modules-available/dnbd3/templates/page-proxy-stats.html index e7811028..a866903c 100644 --- a/modules-available/dnbd3/templates/page-proxy-stats.html +++ b/modules-available/dnbd3/templates/page-proxy-stats.html @@ -1,9 +1,27 @@ <div class="panel panel-default"> <div class="panel-body"> - {{lang_sessionTx}}: <b>{{bytesSent_s}}</b> - –– - {{lang_sessionRx}}: <b>{{bytesReceived_s}}</b> - –– - {{lang_uptime}}: <b>{{uptime_s}}</b> + <div> + {{lang_sessionTx}}: <b>{{bytesSent_s}}</b> + –– + {{lang_sessionRx}}: <b>{{bytesReceived_s}}</b> + –– + {{lang_uptime}}: <b>{{uptime_s}}</b> + </div> + <div> + {{lang_storageSize}}: <b>{{spaceTotal_s}}</b> + –– + {{lang_diskFree}}: <b>{{spaceFree_s}} ({{percentFree}} %)</b> + </div> </div> -</div>
\ No newline at end of file +</div> + +<ul class="nav nav-tabs text-center" role="tablist"> + {{#tab_config}} + <li role="presentation"><a href="#tab-config" role="tab" data-toggle="tab">{{lang_proxyConfig}}</a></li> + {{/tab_config}} + <li role="presentation" class="active"><a href="#tab-clients" role="tab" data-toggle="tab">{{lang_clientList}}</a></li> + <li role="presentation"><a href="#tab-images" role="tab" data-toggle="tab">{{lang_imageList}}</a></li> + {{#tab_altservers}} + <li role="presentation"><a href="#tab-altservers" role="tab" data-toggle="tab">{{lang_altservers}}</a></li> + {{/tab_altservers}} +</ul>
\ No newline at end of file diff --git a/modules-available/dnbd3/templates/page-serverlist.html b/modules-available/dnbd3/templates/page-serverlist.html index c5905dcd..65e4d6ea 100644 --- a/modules-available/dnbd3/templates/page-serverlist.html +++ b/modules-available/dnbd3/templates/page-serverlist.html @@ -15,14 +15,14 @@ <form method="post" action="?do=dnbd3"> <input type="hidden" name="token" value="{{token}}"> <div class="checkbox"> - <input id="enable-dnbd3" type="checkbox" name="enabled" {{enabled_checked_s}}> + <input id="enable-dnbd3" type="checkbox" name="enabled" {{enabled_checked_s}} {{perms.toggle-usage.disabled}}> <label for="enable-dnbd3">{{lang_enableDnbd3}}</label> </div> <div class="checkbox"> - <input id="allow-nfs" type="checkbox" name="with-nfs" {{nfs_checked_s}}> + <input id="allow-nfs" type="checkbox" name="with-nfs" {{nfs_checked_s}} {{perms.toggle-usage.disabled}}> <label for="allow-nfs">{{lang_allowNfsFallback}}</label> </div> - <button type="submit" name="action" value="toggle-usage" class="btn btn-success"> + <button type="submit" name="action" value="toggle-usage" class="btn btn-success" {{perms.toggle-usage.disabled}}> <span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}} </button> @@ -36,7 +36,10 @@ <input type="hidden" name="action" value="refresh"> <h2> {{lang_serverList}} - <button id="refbtn" type="submit" class="btn btn-default"><span class="glyphicon glyphicon-refresh"></span></button> + <button id="refbtn" type="submit" class="btn btn-default" {{perms.refresh.disabled}} title="{{lang_manualRefreshInfo}}"> + <span class="glyphicon glyphicon-refresh"></span> + {{lang_manualRefresh}} + </button> </h2> </form> @@ -78,14 +81,18 @@ </td> <td class="{{#self}}slx-bold{{/self}}"> {{#machineuuid}} - <a class="pull-right btn btn-default btn-xs" href="?do=Statistics&uuid={{machineuuid}}"> + <a class="pull-right btn btn-default btn-xs" href="?do=statistics&uuid={{machineuuid}}"> <span class="glyphicon glyphicon-eye-open"></span> </a> {{/machineuuid}} + {{^perms.view.details.disabled}} <a href="?do=dnbd3&show=proxy&server={{serverid}}"> + {{/perms.view.details.disabled}} {{fixedip}} <span class="small">{{clientip}}</span> + {{^perms.view.details.disabled}} </a> + {{/perms.view.details.disabled}} <div class="small">{{hostname}}</div> </td> <td data-sort="int" data-sort-default="desc" data-sort-value="{{disktotal}}"> @@ -123,7 +130,7 @@ {{#locations}} {{locations}} {{/locations}} - <a href="?do=dnbd3&show=locations&server={{serverid}}" class="btn btn-default btn-xs"> + <a href="?do=dnbd3&show=locations&server={{serverid}}" class="btn btn-default btn-xs {{edit_disabled}}"> <span class="glyphicon glyphicon-map-marker"></span> </a> {{/self}} @@ -132,17 +139,19 @@ {{#machineuuid}} {{#rebootcontrol}} <button class="btn btn-warning btn-xs reboot-btn" type="button" data-id="{{serverid}}" - data-toggle="modal" data-target="#server-reboot-modal" title="{{lang_reboot}}"> + data-toggle="modal" data-target="#server-reboot-modal" title="{{lang_reboot}}" + {{edit_disabled}}> <span class="glyphicon glyphicon-repeat"></span> </button> {{/rebootcontrol}} <button class="btn btn-default btn-xs edit-btn" type="button" data-id="{{serverid}}" - data-toggle="modal" data-target="#server-edit-modal" title="{{lang_settings}}"> + data-toggle="modal" data-target="#server-edit-modal" title="{{lang_settings}}" + {{edit_disabled}}> <span class="glyphicon glyphicon-cog"></span> </button> {{/machineuuid}} {{^self}} - <button class="btn btn-danger btn-xs" name="server" value="{{serverid}}" + <button class="btn btn-danger btn-xs" name="server" value="{{serverid}}" {{edit_disabled}} onclick="return confirm('{{lang_wantToDelete}}')" title="{{lang_delete}}"> <span class="glyphicon glyphicon-trash"></span> </button> @@ -156,7 +165,7 @@ <div class="btn-toolbar pull-right"> <div class="btn-group"> - <button type="button" class="btn btn-success" data-toggle="modal" data-target="#add-modal"> + <button type="button" class="btn btn-success" data-toggle="modal" data-target="#add-modal" {{perms.configure.external.disabled}}> <span class="glyphicon glyphicon-plus"></span> {{lang_externalServerAdd}} </button> @@ -165,7 +174,7 @@ </button> </div> <div class="btn-group"> - <a class="btn btn-success" href="?do=runmode&module=dnbd3&modeid=proxy&redirect=?do=dnbd3"> + <a class="btn btn-success {{perms.configure.proxy.disabled}}" href="?do=runmode&module=dnbd3&modeid=proxy&redirect=?do=dnbd3"> <span class="glyphicon glyphicon-plus"></span> {{lang_managedServerAdd}} </a> @@ -380,20 +389,32 @@ document.addEventListener('DOMContentLoaded', function () { } $t.html('<span class="glyphicon glyphicon-refresh slx-rotation"></span>'); var sid = rebootServerId; + var taskId = false; + var lastText; var query = function() { + data = {"token": TOKEN, "action": "reboot", "server": sid}; + if (taskId !== false) data['taskid'] = taskId; $.ajax({ - "data": {"token": TOKEN, "action": "reboot", "server": sid}, + "data": data, "method": "POST", - "dataType": "text", + "dataType": "json", "url": "?do=dnbd3" }).done(function (data) { - $t.text(data); - if (data.indexOf('REBOOTING') !== -1 || data.indexOf('CONNECTING') !== -1) { + if (!data || !data.taskId) return; + if (taskId === false) taskId = data.taskId; + if (data.error) data.rebootStatus += ' (' + data.error + ')'; + if (data.rebootStatus !== lastText) { + $t.empty().text(data.rebootStatus); + } + if (data.taskStatus === 'TASK_PROCESSING' || data.taskStatus === 'TASK_WAITING') { setTimeout(query, 5000); - $t.append($('<span class="glyphicon glyphicon-refresh slx-rotation"></span>')); + if (data.rebootStatus !== lastText) { + $t.append($('<span class="glyphicon glyphicon-refresh slx-rotation"></span>')); + } } + lastText = data.rebootStatus; }).fail(function () { - $.text('Failed'); + $t.text('Failed'); }); }; query(); |