diff options
author | Simon Rettberg | 2017-12-01 15:03:47 +0100 |
---|---|---|
committer | Simon Rettberg | 2017-12-01 15:03:47 +0100 |
commit | 94ce1e494efae89001213147cabb9a5f420b8557 (patch) | |
tree | b6dceb1b2ed8ba45b2680d9879c9a8bba1eb6a3e /modules-available | |
parent | [backup] Add label refs, fix layout of last download time hint (diff) | |
download | slx-admin-94ce1e494efae89001213147cabb9a5f420b8557.tar.gz slx-admin-94ce1e494efae89001213147cabb9a5f420b8557.tar.xz slx-admin-94ce1e494efae89001213147cabb9a5f420b8557.zip |
[locations] Move overlap warnings to top
Diffstat (limited to 'modules-available')
-rw-r--r-- | modules-available/locations/templates/locations.html | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/modules-available/locations/templates/locations.html b/modules-available/locations/templates/locations.html index fb09a45e..02428323 100644 --- a/modules-available/locations/templates/locations.html +++ b/modules-available/locations/templates/locations.html @@ -4,6 +4,18 @@ <a href="?do=Locations&action=showsubnets" class="btn btn-default"><span class="glyphicon glyphicon-list-alt"></span> {{lang_thisListBySubnet}}</a> </div> <h1>{{lang_locationsMainHeading}}</h1> + + {{#overlapSelf}} + <div class="alert alert-warning"> + {{lang_locationSelfOverlap}}: <b>{{locationname}}</b> + </div> + {{/overlapSelf}} + {{#overlapOther}} + <div class="alert alert-danger"> + {{lang_locationOtherOverlap}}: <b>{{name1}}</b> – <b>{{name2}}</b> + </div> + {{/overlapOther}} + <table class="table table-condensed locations" style="margin-bottom:0px"> <tr> <th width="100%">{{lang_locationName}}</th> @@ -106,16 +118,7 @@ </table> </form> </div> -{{#overlapSelf}} -<div class="alert alert-warning"> - {{lang_locationSelfOverlap}}: <b>{{locationname}}</b> -</div> -{{/overlapSelf}} -{{#overlapOther}} -<div class="alert alert-danger"> - {{lang_locationOtherOverlap}}: <b>{{name1}}</b> – <b>{{name2}}</b> -</div> -{{/overlapOther}} + <script type="text/javascript"><!-- var slxAddCounter = 0; var slxLastLocation = false; |