OO style modules

16 files changed, 91 insertions, 27 deletions

diff --git a/templates/dialog-generic.html b/templates/dialog-generic.html
index 5e875e8b..929400a5 100644
--- a/templates/dialog-generic.html
+++ b/templates/dialog-generic.html
@@ -1,5 +1,5 @@
 <div class="container">
-	<div class="modal-dialog">
+	<div class="modal-dialog slx-dialog">
 		<div class="modal-content">
 			<div class="modal-header">
 				<h4 class="modal-title">{{title}}</h4>
diff --git a/templates/main-menu.html b/templates/main-menu.html
index 4a912f46..733f901f 100644
--- a/templates/main-menu.html
+++ b/templates/main-menu.html
@@ -7,19 +7,19 @@
 				<span class="icon-bar"></span>
 				<span class="icon-bar"></span>
 			</button>
-			<a class="navbar-brand" href="?do=main">OpenSLX Admin</a>
+			<a class="navbar-brand" href="?do=Main">OpenSLX Admin</a>
 		</div>
 		<div class="navbar-collapse collapse">
 			<ul class="nav navbar-nav">
 				<li><a href="#about">Hilfe</a></li>
-				<li><a href="?do=syslog">Client Logs</a></li>
+				<li><a href="?do=SysLog">Client Logs</a></li>
 				<li class="dropdown">
 					<a href="#" class="dropdown-toggle" data-toggle="dropdown">Einstellungen<b class="caret"></b></a>
 					<ul class="dropdown-menu">
-						<li><a href="?do=minilinux">MiniLinux</a></li>
-						<li><a href="?do=baseconfig">KonfigurationsVariablen</a></li>
-						<li><a href="?do=sysconfig">SystemKonfiguration</a></li>
-						<li><a href="?do=ipxe">iPXE</a></li>
+						<li><a href="?do=MiniLinux">MiniLinux</a></li>
+						<li><a href="?do=BaseConfig">KonfigurationsVariablen</a></li>
+						<li><a href="?do=SysConfig">SystemKonfiguration</a></li>
+						<li><a href="?do=iPxe">iPXE</a></li>
 						<li class="divider"></li>
 						<li class="dropdown-header">Nav header</li>
 						<li><a href="#">1</a></li>
diff --git a/templates/menu-login.html b/templates/menu-login.html
index c5ee6a2a..89b22adf 100644
--- a/templates/menu-login.html
+++ b/templates/menu-login.html
@@ -1 +1 @@
-<li><a href="?do=session&amp;action=login">Anmelden</a></li>
+<li><a href="?do=Session&amp;action=login">Anmelden</a></li>
diff --git a/templates/menu-logout.html b/templates/menu-logout.html
index 68cf4671..17e53985 100644
--- a/templates/menu-logout.html
+++ b/templates/menu-logout.html
@@ -1 +1 @@
-<li><a href="?do=session&amp;action=logout&amp;token={{{token}}}"><b>{{user}}</b> (abmelden)</a></li>
+<li><a href="?do=Session&amp;action=logout&amp;token={{{token}}}"><b>{{user}}</b> (abmelden)</a></li>
diff --git a/templates/page-adduser.html b/templates/page-adduser.html
index 8fca8610..cd317457 100644
--- a/templates/page-adduser.html
+++ b/templates/page-adduser.html
@@ -1,5 +1,5 @@
 <div class="container">
-	<form class="form-adduser" action="?do=adduser" method="post">
+	<form class="form-adduser" action="?do=AddUser" method="post">
 		<h2 class="form-signin-heading">Benutzer anlegen</h2>
 		<div class="row">
 			<div class="col-md-4">Benutzerkennung</div>
diff --git a/templates/page-baseconfig.html b/templates/page-baseconfig.html
index 2dbe4736..e8511fb2 100644
--- a/templates/page-baseconfig.html
+++ b/templates/page-baseconfig.html
@@ -1,6 +1,6 @@
 <div class="container">
 	<h1>Basiskonfiguration</h1>
-	<form action="?do=baseconfig" method="post">
+	<form action="?do=BaseConfig" method="post">
 		{{#categories}}
 		<div class="panel panel-default">
 			<div class="panel-heading">{{category_name}}</div>
diff --git a/templates/page-login.html b/templates/page-login.html
index c09db8ae..9696e31d 100644
--- a/templates/page-login.html
+++ b/templates/page-login.html
@@ -1,5 +1,5 @@
 <div class="container">
-	<form class="form-signin" action="?do=session" method="post">
+	<form class="form-signin" action="?do=Session" method="post">
 		<h2 class="form-signin-heading">Anmeldung</h2>
 		<input type="text" name="user" class="form-control" placeholder="Benutzerkennung" autofocus>
 		<input type="password" name="pass" class="form-control" placeholder="Passwort">
@@ -7,7 +7,7 @@
 			<input type="checkbox" name="remember" value="remember-me"> Angemeldet bleiben
 		</label>
 		<button class="btn btn-lg btn-primary btn-block" type="submit">Anmelden</button>
-		<a class="btn btn-lg btn-primary btn-block" href="?do=adduser">Registrieren</a>
+		<a class="btn btn-lg btn-primary btn-block" href="?do=AddUser">Registrieren</a>
 		<input type="hidden" name="action" value="login">
 	</form>
 </div>
diff --git a/templates/page-main-guest.html b/templates/page-main-guest.html
index f580e9f5..8867ccf8 100644
--- a/templates/page-main-guest.html
+++ b/templates/page-main-guest.html
@@ -1,5 +1,5 @@
 <div class="jumbotron">
 	<h1>Willkommen</h1>
 	<p>Dies ist das Administrations-Interface der lokalen bwLehrpool-Installation. Bitte authentifizieren Sie sich, um Einstellungen vorzunehmen.</p>
-	<p><a  href="?do=session&amp;action=login" class="btn btn-primary btn-lg">Anmelden &raquo;</a></p>
+	<p><a  href="?do=Session&amp;action=login" class="btn btn-primary btn-lg">Anmelden &raquo;</a></p>
 </div>
diff --git a/templates/page-main.html b/templates/page-main.html
index 6d35b9f3..9ca60fbc 100644
--- a/templates/page-main.html
+++ b/templates/page-main.html
@@ -4,19 +4,19 @@
 	{{#ipxe}}
 		<div class="alert alert-warning">
 			<p>Das iPXE-Modul des Servers ist veraltet oder nicht vorhanden.</p>
-			<a class="btn btn-large btn-primary" href="?do=ipxe">iPXE compilieren</a>
+			<a class="btn btn-large btn-primary" href="?do=iPxe">iPXE compilieren</a>
 		</div>
 	{{/ipxe}}
 	{{#minilinux}}
 		<div class="alert alert-warning">
 			<p>Wichtige Dateien der MiniLinux-Installation fehlen.</p>
-			<a class="btn btn-large btn-primary" href="?do=minilinux">MiniLinux herunterladen</a>
+			<a class="btn btn-large btn-primary" href="?do=MiniLinux">MiniLinux herunterladen</a>
 		</div>
 	{{/minilinux}}
 	{{#sysconfig}}
 		<div class="alert alert-warning">
 			<p>Es wurde noch keine Systemkonfiguration ausgewählt..</p>
-			<a class="btn btn-large btn-primary" href="?do=sysconfig">Systemkonfiguration festlegen</a>
+			<a class="btn btn-large btn-primary" href="?do=SysConfig">Systemkonfiguration festlegen</a>
 		</div>
 	{{/sysconfig}}
 </div>
diff --git a/templates/page-remote-tgz-list.html b/templates/page-remote-tgz-list.html
index ef4435db..8ea80673 100644
--- a/templates/page-remote-tgz-list.html
+++ b/templates/page-remote-tgz-list.html
@@ -1,6 +1,6 @@
 <ol class="breadcrumb">
-	<li><a href="?do=main">Start</a></li>
-	<li><a href="?do=sysconfig">SystemKonfiguration</a></li>
+	<li><a href="?do=Main">Start</a></li>
+	<li><a href="?do=SysConfig">SystemKonfiguration</a></li>
 	<li class="active">Zentral verfügbare Konfigurationen</li>
 </ol>
 <div class="container">
diff --git a/templates/page-sysconfig-main.html b/templates/page-sysconfig-main.html
index c160fd0b..32b3a6bd 100644
--- a/templates/page-sysconfig-main.html
+++ b/templates/page-sysconfig-main.html
@@ -1,5 +1,5 @@
 <ol class="breadcrumb">
-	<li><a href="?do=main">Start</a></li>
+	<li><a href="?do=Main">Start</a></li>
 	<li class="active">SystemKonfiguration</li>
 </ol>
 <div class="container">
@@ -14,7 +14,7 @@
 				<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>
+						<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>
@@ -40,8 +40,8 @@
 			<tr>
 				<td>{{module}}</td>
 				<td nowrap>
-					<a class="btn btn-default btn-xs">Bearbeiten</a>
-					<a class="btn btn-danger btn-xs">Löschen</a>
+					<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}}
@@ -50,7 +50,7 @@
 		<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>
+			<a class="btn btn-primary" href="?do=SysConfig&amp;action=addmodule">Neues Modul erstellen</a>
 		</div>
 	</div>
 </div>
diff --git a/templates/page-syslog.html b/templates/page-syslog.html
index c16d8da1..eb2f4caa 100644
--- a/templates/page-syslog.html
+++ b/templates/page-syslog.html
@@ -1,6 +1,7 @@
 <div class="container">
 	<h1>Client Log</h1>
-	<form method="post" action="?do=syslog">
+	<form method="post" action="?do=SysLog">
+		<input type="hidden" name="token" value="{{token}}">
 		<div class="input-group">
 			<span class="input-group-addon">Filter</span>
 			<input id="filterstring" type="text" placeholder="event-id" value="{{filter}}" name="filter" data-role="tagsinput" />
diff --git a/templates/sysconfig/ad-start.html b/templates/sysconfig/ad-start.html
new file mode 100644
index 00000000..0ce4bbf3
--- /dev/null
+++ b/templates/sysconfig/ad-start.html
@@ -0,0 +1,51 @@
+<p>
+	Zum Einrichten der Benutzerauthentifizierung über ein Active Directory wird neben der Adresse
+	des anzusprechenden Servers ein dedizierter Benutzer im AD benötigt, über welchen das AD angesprochen wird.
+	<br>
+	Dieser Benutzer benötigt keine besonderen Rechte, Sie können diesem Benutzer zur Sicherheit auch die
+	Rechte zum Anmelden entziehen. Der Benutzer muss lediglich ausreichende Berechtigungen haben, um einen
+	LDAP-Bind am AD durchzuführen, und nach Benutzern zu suchen.
+	<br>
+	Im Folgenden muss der <strong>Distinguished Name</strong> des Benutzers angegeben werden. Diesen können Sie ermitteln,
+	indem Sie das Kommandozeilenprogramm <strong>dsquery</strong> auf einem Domain Controller wie folgt aufrufen:
+</p>
+<pre>dsquery user -name &quot;Benutzername&quot;</pre>
+<p>
+	Nach Eingabe aller benötigten Daten wird im nächsten Schritt überprüft, ob die Kommunikation mit
+	dem AD möglich ist.
+</p>
+
+<form role="form" method="post" action="?do=SysConfig&amp;action=addmodule&amp;step={{step}}">
+	<div class="input-group">
+		<span class="input-group-addon slx-ga">Server</span>
+		<input name="server" value="{{server}}" type="text" class="form-control" placeholder="dc0.institution.example.com">
+		<span class="input-group-btn">
+			<button class="btn btn-default" type="button"><span class="glyphicon glyphicon-question-sign"></span></button>
+		</span>
+	</div>
+	<div class="input-group">
+		<span class="input-group-addon slx-ga">Suchbasis</span>
+		<input name="searchbase" value="{{searchbase}}" type="text" class="form-control" placeholder="dc=windows,dc=hs-beispiel,dc=de">
+		<span class="input-group-btn">
+			<button class="btn btn-default" type="button"><span class="glyphicon glyphicon-question-sign"></span></button>
+		</span>
+	</div>
+	<div class="input-group">
+		<span class="input-group-addon slx-ga">Bind DN</span>
+		<input name="binddn" value="{{binddn}}" type="text" class="form-control" placeholder="CN=bwlehrpool user,OU=Benutzer,OU=Gruppe XYZ,DC=windows,DC=hs-beispiel,DC=de">
+		<span class="input-group-btn">
+			<button class="btn btn-default" type="button"><span class="glyphicon glyphicon-question-sign"></span></button>
+		</span>
+	</div>
+	<div class="input-group">
+		<span class="input-group-addon slx-ga">Passwort</span>
+		<input name="bindpw" value="{{bindpw}}" type="text" class="form-control" placeholder="Paswort von 'bwlehrpool user'">
+		<span class="input-group-btn">
+			<button class="btn btn-default" type="button"><span class="glyphicon glyphicon-question-sign"></span></button>
+		</span>
+	</div>
+	<br>
+	<div class="pull-right">
+		<button type="submit" class="btn btn-primary">Weiter &raquo;</button>
+	</div>
+</form>
\ No newline at end of file
diff --git a/templates/sysconfig/custom-fileselect.html b/templates/sysconfig/custom-fileselect.html
index c61edc7f..5a0a26f3 100644
--- a/templates/sysconfig/custom-fileselect.html
+++ b/templates/sysconfig/custom-fileselect.html
@@ -1,4 +1,4 @@
-<form role="form" method="post" action="?do=sysconfig&amp;action=addmodule&amp;step={{step}}">
+<form role="form" method="post" action="?do=SysConfig&amp;action=addmodule&amp;step={{step}}">
 	<input type="hidden" name="modid" value="{{modid}}">
 	<div class="input-group">
 		<span class="input-group-addon">Modulname</span>
diff --git a/templates/sysconfig/custom-upload.html b/templates/sysconfig/custom-upload.html
index 2c0ff723..c5a43522 100644
--- a/templates/sysconfig/custom-upload.html
+++ b/templates/sysconfig/custom-upload.html
@@ -6,7 +6,7 @@
 <p>Beispiel: Enthält das hochgeladene Archiv eine Datei <strong>etc/beispiel.conf</strong>,
 	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}}">
+<form role="form" enctype="multipart/form-data" method="post" action="?do=SysConfig&amp;action=addmodule&amp;step={{step}}">
 	<div class="input-group">
 		<span class="input-group-addon">Archiv</span>
 		<input class="form-control" type="file" name="modulefile">
diff --git a/templates/sysconfig/start.html b/templates/sysconfig/start.html
new file mode 100644
index 00000000..68777329
--- /dev/null
+++ b/templates/sysconfig/start.html
@@ -0,0 +1,12 @@
+<p>Bitte wählen Sie aus, welche Art Konfigurationsmodul Sie erstellen möchten.</p>
+
+{{#modules}}
+<div class="panel panel-default">
+	<div class="panel-heading">
+		{{title}} <a href="?do=SysConfig&amp;action=addmodule&amp;step={{startClass}}" class="pull-right btn btn-primary btn-xs"><span class="glyphicon glyphicon-plus"></span> Hinzufügen</a>
+	</div>
+	<div class="panel-body">
+		{{description}}
+	</div>
+</div>
+{{/modules}}