From 7d6275514cd4e0ab2903f8c0891c85f3b0e66539 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Sat, 7 Dec 2019 15:28:30 +0100
Subject: [rebootcontrol] Implement assigning subnets to jump host

Also fix removing all jump hosts from a subnet.
Update translations.
---
 .../rebootcontrol/templates/jumphost-list.html     | 12 +++++-----
 .../rebootcontrol/templates/jumphost-subnets.html  | 28 ++++++++++++++++++++++
 .../rebootcontrol/templates/subnet-list.html       |  2 ++
 3 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 modules-available/rebootcontrol/templates/jumphost-subnets.html

(limited to 'modules-available/rebootcontrol/templates')

diff --git a/modules-available/rebootcontrol/templates/jumphost-list.html b/modules-available/rebootcontrol/templates/jumphost-list.html
index 8453d2bb..6023c872 100644
--- a/modules-available/rebootcontrol/templates/jumphost-list.html
+++ b/modules-available/rebootcontrol/templates/jumphost-list.html
@@ -12,7 +12,7 @@
 		<thead>
 		<tr>
 			<th>{{lang_host}}</th>
-			<th class="slx-smallcol">{{lang_assignedSubnets}}</th>
+			<th class="slx-smallcol">{{lang_numAssignedSubnets}}</th>
 			<th class="slx-smallcol">{{lang_reachable}}</th>
 			<th class="slx-smallcol"></th>
 		</tr>
@@ -22,11 +22,11 @@
 		<tr>
 			<td>{{host}}:{{port}}</td>
 			<td class="text-nowrap text-right">
-				{{subnetCount}}
 				<a class="btn btn-xs btn-default {{perms.jumphost.assign-subnet.disabled}}"
-					href="?do=rebootcontrol&amp;show=jumphost-assign&amp;id={{hostid}}">
-					<span class="glyphicon glyphicon-edit"></span>
+					href="?do=rebootcontrol&amp;show=jumphost&amp;what=assign&amp;id={{hostid}}">
+					<span class="glyphicon glyphicon-tasks"></span>
 				</a>
+				<span class="badge">{{subnetCount}}</span>
 			</td>
 			<td class="text-nowrap text-center">
 				{{#reachable}}
@@ -42,7 +42,7 @@
 			</td>
 			<td class="text-nowrap text-center">
 				<a class="btn btn-xs btn-default {{perms.jumphost.edit.disabled}}"
-					href="?do=rebootcontrol&amp;show=jumphost&amp;id={{hostid}}">
+					href="?do=rebootcontrol&amp;show=jumphost&amp;what=edit&amp;id={{hostid}}">
 					<span class="glyphicon glyphicon-edit"></span>
 				</a>
 				<button type="submit" name="deleteid" value="{{hostid}}" class="btn btn-xs btn-danger"
@@ -56,7 +56,7 @@
 	</table>
 </form>
 <div class="buttonbar text-right">
-	<a class="btn btn-success" href="?do=rebootcontrol&amp;show=jumphost&amp;id=new">
+	<a class="btn btn-success" href="?do=rebootcontrol&amp;show=jumphost&amp;what=edit&amp;id=new">
 		<span class="glyphicon glyphicon-plus"></span>
 		{{lang_new}}
 	</a>
diff --git a/modules-available/rebootcontrol/templates/jumphost-subnets.html b/modules-available/rebootcontrol/templates/jumphost-subnets.html
new file mode 100644
index 00000000..9b418667
--- /dev/null
+++ b/modules-available/rebootcontrol/templates/jumphost-subnets.html
@@ -0,0 +1,28 @@
+<h2>{{lang_jumpHost}} {{host}} - {{lang_assignedSubnets}}</h2>
+
+<form method="post" action="?do=rebootcontrol">
+	<input type="hidden" name="token" value="{{token}}">
+	<input type="hidden" name="show" value="jumphost">
+	<input type="hidden" name="action" value="assign">
+	<input type="hidden" name="hostid" value="{{hostid}}">
+	<div class="list-group">
+		<div class="list-group-item">
+			{{#list}}
+			<div class="row">
+				<div class="col-md-12">
+					<div class="checkbox">
+						<input id="check-{{subnetid}}" type="checkbox" name="subnet[{{subnetid}}]" {{checked}}>
+						<label for="check-{{subnetid}}">{{cidr}}</label>
+					</div>
+				</div>
+			</div>
+			{{/list}}
+			<div class="text-right">
+				<button type="submit" class="btn btn-primary">
+					<span class="glyphicon glyphicon-floppy-disk"></span>
+					{{lang_save}}
+				</button>
+			</div>
+		</div>
+	</div>
+</form>
\ No newline at end of file
diff --git a/modules-available/rebootcontrol/templates/subnet-list.html b/modules-available/rebootcontrol/templates/subnet-list.html
index c5faae2b..bf6cee1c 100644
--- a/modules-available/rebootcontrol/templates/subnet-list.html
+++ b/modules-available/rebootcontrol/templates/subnet-list.html
@@ -4,6 +4,8 @@
 
 <p>{{lang_subnetsDescription}}</p>
 
+<p>{{lang_wolMachineSupportText}}</p>
+
 <table class="table">
 	<thead>
 	<tr>
-- 
cgit v1.2.3-55-g7522