Stuff (WIP)

15 files changed, 169 insertions, 94 deletions

diff --git a/templates/main-menu.html b/templates/main-menu.html
index 71800915..8510bfec 100644
--- a/templates/main-menu.html
+++ b/templates/main-menu.html
@@ -23,7 +23,6 @@
 						<li class="divider"></li>
 						<li class="dropdown-header">Server</li>
 						<li><a href="?do=ServerSetup">Grundkonfiguration</a></li>
-						<li><a href="?do=iPxe">iPXE</a></li>
 					</ul>
 				</li>
 			</ul>
diff --git a/templates/messagebox-error.html b/templates/messagebox-error.html
index dc2dbc8a..63f59a96 100644
--- a/templates/messagebox-error.html
+++ b/templates/messagebox-error.html
@@ -1 +1 @@
-<div class="alert alert-danger">{{message}}</div>
+<div class="alert alert-danger">{{{message}}}</div>
diff --git a/templates/messagebox-info.html b/templates/messagebox-info.html
index b4464094..7136298c 100644
--- a/templates/messagebox-info.html
+++ b/templates/messagebox-info.html
@@ -1 +1 @@
-<div class="alert alert-info">{{message}}</div>
+<div class="alert alert-info">{{{message}}}</div>
diff --git a/templates/messagebox-success.html b/templates/messagebox-success.html
index 180a0466..3fa263ef 100644
--- a/templates/messagebox-success.html
+++ b/templates/messagebox-success.html
@@ -1 +1 @@
-<div class="alert alert-success">{{message}}</div>
+<div class="alert alert-success">{{{message}}}</div>
diff --git a/templates/messagebox-warning.html b/templates/messagebox-warning.html
index 1ce2c0e4..48a95b4d 100644
--- a/templates/messagebox-warning.html
+++ b/templates/messagebox-warning.html
@@ -1 +1 @@
-<div class="alert alert-warning">{{message}}</div>
+<div class="alert alert-warning">{{{message}}}</div>
diff --git a/templates/page-ipxe.html b/templates/page-ipxe.html
deleted file mode 100644
index ba56582e..00000000
--- a/templates/page-ipxe.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="container">
-	<div class="panel panel-default">
-		<div class="panel-heading">
-			Bitte die IP-Adresse auswählen, über die der Server von den Clients angesprochen wird.
-		</div>
-		{{#ips}}
-			<div class="panel-body">{{ip}}
-				<span>
-					<a class="btn btn-success" href="#" onclick="this.parentNode.style.display='none';loadContent('#compiler', 'api.php?do=exec&amp;type=ipxe&amp;ip={{ip}}&amp;id=compiler&amp;default=hddboot')">Kompilieren (HDD Default)</a>
-					<a class="btn btn-success" href="#" onclick="this.parentNode.style.display='none';loadContent('#compiler', 'api.php?do=exec&amp;type=ipxe&amp;ip={{ip}}&amp;id=compiler&amp;default=openslx')">Kompilieren (OpenSLX Default)</a>
-					{{#current}}(Aktuelle Konfiguration){{/current}}
-				</span>
-			</div>
-		{{/ips}}
-	</div>
-	<div id="compiler">
-	</div>
-	{{^ips}}
-		<div class="alert alert-danger">Konnte lokale IP-Adressen nicht ermitteln.</div>
-	{{/ips}}
-</div>
diff --git a/templates/page-serversetup.html b/templates/page-serversetup.html
deleted file mode 100644
index 2f900a03..00000000
--- a/templates/page-serversetup.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<div class="panel panel-default">
-	<div class="panel-heading">
-		Boot-Adresse des Servers
-	</div>
-	<div class="panel-body">
-		<p>
-			Bitte wählen Sie die IP-Adresse, über die der Server von den Clients zum Booten angesprochen werden soll.
-		</p>
-		<form method="post">
-			<input type="hidden" name="token" value="{{token}}">
-			<table>
-				{{#ips}}
-				<tr>
-					<td>{{ip}}</td>
-					{{#default}}
-					<td>
-						<span class="btn btn-success btn-xs"><span class="glyphicon glyphicon-ok"></span> Aktiv</span>
-					</td>
-					{{/default}}
-					{{^default}}
-					<td>
-						<button class="btn btn-primary btn-xs" name="ip" value="{{ip}}"><span class="glyphicon glyphicon-flag"></span> Setzen</button>
-					</td>
-					{{/default}}
-				</tr>
-				{{/ips}}
-			</table>
-		</form>
-	</div>
-</div>
\ No newline at end of file
diff --git a/templates/page-sysconfig-main.html b/templates/page-sysconfig-main.html
index 32b3a6bd..447be0bb 100644
--- a/templates/page-sysconfig-main.html
+++ b/templates/page-sysconfig-main.html
@@ -8,26 +8,44 @@
 			Verfügbare Systemkonfigurationen
 			<a class="btn btn-default" data-toggle="modal" data-target="#help-config"><span class="glyphicon glyphicon-question-sign"></span></a>
 		</div>
-		<table class="table table-condensed">
-		{{#files}}
-			<tr>
-				<td class=col-md-8">{{file}}</td>
-				<td class="col-md-4">
-					{{^current}}
-						<a class="btn btn-primary" href="?do=SysConfig&amp;action=activate&amp;file={{file}}&amp;token={{token}}">Aktivieren</a>
-					{{/current}}
-					{{#current}}
-						<span class="btn btn-success">Bereits aktiv</span>
-					{{/current}}
-				</td>
-			</tr>
-		{{/files}}
-		</table>
-		{{^files}}
-		<div class="alert alert-warning">Keine Systemkonfigurationen gefunden!</div>
-		{{/files}}
 		<div class="panel-body">
-			<a class="btn btn-primary">Neue Konfiguration zusammenstellen</a>
+			<form method="post" action="?do=SysConfig">
+				<input type="hidden" name="token" value="{{token}}">
+				<input type="hidden" name="action" value="config">
+				<table>
+				{{#configs}}
+					<tr>
+						<td>{{config}}</td>
+						<td>
+							{{^current}}
+								<button class="btn btn-primary btn-xs" name="activate" value="{{configid}}">
+									<span class="glyphicon glyphicon-flag"></span>
+									Aktivieren
+								</button>
+							{{/current}}
+							{{#current}}
+								<span class="btn btn-success btn-xs">
+									<span class="glyphicon glyphicon-ok"></span>
+									Aktiv
+								</span>
+							{{/current}}
+						</td>
+						<td>
+							<button class="btn btn-danger btn-xs" name="del" value="{{configid}}"><span class="glyphicon glyphicon-trash"></span> Löschen</button>
+						</td>
+					</tr>
+				{{/configs}}
+				</table>
+				{{^configs}}
+				<div class="alert alert-warning">
+					Keine Systemkonfigurationen gefunden.
+					<br>Erstellen Sie eine neue Konfiguration aus den unten aufgeführten Konfigurationsmodulen.
+				</div>
+				{{/configs}}
+			</form>
+		</div>
+		<div class="panel-footer">
+			<a class="btn btn-primary" href="?do=SysConfig&amp;action=addconfig">Neue Konfiguration</a>
 		</div>
 	</div>
 	<div class="panel panel-default">
@@ -35,22 +53,30 @@
 			Verfügbare Konfigurationsmodule
 			<a class="btn btn-default" data-toggle="modal" data-target="#help-module"><span class="glyphicon glyphicon-question-sign"></span></a>
 		</div>
-		<table class="table table-condensed">
-		{{#modules}}
-			<tr>
-				<td>{{module}}</td>
-				<td nowrap>
-					<a class="btn btn-default btn-xs"><span class="glyphicon glyphicon-edit"></span> Bearbeiten</a>
-					<a class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-trash"></span> Löschen</a>
-				</td>
-			</tr>
-		{{/modules}}
-		</table>
-		{{^modules}}
-		<div class="alert alert-warning">Keine Konfigurationsmodule gefunden!</div>
-		{{/modules}}
 		<div class="panel-body">
-			<a class="btn btn-primary" href="?do=SysConfig&amp;action=addmodule">Neues Modul erstellen</a>
+			<form method="post" action="?do=SysConfig">
+				<input type="hidden" name="token" value="{{token}}">
+				<input type="hidden" name="action" value="module">
+				<table>
+				{{#modules}}
+					<tr>
+						<td>{{module}}</td>
+						<td>
+							<!-- a class="btn btn-default btn-xs"><span class="glyphicon glyphicon-edit"></span> Bearbeiten</a -->
+						</td>
+						<td>
+							<button class="btn btn-danger btn-xs" name="del" value="{{moduleid}}"><span class="glyphicon glyphicon-trash"></span> Löschen</button>
+						</td>
+					</tr>
+				{{/modules}}
+				</table>
+				{{^modules}}
+				<div class="alert alert-warning">Keine Konfigurationsmodule gefunden!</div>
+				{{/modules}}
+			</form>
+		</div>
+		<div class="panel-footer">
+			<a class="btn btn-primary" href="?do=SysConfig&amp;action=addmodule">Neues Modul</a>
 		</div>
 	</div>
 </div>
diff --git a/templates/serversetup/ipaddress.html b/templates/serversetup/ipaddress.html
new file mode 100644
index 00000000..a9048dcf
--- /dev/null
+++ b/templates/serversetup/ipaddress.html
@@ -0,0 +1,32 @@
+<div class="container">
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			Boot-Adresse des Servers
+		</div>
+		<div class="panel-body">
+			<p>
+				Bitte wählen Sie die IP-Adresse, über die der Server von den Clients zum Booten angesprochen werden soll.
+			</p>
+			<form method="post">
+				<input type="hidden" name="token" value="{{token}}">
+				<table>
+					{{#ips}}
+					<tr>
+						<td>{{ip}}</td>
+						{{#default}}
+						<td>
+							<span class="btn btn-success btn-xs"><span class="glyphicon glyphicon-ok"></span> Aktiv</span>
+						</td>
+						{{/default}}
+						{{^default}}
+						<td>
+							<button class="btn btn-primary btn-xs" name="ip" value="{{ip}}"><span class="glyphicon glyphicon-flag"></span> Setzen</button>
+						</td>
+						{{/default}}
+					</tr>
+					{{/ips}}
+				</table>
+			</form>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/templates/serversetup/ipxe.html b/templates/serversetup/ipxe.html
new file mode 100644
index 00000000..9fc83a40
--- /dev/null
+++ b/templates/serversetup/ipxe.html
@@ -0,0 +1,21 @@
+<div class="container">
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			iPXE Menü
+		</div>
+		<div class="panel-body">
+			<p>
+				Das iPXE-Menü muss nach einer Änderung der IP-Adresse neu generiert werden. In der Regel geschieht dies
+				automatisch, der Vorgang kann hier allerdings auch manuell ausgelöst werden. In diesem Feld sehen Sie außerdem
+				die Log-Ausgaben der letzten Ausführung, falls noch im Cache.
+			</p>
+			<div data-tm-id="{{taskid}}" data-tm-log="output">Status</div>
+		</div>
+		<div class="panel-footer">
+			<form method="post">
+				<input type="hidden" name="token" value="{{token}}">
+				<button class="btn btn-primary" name="action" value="ipxe">Bootmenü erzeugen</button>
+			</form>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/templates/sysconfig/ad-finish.html b/templates/sysconfig/ad-finish.html
index f20a2ce1..e79e4262 100644
--- a/templates/sysconfig/ad-finish.html
+++ b/templates/sysconfig/ad-finish.html
@@ -3,8 +3,8 @@
 </p>
 
 <div id="zeug">
-	<div data-tm-id="{{tm-tgz}}" data-tm-log="message">Konfiguration erzeugen</div>
-	<div data-tm-id="{{tm-ldadp}}" data-tm-log="message" data-tm-callback="ldapCb">ldadp starten</div>
+	<div data-tm-id="{{tm-config}}" data-tm-log="error">Konfiguration erzeugen</div>
+	<div data-tm-id="{{tm-ldadp}}" data-tm-log="error" data-tm-callback="ldapCb">ldadp starten</div>
 </div>
 <br>
 <div id="back" class="pull-left" style="display:none">
diff --git a/templates/sysconfig/cfg-finish.html b/templates/sysconfig/cfg-finish.html
new file mode 100644
index 00000000..2bf63420
--- /dev/null
+++ b/templates/sysconfig/cfg-finish.html
@@ -0,0 +1,12 @@
+<p>
+	Die Konfiguration wurde erfolgreich erstellt.
+</p>
+
+<form role="form" method="post" action="?do=SysConfig">
+	<input type="hidden" name="token" value="{{token}}">
+	<input type="hidden" name="action" value="config">
+	<input type="hidden" name="activate" value="{{configid}}">
+	<div class="pull-left">
+		<button type="submit" class="btn btn-primary">Konfiguration aktivieren</button>
+	</div>
+</form>
diff --git a/templates/sysconfig/cfg-start.html b/templates/sysconfig/cfg-start.html
new file mode 100644
index 00000000..b6eaf9c9
--- /dev/null
+++ b/templates/sysconfig/cfg-start.html
@@ -0,0 +1,35 @@
+<form role="form" method="post" action="?do=SysConfig&amp;action=addconfig&amp;step={{step}}">
+	<input type="hidden" name="token" value="{{token}}">
+	<div class="input-group">
+		<span class="input-group-addon">Name</span>
+		<input type="text" name="title" class="form-control" placeholder="Meine Konfiguration" autofocus="autofocus">
+	</div>
+		<hr>
+	<p>Bitte wählen Sie, welche Module für diese Konfiguration verwendet werden sollen.</p>
+	{{#groups}}
+		<div class="panel panel-default">
+			<div class="slx-litehead">{{group}}</div>
+			<div class="panel-body">
+			{{#modules}}
+				<div class="input-group">
+					<span class="input-group-addon">
+						{{#unique}}
+						<input type="radio" name="module[{{groupid}}]" value="{{moduleid}}">
+						{{/unique}}
+						{{^unique}}
+						<input type="checkbox" name="module[{{moduleid}}]" value="{{moduleid}}">
+						{{/unique}}
+					</span>
+					<span class="form-control">{{title}}</span>
+					{{#missing}}
+					<span class="input-group-addon" title="Modul beschädigt! Bitte neu generieren."><span class="red glyphicon glyphicon-exclamation-sign"></span></span>
+					{{/missing}}
+				</div>
+			{{/modules}}
+			</div>
+		</div>
+	{{/groups}}
+	<div class="pull-right">
+		<button type="submit" class="btn btn-primary">Weiter &raquo;</button>
+	</div>
+</form>
diff --git a/templates/sysconfig/custom-fileselect.html b/templates/sysconfig/custom-fileselect.html
index 5a0a26f3..21537c49 100644
--- a/templates/sysconfig/custom-fileselect.html
+++ b/templates/sysconfig/custom-fileselect.html
@@ -1,12 +1,12 @@
 <form role="form" method="post" action="?do=SysConfig&amp;action=addmodule&amp;step={{step}}">
 	<input type="hidden" name="modid" value="{{modid}}">
+	<input type="hidden" name="token" value="{{token}}">
 	<div class="input-group">
 		<span class="input-group-addon">Modulname</span>
 		<input type="text" name="title" class="form-control" placeholder="Mein Konfigurationsmodul" autofocus="autofocus">
 	</div>
 		<hr>
-	<p>Hier haben Sie die Möglichkeit, den Inhalt des Archivs noch einmal zu überprüfen, und
-		die Liste der zu übernehmenden Dateien bei Bedarf noch einschränken.</p>
+	<p>Hier haben Sie die Möglichkeit, den Inhalt des Archivs noch einmal zu überprüfen.</p>
 	<table class="table table-bordered table-condensed">
 	{{#files}}
 		<tr>
diff --git a/templates/sysconfig/custom-upload.html b/templates/sysconfig/custom-upload.html
index c5a43522..1f312009 100644
--- a/templates/sysconfig/custom-upload.html
+++ b/templates/sysconfig/custom-upload.html
@@ -7,6 +7,7 @@
 	so wird auf einem gebooteten Client diese Datei als <strong>/etc/beispiel.conf</strong> zu finden sein.</p>
 
 <form role="form" enctype="multipart/form-data" method="post" action="?do=SysConfig&amp;action=addmodule&amp;step={{step}}">
+	<input type="hidden" name="token" value="{{token}}">
 	<div class="input-group">
 		<span class="input-group-addon">Archiv</span>
 		<input class="form-control" type="file" name="modulefile">