diff options
author | root | 2019-02-19 18:53:50 +0100 |
---|---|---|
committer | root | 2019-02-19 18:53:50 +0100 |
commit | 0ad4c0f8196b61699754762aacbaab0223478ab9 (patch) | |
tree | de434c4aea8d07ecd01cd3badd48d057d62c2d1b /modules-available/statistics/templates/clientlist.html | |
parent | [usb-lock-off] Edit rule cleanup and fix of the dropdown boxes. (diff) | |
parent | [statistics] Fix RAM change warning to handle increase too (diff) | |
download | slx-admin-usb-lock-off.tar.gz slx-admin-usb-lock-off.tar.xz slx-admin-usb-lock-off.zip |
Merge branch 'master' into usb-lock-offusb-lock-off
Diffstat (limited to 'modules-available/statistics/templates/clientlist.html')
-rw-r--r-- | modules-available/statistics/templates/clientlist.html | 25 |
1 files changed, 18 insertions, 7 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> |