[serversetup] fixed inconsistencies

6 files changed, 20 insertions, 13 deletions

diff --git a/modules-available/serversetup-bwlp/lang/de/module.json b/modules-available/serversetup-bwlp/lang/de/module.json
index eb777343..da71d558 100644
--- a/modules-available/serversetup-bwlp/lang/de/module.json
+++ b/modules-available/serversetup-bwlp/lang/de/module.json
@@ -1,4 +1,4 @@
 {
-    "module_name": "PXE\/Boot",
+    "module_name": "iPXE \/ Boot Menu",
     "page_title": "PXE- und Boot-Einstellungen"
 }
\ No newline at end of file
diff --git a/modules-available/serversetup-bwlp/lang/de/template-tags.json b/modules-available/serversetup-bwlp/lang/de/template-tags.json
index 537b7761..f80febb0 100644
--- a/modules-available/serversetup-bwlp/lang/de/template-tags.json
+++ b/modules-available/serversetup-bwlp/lang/de/template-tags.json
@@ -21,6 +21,7 @@
     "lang_menuCustomHint3": "und w\u00e4hlen Sie als Standard-Bootverhalten ebenfalls custom.",
     "lang_menuDisplayTime": "Anzeigedauer des Men\u00fcs",
     "lang_menuGeneration": "Erzeugen des Bootmen\u00fcs",
+    "lang_moduleHeading": "iPXE / Boot Menu",
     "lang_seconds": "Sekunden",
     "lang_set": "Setzen",
     "lang_usbImage": "USB-Image",
diff --git a/modules-available/serversetup-bwlp/lang/en/template-tags.json b/modules-available/serversetup-bwlp/lang/en/template-tags.json
index 533dacba..1948718b 100644
--- a/modules-available/serversetup-bwlp/lang/en/template-tags.json
+++ b/modules-available/serversetup-bwlp/lang/en/template-tags.json
@@ -8,12 +8,12 @@
     "lang_bootMenuCreate": "Create Boot Menu",
     "lang_chooseIP": "Please select the IP address that the client server will use to boot.",
     "lang_customEntry": "Custom entry",
-    "lang_downloadImage": "Download USB image",
+    "lang_downloadImage": "Download USB Image",
     "lang_downloadRufus": "Download Rufus",
     "lang_example": "Example",
     "lang_generationFailed": "Could not generate boot menu. The bwLehrpool-System might not work properly. If you can't fix the problem, please report the error message above to the bwLehrpool project.",
     "lang_localHDD": "Local HDD",
-    "lang_masterPassword": "Master password",
+    "lang_masterPassword": "Master Password",
     "lang_masterPasswordHelp": "The master password is required to edit a boot menu entry. This should be set for security reasons.",
     "lang_menuCustom": "Custom Extra Menu",
     "lang_menuCustomHint1": "Here you have the opportunity to add your own menu code to the displayed PXE menu, eg to refer to other PXE server. The format corresponds to the syslinux menu format.",
@@ -21,6 +21,7 @@
     "lang_menuCustomHint3": "and select as the default boot behavior custom as well.",
     "lang_menuDisplayTime": "Menu Display Time",
     "lang_menuGeneration": "Generating boot menu...",
+    "lang_moduleHeading": "iPXE / Boot Menu",
     "lang_seconds": "Seconds",
     "lang_set": "Set",
     "lang_usbImage": "USB image",
diff --git a/modules-available/serversetup-bwlp/page.inc.php b/modules-available/serversetup-bwlp/page.inc.php
index 9d7d11ac..a8d29d6e 100644
--- a/modules-available/serversetup-bwlp/page.inc.php
+++ b/modules-available/serversetup-bwlp/page.inc.php
@@ -44,7 +44,7 @@ class Page_ServerSetup extends Page
 
 	protected function doRender()
 	{
-
+		Render::addTemplate("heading");
 		$taskid = Request::any('taskid');
 		if ($taskid !== false && Taskmanager::isTask($taskid)) {
 			Render::addTemplate('ipxe_update', array('taskid' => $taskid));
diff --git a/modules-available/serversetup-bwlp/templates/heading.html b/modules-available/serversetup-bwlp/templates/heading.html
new file mode 100644
index 00000000..d68360f1
--- /dev/null
+++ b/modules-available/serversetup-bwlp/templates/heading.html
@@ -0,0 +1 @@
+<h1>{{lang_moduleHeading}}</h1>
\ No newline at end of file
diff --git a/modules-available/serversetup-bwlp/templates/ipxe.html b/modules-available/serversetup-bwlp/templates/ipxe.html
index e1ecb6f1..fbe3fb9e 100644
--- a/modules-available/serversetup-bwlp/templates/ipxe.html
+++ b/modules-available/serversetup-bwlp/templates/ipxe.html
@@ -15,9 +15,9 @@
 
 			<div class="form-group">
 				<strong>{{lang_bootBehavior}}</strong>
-				<div><label class="radio-inline"><input type="radio" name="defaultentry" value="net" {{active-net}}> bwLehrpool</label></div>
-				<div><label class="radio-inline"><input type="radio" name="defaultentry" value="hdd" {{active-hdd}}> {{lang_localHDD}}</label></div>
-				<div><label class="radio-inline"><input type="radio" name="defaultentry" value="custom" {{active-custom}}> {{lang_customEntry}} (&quot;custom&quot;)</label></div>
+				<div class="radio"><input type="radio" name="defaultentry" value="net" {{active-net}}><label>bwLehrpool</label></div>
+				<div class="radio"><input type="radio" name="defaultentry" value="hdd" {{active-hdd}}><label>{{lang_localHDD}}</label></div>
+				<div class="radio"><input type="radio" name="defaultentry" value="custom" {{active-custom}}><label>{{lang_customEntry}} (&quot;custom&quot;)</label></div>
 			</div>
 
 			<div class="form-group">
@@ -43,7 +43,8 @@
 		</div>
 
 		<div class="panel-footer">
-			<div class="pull-right">
+			<button class="btn btn-primary pull-right" name="action" value="ipxe">{{lang_bootMenuCreate}}</button>
+			<div>
 				<div class="btn-group" role="group">
 					<a class="btn btn-default" href="?do=ServerSetup&amp;action=getimage">
 						<span class="glyphicon glyphicon-download-alt"></span>
@@ -52,7 +53,6 @@
 					<span class="btn btn-default" data-toggle="modal" data-target="#help-usbimg"><span class="glyphicon glyphicon-question-sign"></span></span>
 				</div>
 			</div>
-			<button class="btn btn-primary" name="action" value="ipxe">{{lang_bootMenuCreate}}</button>
 		</div>
 	</div>
 </form>
@@ -60,7 +60,10 @@
 <div class="modal fade" id="help-custom" tabindex="-1" role="dialog">
 	<div class="modal-dialog">
 		<div class="modal-content">
-			<div class="modal-header">{{lang_menuCustom}}</div>
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+				{{lang_menuCustom}}
+			</div>
 			<div class="modal-body">
 				{{lang_menuCustomHint1}}
 				<br>{{lang_example}}:
@@ -73,7 +76,6 @@
 				{{lang_menuCustomHint2}} LABEL <strong>custom</strong>
 				{{lang_menuCustomHint3}}
 			</div>
-			<div class="modal-footer"><a class="btn btn-primary" data-dismiss="modal">{{lang_close}}</a></div>
 		</div>
 	</div>
 </div>
@@ -81,7 +83,10 @@
 <div class="modal fade" id="help-usbimg" tabindex="-1" role="dialog">
 	<div class="modal-dialog">
 		<div class="modal-content">
-			<div class="modal-header">{{lang_usbImage}}</div>
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+				{{lang_usbImage}}
+			</div>
 			<div class="modal-body">
 				<p>{{lang_usbImgHelp}}</p>
 				<p>
@@ -98,7 +103,6 @@
 					<a href="https://rufus.akeo.ie/#download">{{lang_downloadRufus}}</a>
 				</p>
 			</div>
-			<div class="modal-footer"><a class="btn btn-primary" data-dismiss="modal">{{lang_close}}</a></div>
 		</div>
 	</div>
 </div>
\ No newline at end of file