From 94ce1e494efae89001213147cabb9a5f420b8557 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 1 Dec 2017 15:03:47 +0100
Subject: [locations] Move overlap warnings to top

---
 .../locations/templates/locations.html             | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'modules-available/locations')

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&amp;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;
-- 
cgit v1.2.3-55-g7522