diff options
author | Simon Rettberg | 2019-02-15 15:55:10 +0100 |
---|---|---|
committer | Simon Rettberg | 2019-02-15 15:55:10 +0100 |
commit | bc9aa8105db4742255265a35594fafc93269d59d (patch) | |
tree | 338dd9588519ed2b996c675a920160258c8762ba /modules-available/locations/templates/locations.html | |
parent | [dozmod] Add UI to create preset network rules (diff) | |
parent | [serversetup-bwlp-ipxe] ipxe script: Don't load unused png (diff) | |
download | slx-admin-bc9aa8105db4742255265a35594fafc93269d59d.tar.gz slx-admin-bc9aa8105db4742255265a35594fafc93269d59d.tar.xz slx-admin-bc9aa8105db4742255265a35594fafc93269d59d.zip |
Merge branch 'ipxe'
Diffstat (limited to 'modules-available/locations/templates/locations.html')
-rw-r--r-- | modules-available/locations/templates/locations.html | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/modules-available/locations/templates/locations.html b/modules-available/locations/templates/locations.html index 67f22744..06d32020 100644 --- a/modules-available/locations/templates/locations.html +++ b/modules-available/locations/templates/locations.html @@ -37,6 +37,9 @@ <th class="text-nowrap"> {{#havesysconfig}}{{lang_sysConfig}}{{/havesysconfig}} </th> + <th class="text-nowrap"> + {{#haveipxe}}{{lang_bootMenu}}{{/haveipxe}} + </th> </tr> {{#list}} <tr> @@ -67,7 +70,7 @@ {{clientLoad}} {{/havestatistics}} </td> - <td class="text-nowrap"> + <td class="text-nowrap {{overriddenClass}}"> {{#havebaseconfig}} <div class="pull-right" style="z-index:-1"> <a class="btn btn-default btn-xs" href="?do=baseconfig&module=locations&locationid={{locationid}}"><span class="glyphicon glyphicon-edit"></span></a> @@ -87,6 +90,16 @@ </span> {{/havesysconfig}} </td> + <td class="text-nowrap"> + {{#haveipxe}} + <div class="pull-right"> + <a class="btn btn-default btn-xs" href="?do=serversetup&show=assignlocation&locationid={{locationid}}"><span class="glyphicon glyphicon-edit"></span></a> + </div> + <span class="{{customMenuClass}}"> + {{customMenu}}   + </span> + {{/haveipxe}} + </td> </tr> {{/list}} {{#unassignedCount}} @@ -170,7 +183,7 @@ function slxOpenLocation(e, lid) { } return; } - var td = $('<td>').attr('colspan', '5').css('padding', '0px 0px 12px'); + var td = $('<td>').attr('colspan', '6').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); |