From d10a3a96e0538b8347472d6c2d350dc2bee86501 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 24 Sep 2019 15:25:32 +0200
Subject: [serversetup-bwlp-ipxe]

---
 .../templates/bootentry-list.html                  | 16 ++--
 .../templates/ipxe-new-boot-entry.html             | 89 +++++++++++++++++++---
 .../serversetup-bwlp-ipxe/templates/menu-edit.html |  4 +-
 3 files changed, 93 insertions(+), 16 deletions(-)

(limited to 'modules-available/serversetup-bwlp-ipxe/templates')

diff --git a/modules-available/serversetup-bwlp-ipxe/templates/bootentry-list.html b/modules-available/serversetup-bwlp-ipxe/templates/bootentry-list.html
index dfc4e6a8..9eecc6f5 100644
--- a/modules-available/serversetup-bwlp-ipxe/templates/bootentry-list.html
+++ b/modules-available/serversetup-bwlp-ipxe/templates/bootentry-list.html
@@ -11,20 +11,24 @@
 		<thead>
 		<tr>
 			<th>{{lang_entryId}}</th>
+			<th>{{lang_bootentryType}}</th>
 			<th>{{lang_bootentryTitle}}</th>
-			<th>{{lang_hotkey}}</th>
-			<th class="slx-smallcol">{{lang_refCount}}</th>
-			<th class="slx-smallcol">{{lang_edit}}</th>
-			{{#allowEdit}}<th class="slx-smallcol">{{lang_copy}}</th>{{/allowEdit}}
-			<th class="slx-smallcol">{{lang_delete}}</th>
+			<th class="small">{{lang_hotkey}}</th>
+			<th class="small slx-smallcol">{{lang_refCount}}</th>
+			<th class="small slx-smallcol">{{lang_edit}}</th>
+			{{#allowEdit}}<th class="small slx-smallcol">{{lang_copy}}</th>{{/allowEdit}}
+			<th class="small slx-smallcol">{{lang_delete}}</th>
 		</tr>
 		</thead>
 		<tbody>
 		{{#bootentryTable}}
 		<tr>
-			<td>
+			<td class="small">
 				{{entryid}}
 			</td>
+			<td class="small">
+				{{module}}
+			</td>
 			<td>
 				{{title}}
 			</td>
diff --git a/modules-available/serversetup-bwlp-ipxe/templates/ipxe-new-boot-entry.html b/modules-available/serversetup-bwlp-ipxe/templates/ipxe-new-boot-entry.html
index b195394d..fd76c1d5 100644
--- a/modules-available/serversetup-bwlp-ipxe/templates/ipxe-new-boot-entry.html
+++ b/modules-available/serversetup-bwlp-ipxe/templates/ipxe-new-boot-entry.html
@@ -23,13 +23,19 @@
 
 			<div class="form-group">
 				<div class="radio">
-					<input class="type-radio" type="radio" name="type" value="exec" id="type-exec" {{exec_checked}} {{disabled}}>
+					<input class="type-radio" type="radio" name="type" value=".exec" id="type-exec" {{exec_checked}} {{disabled}}>
 					<label for="type-exec">{{lang_typeExecEntry}}</label>
 				</div>
 				<div class="radio">
-					<input class="type-radio" type="radio" name="type" value="script" id="type-script" {{script_checked}} {{disabled}}>
+					<input class="type-radio" type="radio" name="type" value=".script" id="type-script" {{script_checked}} {{disabled}}>
 					<label for="type-script">{{lang_typeScriptEntry}}</label>
 				</div>
+				{{#hooks}}
+				<div class="radio">
+					<input class="type-radio" type="radio" name="type" value="{{moduleId}}" id="type-{{moduleId}}" {{checked}} {{disabled}}>
+					<label for="type-{{moduleId}}">{{name}}</label>
+				</div>
+				{{/hooks}}
 			</div>
 
 			<div class="form-group">
@@ -68,42 +74,77 @@
 										<label for="input-ex-{{mode}}">
 											{{lang_imageToLoad}}
 										</label>
-										<input id="input-ex-{{mode}}" class="form-control" name="entry[executable][{{mode}}]" value="{{executable}}" {{disabled}}>
+										<input id="input-ex-{{mode}}" class="form-control" name="entry[{{mode}}][executable]" value="{{executable}}" {{disabled}}>
 									</div>
 									<div class="form-group">
 										<label for="input-rd-{{mode}}">
 											{{lang_initRd}}
 										</label>
-										<input id="input-rd-{{mode}}" class="form-control" name="entry[initRd][{{mode}}]" value="{{initRd}}" {{disabled}}>
+										<input id="input-rd-{{mode}}" class="form-control" name="entry[{{mode}}][initRd]" value="{{initRd}}" {{disabled}}>
 									</div>
 									<div class="form-group">
 										<label for="input-cmd-{{mode}}">
 											{{lang_commandLine}}
 										</label>
-										<input id="input-cmd-{{mode}}" class="form-control" name="entry[commandLine][{{mode}}]"
+										<input id="input-cmd-{{mode}}" class="form-control" name="entry[{{mode}}][commandLine]"
 												 value="{{commandLine}}" {{disabled}}>
 									</div>
+									<h4>{{lang_ipxeSettings}}</h4>
+									<div class="form-group">
+										<div class="checkbox checkbox-inline">
+											<input id="exec-imgfree-{{mode}}" class="form-control" type="checkbox"
+													 name="entry[{{mode}}][imgfree]" {{imageFree_checked}} {{disabled}}>
+											<label for="exec-imgfree-{{mode}}">{{lang_execImageFree}}</label>
+										</div>
+									</div>
 									<div class="form-group">
 										<div class="checkbox checkbox-inline">
 											<input id="exec-replace-{{mode}}" class="form-control" type="checkbox"
-													 name="entry[replace][{{mode}}]" {{replace_checked}} {{disabled}}>
+													 name="entry[{{mode}}][replace]" {{replace_checked}} {{disabled}}>
 											<label for="exec-replace-{{mode}}">{{lang_execReplace}}</label>
 										</div>
 									</div>
 									<div class="form-group">
 										<div class="checkbox checkbox-inline">
 											<input id="exec-au-{{mode}}" class="form-control" type="checkbox"
-													 name="entry[autoUnload][{{mode}}]" {{autoUnload_checked}} {{disabled}}>
+													 name="entry[{{mode}}][autoUnload]" {{autoUnload_checked}} {{disabled}}>
 											<label for="exec-au-{{mode}}">{{lang_execAutoUnload}}</label>
 										</div>
 									</div>
 									<div class="form-group">
 										<div class="checkbox checkbox-inline">
 											<input id="exec-reset-{{mode}}" class="form-control" type="checkbox"
-													 name="entry[resetConsole][{{mode}}]" {{resetConsole_checked}} {{disabled}}>
+													 name="entry[{{mode}}][resetConsole]" {{resetConsole_checked}} {{disabled}}>
 											<label for="exec-reset-{{mode}}">{{lang_execResetConsole}}</label>
 										</div>
 									</div>
+									<h4>{{lang_dhcpOverrides}}</h4>
+									{{#opts}}
+									<div class="form-group">
+										<div class="row">
+											<div class="col-sm-8">
+												<div class="checkbox">
+													<input type="checkbox" id="opt-{{mode}}-{{opt}}"
+															 name="entry[{{mode}}][dhcpOptions][{{opt}}][override]" {{override_checked}} {{disabled}}>
+													<label for="opt-{{mode}}-{{opt}}">
+														{{name}} ({{opt}})
+													</label>
+												</div>
+											</div>
+											<div class="col-sm-4 text-right">
+												<div class="checkbox checkbox-inline">
+													<input class="hex-box" type="checkbox" id="opt-{{mode}}-{{opt}}-hex"
+															 name="entry[{{mode}}][dhcpOptions][{{opt}}][hex]" {{hex_checked}} {{disabled}}>
+													<label for="opt-{{mode}}-{{opt}}-hex">
+														{{lang_hex}}
+													</label>
+												</div>
+											</div>
+										</div>
+										<input type="text" id="opt-{{mode}}-{{opt}}-value" class="form-control hex-value"
+												 name="entry[{{mode}}][dhcpOptions][{{opt}}][value]" value="{{value}}" {{disabled}}>
+									</div>
+									{{/opts}}
 								</div>
 							</div>
 						</div>
@@ -121,6 +162,23 @@
 				</div>
 			</div>
 
+			{{#hooks}}
+			<div class="type-form" id="form-{{moduleId}}">
+				<label for="select-{{moduleId}}">{{name}}</label>
+				<div class="form-group">
+					<select id="select-{{moduleId}}" class="form-control" name="selection-{{moduleId}}">
+						{{#groups}}
+						<optgroup label="{{groupName}}">
+							{{#entries}}
+							<option value="{{id}}" {{selected}}>{{name}}</option>
+							{{/entries}}
+						</optgroup>
+						{{/groups}}
+					</select>
+				</div>
+			</div>
+			{{/hooks}}
+
 			{{#builtin}}
 				<div class="alert alert-warning">
 					{{lang_editBuiltinWarn}}
@@ -148,7 +206,8 @@
 document.addEventListener('DOMContentLoaded', function () {
 	$('.type-radio').click(function () {
 		$('.type-form').hide();
-		$('#form-' + $(this).val()).show();
+		var name = $(this).val().replace('.', '');
+		$('#form-' + name).show();
 	});
 	$('.type-radio[checked]').click();
 	var $as = $('#arch-selector');
@@ -167,5 +226,17 @@ document.addEventListener('DOMContentLoaded', function () {
 			$('#col-' + vs[i]).attr('class', 'mode-class col-md-' + cols).show();
 		}
 	}).change();
+	var colorize = function() {
+		var $t = $(this);
+		$t.css('color', ($t.data('hex') && !$t.val().match(/^[a-f0-9]*$/i)) ? 'red' : '');
+	};
+	var setHex = function() {
+		var n = '#' + this.id.replace(/-hex$/, '-value');
+		var $obj = $(n);
+		$obj.data('hex', this.checked);
+		colorize.call($obj[0]);
+	};
+	$('.hex-box').change(setHex).each(setHex);
+	$('.hex-value').change(colorize).keyup(colorize).each(colorize);
 });
 // --></script>
\ No newline at end of file
diff --git a/modules-available/serversetup-bwlp-ipxe/templates/menu-edit.html b/modules-available/serversetup-bwlp-ipxe/templates/menu-edit.html
index 358aa4d6..d2fa12be 100644
--- a/modules-available/serversetup-bwlp-ipxe/templates/menu-edit.html
+++ b/modules-available/serversetup-bwlp-ipxe/templates/menu-edit.html
@@ -150,10 +150,12 @@
 									</div>
 								{{/script}}
 								{{^script}}
+									{{#arch}}
 									<div class="form-group">
 										<label for="{{entryid}}-script">{{lang_archSelector}}</label>
-										<pre id="{{entryid}}-arch">{{arch}}</pre>
+										<pre id="{{entryid}}-arch">{{.}}</pre>
 									</div>
+									{{/arch}}
 									{{#archAgnostic}}
 										<div class="form-group">
 											<label for="{{entryid}}-executable">{{lang_imageToLoad}}</label>
-- 
cgit v1.2.3-55-g7522