diff options
| author | Simon Rettberg | 2016-09-13 19:42:09 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-09-13 19:42:09 +0200 |
| commit | 1ee0014fcf0ec56af6af5937258d065ba3ee1cc9 (patch) | |
| tree | 5d88384df0b3a425943f2db14370484274ee1092 /modules-available/locations/templates | |
| parent | [statistics/locations] Fix query for getting machines for a location (diff) | |
| download | slx-admin-1ee0014fcf0ec56af6af5937258d065ba3ee1cc9.tar.gz slx-admin-1ee0014fcf0ec56af6af5937258d065ba3ee1cc9.tar.xz slx-admin-1ee0014fcf0ec56af6af5937258d065ba3ee1cc9.zip | |
[locations] Show percent of occupied machines per location
Diffstat (limited to 'modules-available/locations/templates')
| -rw-r--r-- | modules-available/locations/templates/locations.html | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/modules-available/locations/templates/locations.html b/modules-available/locations/templates/locations.html index 99fb59fd..9dcc6db1 100644 --- a/modules-available/locations/templates/locations.html +++ b/modules-available/locations/templates/locations.html @@ -3,12 +3,15 @@ <a href="?do=Locations&action=showsubnets">{{lang_thisListBySubnet}}</a> </div> <h1>{{lang_locationsMainHeading}}</h1> - <table class="table table-condensed" style="margin-bottom:0px"> + <table class="table table-condensed locations" style="margin-bottom:0px"> <tr> <th width="100%">{{lang_locationName}}</th> <th> {{#havestatistics}}{{lang_machineCount}}{{/havestatistics}} </th> + <th> + {{#havestatistics}}{{lang_machineLoad}}{{/havestatistics}} + </th> <th class="text-nowrap"> {{#havebaseconfig}}{{lang_editConfigVariables}}{{/havebaseconfig}} </th> @@ -32,6 +35,11 @@ <a class="btn btn-default btn-xs" href="?do=Statistics&show=list&filters=location={{locationid}}"><span class="glyphicon glyphicon-eye-open"></span></a> {{/havestatistics}} </td> + <td class="text-nowrap" align="right"> + {{#havestatistics}} + {{clientLoad}} + {{/havestatistics}} + </td> <td class="text-nowrap"> {{#havebaseconfig}} <div class="pull-right" style="z-index:-1"> @@ -63,6 +71,9 @@ <span class="glyphicon glyphicon-eye-open"></span> </a> </td> + <td class="text-nowrap" align="right"> + {{clientLoad}} + </td> <td></td> <td>{{defaultConfig}}</td> </tr> @@ -129,7 +140,7 @@ function slxOpenLocation(e, lid) { } return; } - var td = $('<td>').attr('colspan', '4').css('padding', '0px 0px 12px'); + var td = $('<td>').attr('colspan', '5').css('padding', '0px 0px 12px'); var tr = $('<tr>').attr('id', 'location-details-' + lid); tr.append(td); $(e).closest('tr').addClass('active slx-bold').after(tr); |