diff options
Diffstat (limited to 'modules-available/statistics/templates')
10 files changed, 80 insertions, 33 deletions
diff --git a/modules-available/statistics/templates/clientlist.html b/modules-available/statistics/templates/clientlist.html index d06eb4f7..18a5d10a 100644 --- a/modules-available/statistics/templates/clientlist.html +++ b/modules-available/statistics/templates/clientlist.html @@ -34,6 +34,11 @@ <span class="glyphicon glyphicon-filter"></span> </button> </td> + <td> + <button type="button" class="btn btn-default btn-xs" onclick="popupFilter('location')"> + <span class="glyphicon glyphicon-filter"></span> + </button> + </td> </tr> <tr> <th data-sort="string">{{lang_machine}}</th> @@ -43,18 +48,17 @@ <th data-sort="int" class="text-right">{{lang_gbRam}}</th> <th data-sort="int" class="text-right">{{lang_tmpGb}}</th> <th data-sort="int">{{lang_cpuModel}}</th> + <th data-sort="string">{{lang_location}}</th> </tr> </thead> <tbody> {{#rows}} <tr> <td data-sort-value="{{hostname}}" class="text-nowrap"> - {{#deleteAllowed}} - <div class="checkbox checkbox-inline"> - <input type="checkbox" name="uuid[]" value="{{machineuuid}}" class="deleteCheckboxes"> - <label></label> - </div> - {{/deleteAllowed}} + <div class="checkbox checkbox-inline"> + <input type="checkbox" name="uuid[]" value="{{machineuuid}}" class="deleteCheckboxes" {{delete_disabled}}> + <label></label> + </div> {{#hasnotes}} <span class="glyphicon glyphicon-exclamation-sign pull-right"></span> {{/hasnotes}} @@ -70,7 +74,13 @@ {{#state_STANDBY}} <span class="glyphicon glyphicon-off green" title="{{lang_machineStandby}}"></span> {{/state_STANDBY}} - <a href="?do=Statistics&uuid={{machineuuid}}"><b>{{hostname}}</b></a> + {{#link_details}} + <a href="?do=Statistics&uuid={{machineuuid}}"> + {{/link_details}} + <b>{{hostname}}</b> + {{#link_details}} + </a> + {{/link_details}} <div class="small">{{machineuuid}}</div> {{#rmmodule}} <div class="small">{{lang_runMode}}: @@ -93,6 +103,7 @@ </div>{{/nohdd}} </td> <td data-sort-value="{{realcores}}">{{lang_realCores}}: {{realcores}}<div class="small">{{cpumodel}}</div></td> + <td data-sort-value="{{locationname}}">{{locationname}}</td> </tr> {{/rows}} </tbody> diff --git a/modules-available/statistics/templates/cpumodels.html b/modules-available/statistics/templates/cpumodels.html index d684c914..d89a5b2f 100644 --- a/modules-available/statistics/templates/cpumodels.html +++ b/modules-available/statistics/templates/cpumodels.html @@ -19,11 +19,11 @@ <tr id="{{id}}" class="{{collapse}}"> <td data-sort-value="{{systemmodel}}" class="text-left text-nowrap filter-col" data-filter-col="systemmodel"> <table style="width:100%; table-layout: fixed;"><tr><td style="overflow:hidden;text-overflow: ellipsis;"> - <a class="filter-val" data-filter-val="{{systemmodel}}" href="?do=Statistics&show=stat&filters={{query}}~,~systemmodel={{urlsystemmodel}}">{{systemmodel}}</a> + <a class="filter-val" data-filter-val="{{systemmodel}}" href="?do=Statistics&show=summary&filters={{query}}~,~systemmodel={{urlsystemmodel}}">{{systemmodel}}</a> </td></tr></table> </td> <td data-sort-value="{{cores}}" class="text-right filter-col" data-filter-col="realcores"> - <a class="filter-val" data-filter-val="{{cores}}" href="?do=Statistics&show=stat&filters={{query}}~,~realcores={{cores}}">{{cores}}</a> + <a class="filter-val" data-filter-val="{{cores}}" href="?do=Statistics&show=summary&filters={{query}}~,~realcores={{cores}}">{{cores}}</a> </td> <td class="text-right">{{count}}</td> </tr> diff --git a/modules-available/statistics/templates/filterbox.html b/modules-available/statistics/templates/filterbox.html index 58b66a75..07aa7320 100644 --- a/modules-available/statistics/templates/filterbox.html +++ b/modules-available/statistics/templates/filterbox.html @@ -13,7 +13,7 @@ <select id="operatorSelect" name="operator" class="form-control col-4-xs"> </select> </div> <div class="form-group"> - <input name="argument" id="argumentInput" class="form-control col-4-xs"> </input> + <input name="argument" id="argumentInput" class="form-control col-4-xs"> <select name="argument" id="argumentSelect" class="form-control col-4-xs"> </select> </div> @@ -41,11 +41,11 @@ <div class="btn-group pull-right"> - <button class="btn btn-default {{statButtonClass}}" type="submit" name="show" value="stat"> + <button class="btn btn-default {{statButtonClass}}" type="submit" name="show" value="summary" {{perms.view.summary.disabled}}> <span class="glyphicon glyphicon-stats"></span> {{lang_showVisualization}} </button> - <button class="btn btn-default {{listButtonClass}}" type="submit" name="show" value="list"> + <button class="btn btn-default {{listButtonClass}}" type="submit" name="show" value="list" {{perms.view.list.disabled}}> <span class="glyphicon glyphicon-list"></span> {{lang_showList}} </button> @@ -101,7 +101,10 @@ var slxFilterNames = { currentuser: '{{lang_currentUser}}', subnet: '{{lang_subnet}}', runtime: '{{lang_runtimeHours}}', - hostname: '{{lang_hostname}}' + hostname: '{{lang_hostname}}', + live_swapfree: '{{lang_swapFree}}', + live_memfree: '{{lang_memFree}}', + live_tmpfree: '{{lang_tmpFree}}' }; slxLocations = {{{locations}}}; @@ -169,16 +172,16 @@ document.addEventListener("DOMContentLoaded", function () { })); }); /* also set the type of the input */ - if (columns[col]['type'] == 'date') { + if (columns[col]['type'] === 'date') { $('#argumentInput').datepicker({format : 'yyyy-mm-dd'}); $('#argumentSelect').hide(); - } else if(columns[col]['type'] == 'enum') { + } else if(columns[col]['type'] === 'enum') { $('#argumentSelect').empty(); $('#argumentInput').hide(); $('#argumentSelect').show(); columns[col]['values'].forEach(function (v) { var t = v; - var disabled = true; + var disabled = (col === 'location'); if (col === 'location' && slxLocations['L' + v]) { t = slxLocations['L' + v].pad + ' ' + slxLocations['L' + v].name; disabled = slxLocations['L' + v].disabled; diff --git a/modules-available/statistics/templates/id44.html b/modules-available/statistics/templates/id44.html index d3b1ab1c..de1c71ad 100644 --- a/modules-available/statistics/templates/id44.html +++ b/modules-available/statistics/templates/id44.html @@ -17,7 +17,7 @@ {{#rows}} <tr id="tmpid{{gb}}" class="{{class}} {{collapse}}"> <td data-sort-value="{{gb}}" class="text-left text-nowrap"> - <a class="filter-val" data-filter-val="{{gb}}" href="?do=Statistics&show=stat&filters={{query}}~,~hddgb={{gb}}">{{gb}} GiB</a> + <a class="filter-val" data-filter-val="{{gb}}" href="?do=Statistics&show=summary&filters={{query}}~,~hddgb={{gb}}">{{gb}} GiB</a> </td> <td class="text-right">{{count}}</td> </tr> diff --git a/modules-available/statistics/templates/kvmstate.html b/modules-available/statistics/templates/kvmstate.html index 3704eda0..efa3bad3 100644 --- a/modules-available/statistics/templates/kvmstate.html +++ b/modules-available/statistics/templates/kvmstate.html @@ -17,7 +17,7 @@ {{#rows}} <tr id="kvm{{kvmstate}}"> <td data-sort-value="{{kvmstate}}" class="text-left text-nowrap"> - <a class="filter-val" data-filter-val="{{kvmstate}}" href="?do=Statistics&show=stat&filters={{query}}~,~kvmstate={{kvmstate}}">{{kvmstate}}</a> + <a class="filter-val" data-filter-val="{{kvmstate}}" href="?do=Statistics&show=summary&filters={{query}}~,~kvmstate={{kvmstate}}">{{kvmstate}}</a> </td> <td class="text-right">{{count}}</td> </tr> diff --git a/modules-available/statistics/templates/machine-hdds.html b/modules-available/statistics/templates/machine-hdds.html index fd6cf1be..b839dfca 100644 --- a/modules-available/statistics/templates/machine-hdds.html +++ b/modules-available/statistics/templates/machine-hdds.html @@ -20,7 +20,7 @@ <div>{{lang_powerOnTime}}: {{s_PowerOnHours}} {{lang_hours}} ({{PowerOnTime}})</div> {{/s_PowerOnHours}} <div class="row"> - <div class="col-sm-6"> + <div class="col-sm-7"> <table class="table table-condensed table-striped table-responsive"> <tr> <th>{{lang_partName}}</th> @@ -30,14 +30,14 @@ {{#partitions}} <tr id="{{id}}"> <td>{{name}}</td> - <td class="text-right">{{size}} GiB</td> + <td class="text-right text-nowrap">{{size}} GiB</td> <td>{{type}}</td> </tr> {{/partitions}} </table> <div class="slx-bold">{{lang_total}}: {{size}} GiB</div> </div> - <div class="col-sm-6"> + <div class="col-sm-5"> <canvas id="{{devid}}-chart" style="width:100%;height:250px"></canvas> <script type="text/javascript"> document.addEventListener("DOMContentLoaded", function() { diff --git a/modules-available/statistics/templates/machine-main.html b/modules-available/statistics/templates/machine-main.html index d8f2c521..44f03a99 100644 --- a/modules-available/statistics/templates/machine-main.html +++ b/modules-available/statistics/templates/machine-main.html @@ -117,9 +117,23 @@ <tr class="{{ramclass}}"> <td class="text-nowrap">{{lang_ram}}</td> <td> - {{gbram}} GiB - {{#maxram}}({{lang_maximumAbbrev}} {{maxram}}){{/maxram}} - {{ramtype}} + <div> + {{gbram}} GiB + {{#maxram}}({{lang_maximumAbbrev}} {{maxram}}){{/maxram}} + {{ramtype}} + </div> + {{#live_memsize}} + <div class="meter"> + <div class="text">{{live_memfree_s}} {{lang_free}}</div> + <div class="bar" style="width:{{live_mempercent}}%"></div> + </div> + {{/live_memsize}} + {{#live_swapsize}} + <div class="meter"> + <div class="text">{{live_swapfree_s}} {{lang_free}}</div> + <div class="bar" style="width:{{live_swappercent}}%"></div> + </div> + {{/live_swapsize}} </td> </tr> {{#extram}} @@ -135,7 +149,17 @@ {{/extram}} <tr class="{{hddclass}}"> <td class="text-nowrap">{{lang_tempPart}}</td> - <td>{{gbtmp}} GiB</td> + <td> + <div> + {{gbtmp}} GiB + </div> + {{#live_tmpsize}} + <div class="meter"> + <div class="text">{{live_tmpfree_s}} {{lang_free}}</div> + <div class="bar" style="width:{{live_tmppercent}}%"></div> + </div> + {{/live_tmpsize}} + </td> </tr> <tr class="{{kvmclass}}"> <td class="text-nowrap">{{lang_64bitSupport}}</td> @@ -157,13 +181,19 @@ {{#hwname}} <div class="pull-right btn-group btn-group-xs"> {{#projector}} - <a href="?do=statistics&show=projectors" class="btn btn-default">{{lang_projector}}</a> + <a href="?do=statistics&show=projectors" class="btn btn-default {{perms.hardware.projectors.view.disabled}}"> + {{lang_projector}} + </a> <button form="delprojector" type="submit" name="hwid" value="{{hwid}}" - class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span></button> + class="btn btn-danger" {{perms.hardware.projectors.edit.disabled}}> + <span class="glyphicon glyphicon-remove"></span> + </button> {{/projector}} {{^projector}} <button form="addprojector" type="submit" name="hwid" value="{{hwid}}" - class="btn btn-success"><span class="glyphicon glyphicon-plus"></span> {{lang_projector}}</button> + class="btn btn-success" {{perms.hardware.projectors.edit.disabled}}> + <span class="glyphicon glyphicon-plus"></span> {{lang_projector}} + </button> {{/projector}} </div> {{/hwname}} diff --git a/modules-available/statistics/templates/machine-notes.html b/modules-available/statistics/templates/machine-notes.html index 66e44da4..c352580f 100644 --- a/modules-available/statistics/templates/machine-notes.html +++ b/modules-available/statistics/templates/machine-notes.html @@ -8,9 +8,12 @@ <input type="hidden" name="token" value="{{token}}"> <input type="hidden" name="action" value="setnotes"> <input type="hidden" name="uuid" value="{{machineuuid}}"> - <textarea name="content" class="form-control" cols="101" rows="10" {{^notesAllowed}}disabled{{/notesAllowed}}>{{notes}}</textarea> + <textarea name="content" class="form-control" cols="101" rows="10" {{perms.machine.note.edit.disabled}}>{{notes}}</textarea> <br/> - <button type="submit" class="btn btn-primary pull-right" {{^notesAllowed}}disabled{{/notesAllowed}}><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}</button> + <button type="submit" class="btn btn-primary pull-right" {{perms.machine.note.edit.disabled}}> + <span class="glyphicon glyphicon-floppy-disk"></span> + {{lang_save}} + </button> </form> </div> </div> diff --git a/modules-available/statistics/templates/memory.html b/modules-available/statistics/templates/memory.html index 6bc13980..cfb86062 100644 --- a/modules-available/statistics/templates/memory.html +++ b/modules-available/statistics/templates/memory.html @@ -17,7 +17,7 @@ {{#rows}} <tr id="ramid{{gb}}" class="{{class}} {{collapse}}"> <td class="text-left text-nowrap" data-sort-value="{{gb}}"> - <a class="filter-val" data-filter-val="{{gb}}" href="?do=Statistics&show=stat&filters={{query}}~,~gbram={{gb}}">{{gb}} GiB</a> + <a class="filter-val" data-filter-val="{{gb}}" href="?do=Statistics&show=summary&filters={{query}}~,~gbram={{gb}}">{{gb}} GiB</a> </td> <td class="text-right">{{count}}</td> </tr> diff --git a/modules-available/statistics/templates/summary.html b/modules-available/statistics/templates/summary.html index fe9559ed..3ede7bc5 100644 --- a/modules-available/statistics/templates/summary.html +++ b/modules-available/statistics/templates/summary.html @@ -8,8 +8,8 @@ {{/runmode}} <div> {{lang_knownMachines}}: <b>{{known}}</b>  - <a href="?do=Statistics&show=stat&filters={{query}}~,~state=on">{{lang_onlineMachines}}</a>: <b>{{online}}</b>  - <a href="?do=Statistics&show=stat&filters={{query}}~,~state=occupied">{{lang_inUseMachines}}</a>: <b>{{used}}</b> (<b>{{usedpercent}}%</b>) + <a href="?do=Statistics&show=summary&filters={{query}}~,~state=on">{{lang_onlineMachines}}</a>: <b>{{online}}</b>  + <a href="?do=Statistics&show=summary&filters={{query}}~,~state=occupied">{{lang_inUseMachines}}</a>: <b>{{used}}</b> (<b>{{usedpercent}}%</b>) </div> {{#badhdd}} <div> |