No reason to put a container into a container everywhere

5 files changed, 114 insertions, 87 deletions

diff --git a/templates/sysconfig/_page.html b/templates/sysconfig/_page.html
index af0d598a..0fe46d0b 100644
--- a/templates/sysconfig/_page.html
+++ b/templates/sysconfig/_page.html
@@ -1,84 +1,85 @@
-<div class="container">
-	<div class="panel panel-default">
-		<div class="panel-heading">
-			{{lang_availableSystem}}
-			<a class="btn btn-default" data-toggle="modal" data-target="#help-config"><span class="glyphicon glyphicon-question-sign"></span></a>
-		</div>
-		<div class="panel-body">
-			<form method="post" action="?do=SysConfig">
-				<input type="hidden" name="token" value="{{token}}">
-				<input type="hidden" name="action" value="config">
-				<table class="slx-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>
-									{{lang_activate}}
-								</button>
-							{{/current}}
-							{{#current}}
-								<span class="btn btn-success btn-xs">
-									<span class="glyphicon glyphicon-ok"></span>
-									{{lang_active}}
-								</span>
-							{{/current}}
-						</td>
-						<td>
-							<button class="btn btn-danger btn-xs" name="del" value="{{configid}}"><span class="glyphicon glyphicon-trash"></span> {{lang_delete}}</button>
-						</td>
-					</tr>
-				{{/configs}}
-				</table>
-				{{^configs}}
-				<div class="alert alert-warning">
-					{{lang_systemConfigurationNotFound}}
-				</div>
-				{{^modules}}
-				<div class="alert alert-danger">
-					{{lang_systemConfigurationAlert}}
-				</div>
-				{{/modules}}
-				{{/configs}}
-			</form>
-		</div>
-		<div class="panel-footer">			
-			<a class="btn btn-primary" href="?do=SysConfig&amp;action=addconfig">{{lang_newConfiguration}}</a>
-		</div>
+<div class="panel panel-default">
+	<div class="panel-heading">
+		{{lang_availableSystem}}
+		<a class="btn btn-default" data-toggle="modal" data-target="#help-config"><span class="glyphicon glyphicon-question-sign"></span></a>
 	</div>
-	<div class="panel panel-default">
-		<div class="panel-heading">
-			{{lang_availableModules}}
-			<a class="btn btn-default" data-toggle="modal" data-target="#help-module"><span class="glyphicon glyphicon-question-sign"></span></a>
-		</div>
-		<div class="panel-body">
-			<form method="post" action="?do=SysConfig">
-				<input type="hidden" name="token" value="{{token}}">
-				<input type="hidden" name="action" value="module">
-				<table class="slx-table">
-				{{#modules}}
-					<tr>
-						<td>{{module}}</td>
-						<td>
-							<button class="btn btn-default btn-xs" name="list" value="{{moduleid}}"><span class="glyphicon glyphicon-eye-open"></span> {{lang_show}}</button>
-							<!-- 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> {{lang_delete}}</button>
-						</td>
-					</tr>
-				{{/modules}}
-				</table>
-				{{^modules}}
-				<div class="alert alert-warning">{{lang_configurationModuleNotFound}}</div>
-				{{/modules}}
-			</form>
-		</div>
-		<div class="panel-footer">
-			<a class="btn btn-primary" href="?do=SysConfig&amp;action=addmodule">{{lang_newModule}}</a>
-		</div>
+	<div class="panel-body">
+		<form method="post" action="?do=SysConfig">
+			<input type="hidden" name="token" value="{{token}}">
+			<input type="hidden" name="action" value="config">
+			<table class="slx-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>
+								{{lang_activate}}
+							</button>
+						{{/current}}
+						{{#current}}
+							<span class="btn btn-success btn-xs">
+								<span class="glyphicon glyphicon-ok"></span>
+								{{lang_active}}
+							</span>
+						{{/current}}
+					</td>
+					<td>
+						<button class="btn btn-default btn-xs" name="list" value="{{configid}}"><span class="glyphicon glyphicon-eye-open"></span> {{lang_show}}</button>
+					</td>
+					<td>
+						<button class="btn btn-danger btn-xs" name="del" value="{{configid}}"><span class="glyphicon glyphicon-trash"></span> {{lang_delete}}</button>
+					</td>
+				</tr>
+			{{/configs}}
+			</table>
+			{{^configs}}
+			<div class="alert alert-warning">
+				{{lang_systemConfigurationNotFound}}
+			</div>
+			{{^modules}}
+			<div class="alert alert-danger">
+				{{lang_systemConfigurationAlert}}
+			</div>
+			{{/modules}}
+			{{/configs}}
+		</form>
+	</div>
+	<div class="panel-footer">			
+		<a class="btn btn-primary" href="?do=SysConfig&amp;action=addconfig">{{lang_newConfiguration}}</a>
+	</div>
+</div>
+<div class="panel panel-default">
+	<div class="panel-heading">
+		{{lang_availableModules}}
+		<a class="btn btn-default" data-toggle="modal" data-target="#help-module"><span class="glyphicon glyphicon-question-sign"></span></a>
+	</div>
+	<div class="panel-body">
+		<form method="post" action="?do=SysConfig">
+			<input type="hidden" name="token" value="{{token}}">
+			<input type="hidden" name="action" value="module">
+			<table class="slx-table">
+			{{#modules}}
+				<tr>
+					<td>{{module}}</td>
+					<td>
+						<button class="btn btn-default btn-xs" name="list" value="{{moduleid}}"><span class="glyphicon glyphicon-eye-open"></span> {{lang_show}}</button>
+						<!-- 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> {{lang_delete}}</button>
+					</td>
+				</tr>
+			{{/modules}}
+			</table>
+			{{^modules}}
+			<div class="alert alert-warning">{{lang_configurationModuleNotFound}}</div>
+			{{/modules}}
+		</form>
+	</div>
+	<div class="panel-footer">
+		<a class="btn btn-primary" href="?do=SysConfig&amp;action=addmodule">{{lang_newModule}}</a>
 	</div>
 </div>
 
diff --git a/templates/sysconfig/ad-checkconnection.html b/templates/sysconfig/ad-checkconnection.html
index eb4afea2..0a1a8103 100644
--- a/templates/sysconfig/ad-checkconnection.html
+++ b/templates/sysconfig/ad-checkconnection.html
@@ -10,6 +10,7 @@
 <div class="pull-left">
 	<form role="form" method="post" action="?do=SysConfig&amp;action=addmodule&amp;step=AdModule_Start">
 		<input type="hidden" name="token" value="{{token}}">
+		<input name="title" value="{{title}}" type="hidden">
 		<input name="server" value="{{server}}" type="hidden">
 		<input name="searchbase" value="{{searchbase}}" type="hidden">
 		<input name="binddn" value="{{binddn}}" type="hidden">
@@ -21,6 +22,7 @@
 <div class="pull-right">
 	<form role="form" method="post" action="?do=SysConfig&amp;action=addmodule&amp;step={{step}}">
 		<input type="hidden" name="token" value="{{token}}">
+		<input name="title" value="{{title}}" type="hidden">
 		<input name="server" value="{{server}}" type="hidden">
 		<input name="searchbase" value="{{searchbase}}" type="hidden">
 		<input id="setdn" name="binddn" value="{{binddn}}" type="hidden">
diff --git a/templates/sysconfig/ad-start.html b/templates/sysconfig/ad-start.html
index f14f639b..007bc8db 100644
--- a/templates/sysconfig/ad-start.html
+++ b/templates/sysconfig/ad-start.html
@@ -13,29 +13,33 @@
 <form role="form" 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 slx-ga">{{lang_moduleTitle}}</span>
+		<input tabindex="1" name="title" value="{{title}}" type="text" class="form-control">
+	</div>
+	<div class="input-group">
 		<span class="input-group-addon slx-ga">Server *</span>
-		<input tabindex="1" name="server" value="{{server}}" type="text" class="form-control" placeholder="dc0.institution.example.com">
+		<input tabindex="2" name="server" value="{{server}}" type="text" class="form-control" placeholder="dc0.institution.example.com">
 		<!--span class="input-group-btn">
 			<a class="btn btn-default"><span class="glyphicon glyphicon-question-sign"></span></a>
 		</span-->
 	</div>
 	<div class="input-group">
 		<span class="input-group-addon slx-ga">{{lang_bindDN}} *</span>
-		<input tabindex="2" name="binddn" value="{{binddn}}" type="text" class="form-control" placeholder="domain\bwlp *ODER* CN=bwlp,OU=Benutzer,DC=domain,DC=hs-beispiel,DC=de">
+		<input tabindex="3" name="binddn" value="{{binddn}}" type="text" class="form-control" placeholder="domain\bwlp *ODER* CN=bwlp,OU=Benutzer,DC=domain,DC=hs-beispiel,DC=de">
 		<!--span class="input-group-btn">
 			<a class="btn btn-default"><span class="glyphicon glyphicon-question-sign"></span></a>
 		</span-->
 	</div>
 	<div class="input-group">
 		<span class="input-group-addon slx-ga">{{lang_password}} *</span>
-		<input tabindex="3" name="bindpw" value="{{bindpw}}" type="text" class="form-control" placeholder="{{lang_password}}">
+		<input tabindex="4" name="bindpw" value="{{bindpw}}" type="text" class="form-control" placeholder="{{lang_password}}">
 		<!--span class="input-group-btn">
 			<a class="btn btn-default"><span class="glyphicon glyphicon-question-sign"></span></a>
 		</span-->
 	</div>
 	<div class="input-group">
 		<span class="input-group-addon slx-ga">{{lang_searchBase}}</span>
-		<input tabindex="4" name="searchbase" value="{{searchbase}}" type="text" class="form-control" placeholder="dc=windows,dc=hs-beispiel,dc=de">
+		<input tabindex="5" name="searchbase" value="{{searchbase}}" type="text" class="form-control" placeholder="dc=windows,dc=hs-beispiel,dc=de">
 		<!--span class="input-group-btn">
 			<a class="btn btn-default"><span class="glyphicon glyphicon-question-sign"></span></a>
 		</span-->
@@ -43,7 +47,7 @@
 	<br>
 	<div class="input-group">
 		<span class="input-group-addon slx-ga">Home</span>
-		<input tabindex="4" name="home" value="{{home}}" type="text" class="form-control" placeholder="\\server.example.com\%s">
+		<input tabindex="6" name="home" value="{{home}}" type="text" class="form-control" placeholder="\\server.example.com\%s">
 		<span class="input-group-btn">
 			<a class="btn btn-default" data-toggle="modal" data-target="#help-home"><span class="glyphicon glyphicon-question-sign"></span></a>
 		</span>
@@ -60,7 +64,10 @@
 			<div class="modal-header">{{lang_userDirectory}}</div>
 			<div class="modal-body">
 				<p>
-					{{lang_userDirectoryInfo1}} <pre>\\fileserv.uni.example.com\users\%s</pre>
+					{{lang_userDirectoryInfo1}}
+				</p>
+				<pre>\\fileserv.uni.example.com\users\%s</pre>
+				<p>
 					{{lang_userDirectoryInfo2}}
 				</p>
 				<p>
diff --git a/templates/sysconfig/cfg-start.html b/templates/sysconfig/cfg-start.html
index 44119dd3..6a810e5c 100644
--- a/templates/sysconfig/cfg-start.html
+++ b/templates/sysconfig/cfg-start.html
@@ -1,7 +1,7 @@
 <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">{{lang_name}}</span>
+		<span class="input-group-addon">{{lang_name}} *</span>
 		<input type="text" name="title" class="form-control" placeholder="{{lang_configuration}}" autofocus="autofocus">
 	</div>
 		<hr>
diff --git a/templates/sysconfig/config-module-list.html b/templates/sysconfig/config-module-list.html
new file mode 100644
index 00000000..6cd77f9e
--- /dev/null
+++ b/templates/sysconfig/config-module-list.html
@@ -0,0 +1,17 @@
+<form method="post" action="?do=SysConfig">
+	<input type="hidden" name="token" value="{{token}}">
+	<input type="hidden" name="action" value="module">
+	<table class="slx-table">
+		{{#modules}}
+		<tr>
+			<td>{{module}}</td>
+			<td>
+				<button class="btn btn-default btn-xs" name="list" value="{{moduleid}}"><span class="glyphicon glyphicon-eye-open"></span> {{lang_show}}</button>
+			</td>
+		</tr>
+		{{/modules}}
+	</table>
+	{{^modules}}
+	<div class="alert alert-warning">{{lang_noContent}}</div>
+	{{/modules}}
+</form>
\ No newline at end of file