No reason to put a container into a container everywhere

2 files changed, 63 insertions, 67 deletions

diff --git a/templates/serversetup/ipaddress.html b/templates/serversetup/ipaddress.html
index acfbb408..e4967703 100644
--- a/templates/serversetup/ipaddress.html
+++ b/templates/serversetup/ipaddress.html
@@ -1,36 +1,34 @@
-<div class="container">
-	<div class="panel panel-default">
-		<div class="panel-heading">
-			{{lang_bootAddress}}
-		</div>
-		<div class="panel-body">
+<div class="panel panel-default">
+	<div class="panel-heading">
+		{{lang_bootAddress}}
+	</div>
+	<div class="panel-body">
+		<p>
+			{{lang_chooseIP}}
+		</p>
+		<form method="post" action="?do=ServerSetup">
+			<input type="hidden" name="action" value="ip">
+			<input type="hidden" name="token" value="{{token}}">
+			<table class="slx-table">
+				{{#ips}}
+				<tr>
+					<td>{{ip}}</td>
+					{{#default}}
+					<td>
+						<span class="btn btn-success btn-xs"><span class="glyphicon glyphicon-ok"></span> {{lang_active}}</span>
+					</td>
+					{{/default}}
+					{{^default}}
+					<td>
+						<button class="btn btn-primary btn-xs" name="ip" value="{{ip}}"><span class="glyphicon glyphicon-flag"></span> {{lang_set}}</button>
+					</td>
+					{{/default}}
+				</tr>
+				{{/ips}}
+			</table>
 			<p>
-				{{lang_chooseIP}}
+				{{lang_bootHint}}
 			</p>
-			<form method="post" action="?do=ServerSetup">
-				<input type="hidden" name="action" value="ip">
-				<input type="hidden" name="token" value="{{token}}">
-				<table class="slx-table">
-					{{#ips}}
-					<tr>
-						<td>{{ip}}</td>
-						{{#default}}
-						<td>
-							<span class="btn btn-success btn-xs"><span class="glyphicon glyphicon-ok"></span> {{lang_active}}</span>
-						</td>
-						{{/default}}
-						{{^default}}
-						<td>
-							<button class="btn btn-primary btn-xs" name="ip" value="{{ip}}"><span class="glyphicon glyphicon-flag"></span> {{lang_set}}</button>
-						</td>
-						{{/default}}
-					</tr>
-					{{/ips}}
-				</table>
-				<p>
-					{{lang_bootHint}}
-				</p>
-			</form>
-		</div>
+		</form>
 	</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/templates/serversetup/ipxe.html b/templates/serversetup/ipxe.html
index 772777d1..21f3d87b 100644
--- a/templates/serversetup/ipxe.html
+++ b/templates/serversetup/ipxe.html
@@ -1,44 +1,42 @@
-<div class="container">
-	<form method="post" action="?do=ServerSetup">
-		<input type="hidden" name="action" value="ipxe">
-		<input type="hidden" name="token" value="{{token}}">
-		<div class="panel panel-default">
-			<div class="panel-heading">
-				{{lang_bootMenu}}
-			</div>
-			<div class="panel-body">
-				<p>
-					{{lang_bootInfo}}
-				</p>
-				<br>
-
-				<div class="form-group">
-					<strong>{{lang_bootBehavior}}</strong>
-					<label class="radio"><input type="radio" name="defaultentry" value="net" {{active-net}}> bwLehrpool</label>
-					<label class="radio"><input type="radio" name="defaultentry" value="hdd" {{active-hdd}}> {{lang_localHDD}}</label>
-					<label class="radio"><input type="radio" name="defaultentry" value="custom" {{active-custom}}> &quot;my-entry&quot;</label>
-				</div>
+<form method="post" action="?do=ServerSetup">
+	<input type="hidden" name="action" value="ipxe">
+	<input type="hidden" name="token" value="{{token}}">
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			{{lang_bootMenu}}
+		</div>
+		<div class="panel-body">
+			<p>
+				{{lang_bootInfo}}
+			</p>
+			<br>
 
-				<div class="form-group">
-					<strong>{{lang_menuDisplayTime}}</strong>
-					<div class="input-group form-narrow">
-						<input type="text" class="form-control" name="timeout" value="{{timeout}}" pattern="\d+">
-						<span class="input-group-addon">{{lang_seconds}}</span>
-					</div>
-				</div>
+			<div class="form-group">
+				<strong>{{lang_bootBehavior}}</strong>
+				<label class="radio"><input type="radio" name="defaultentry" value="net" {{active-net}}> bwLehrpool</label>
+				<label class="radio"><input type="radio" name="defaultentry" value="hdd" {{active-hdd}}> {{lang_localHDD}}</label>
+				<label class="radio"><input type="radio" name="defaultentry" value="custom" {{active-custom}}> &quot;my-entry&quot;</label>
+			</div>
 
-				<div class="form-group">
-					<strong>{{lang_menuCustom}}</strong> <a class="btn btn-default btn-xs" data-toggle="modal" data-target="#help-custom"><span class="glyphicon glyphicon-question-sign"></span></a>
-					<textarea class="form-control" name="custom">{{custom}}</textarea>
+			<div class="form-group">
+				<strong>{{lang_menuDisplayTime}}</strong>
+				<div class="input-group form-narrow">
+					<input type="text" class="form-control" name="timeout" value="{{timeout}}" pattern="\d+">
+					<span class="input-group-addon">{{lang_seconds}}</span>
 				</div>
 			</div>
 
-			<div class="panel-footer">
-				<button class="btn btn-primary" name="action" value="ipxe">{{lang_bootMenuCreate}}</button>
+			<div class="form-group">
+				<strong>{{lang_menuCustom}}</strong> <a class="btn btn-default btn-xs" data-toggle="modal" data-target="#help-custom"><span class="glyphicon glyphicon-question-sign"></span></a>
+				<textarea class="form-control" name="custom">{{custom}}</textarea>
 			</div>
 		</div>
-	</form>
-</div>
+
+		<div class="panel-footer">
+			<button class="btn btn-primary" name="action" value="ipxe">{{lang_bootMenuCreate}}</button>
+		</div>
+	</div>
+</form>
 
 <div class="modal fade" id="help-custom" tabindex="-1" role="dialog">
 	<div class="modal-dialog">