Lots of small bugfixes, proxy config WIP, https config WIP, translation updates, added masterpassword to pxe menu, ...

4 files changed, 36 insertions, 8 deletions

diff --git a/templates/main-menu.html b/templates/main-menu.html
index 518db2d5..7bb030d6 100644
--- a/templates/main-menu.html
+++ b/templates/main-menu.html
@@ -19,7 +19,6 @@
 						<li><a href="?do=SysConfig">{{lang_localization}}</a></li>
 						<li><a href="?do=MiniLinux">bwLehrpool Mini-Linux</a></li>
 						<li><a href="?do=BaseConfig">{{lang_configurationVariables}}</a></li>
-						<li><a href="?do=Translation">{{lang_administration}}</a></li>
 						<li class="divider"></li>
 						<li class="dropdown-header">{{lang_server}}</li>
 						<li><a href="?do=ServerSetup">{{lang_configurationBasic}}</a></li>
@@ -39,6 +38,7 @@
 				<li class="dropdown">
 					<a href="#" class="dropdown-toggle" data-toggle="dropdown"><img src="lang/{{current_lang}}/flag.png"><b class="caret"></b></a>
 					<ul class="dropdown-menu">
+						<li><a href="?do=Translation">{{lang_translations}}</a></li>
 						<li class="dropdown-header">{{lang_language}}</li>
 						{{#langs}}
 						<li><a href="?lang={{cc}}&amp;url={{url}}"><img src="lang/{{cc}}/flag.png" alt="{{name}}"> {{name}}</a></li>
diff --git a/templates/page-news.html b/templates/page-news.html
index 0c56069c..8e400498 100644
--- a/templates/page-news.html
+++ b/templates/page-news.html
@@ -1,9 +1,9 @@
-<p>{{lang_newsIntro}}</p>
 <div class="panel panel-default">
 	<div class="panel-heading">
-		{{lang_activeNews}}
+		{{lang_editNews}}
 	</div>
 	<div class="panel-body">
+		<p>{{lang_newsIntro}}</p>
 		<form action="?do=News&amp;action=save" method="post">
 			<div class="form-group">
 				<label for="news-title-id">{{lang_title}}</label>
diff --git a/templates/serversetup/ipxe.html b/templates/serversetup/ipxe.html
index 21f3d87b..ec8ddc2f 100644
--- a/templates/serversetup/ipxe.html
+++ b/templates/serversetup/ipxe.html
@@ -15,7 +15,7 @@
 				<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>
+				<label class="radio"><input type="radio" name="defaultentry" value="custom" {{active-custom}}> {{lang_customEntry}} (&quot;custom&quot;)</label>
 			</div>
 
 			<div class="form-group">
@@ -27,8 +27,16 @@
 			</div>
 
 			<div class="form-group">
+				<strong>{{lang_masterPassword}}</strong>
+				<div class="form-narrow">
+					<input type="text" class="form-control" name="masterpassword" value="{{masterpassword}}">
+				</div>
+				<i>{{lang_masterPasswordHelp}}</i>
+			</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>
+				<textarea class="form-control" name="custom" rows="8">{{custom}}</textarea>
 			</div>
 		</div>
 
@@ -45,13 +53,13 @@
 			<div class="modal-body">
 				{{lang_menuCustomHint1}}
 				<br>{{lang_example}}:
-				<pre>LABEL my-entry
-	MENU LABEL ^My Entry
+				<pre>LABEL custom
+	MENU LABEL ^My Boot Entry
 	KERNEL http://1.2.3.4/kernel
 	INITRD http://1.2.3.4/initramfs-stage31
 	APPEND custom=option
 	IPAPPEND 3</pre>
-				{{lang_menuCustomHint2}} LABEL <strong>my-entry</strong>
+				{{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>
diff --git a/templates/serversetup/ipxe_update.html b/templates/serversetup/ipxe_update.html
new file mode 100644
index 00000000..9c598667
--- /dev/null
+++ b/templates/serversetup/ipxe_update.html
@@ -0,0 +1,20 @@
+<div class="panel panel-default">
+	<div class="panel-heading">{{lang_menuGeneration}}</div>
+	<div class="panel-body">
+		<div data-tm-id="{{taskid}}" data-tm-log="error" data-tm-callback="restartCb">{{lang_menuGeneration}}</div>
+		<div id="genfailed" class="alert alert-danger" style="display:none">
+			{{lang_generationFailed}}
+		</div>
+	</div>
+</div>
+
+<script type="text/javascript">
+	function restartCb(task)
+	{
+		if (!task || !task.statusCode)
+			return;
+		if (task.statusCode === 'TASK_ERROR') {
+			$('#genfailed').show('slow');
+		}
+	}
+</script>