From 69474904127814baa06668488bd67772ad417b6a Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Mon, 25 Sep 2017 18:16:10 +0200
Subject: [sysconfig][baseconfig] fixed inconsistencies

---
 .../sysconfig/lang/de/template-tags.json           |  2 +-
 .../sysconfig/lang/en/template-tags.json           |  2 +-
 modules-available/sysconfig/page.inc.php           |  3 ++
 .../sysconfig/templates/ad-start.html              | 33 ++++++++++++---------
 .../templates/ad_ldap-checkconnection.html         |  4 +--
 .../sysconfig/templates/branding-check.html        |  3 +-
 .../sysconfig/templates/branding-start.html        |  3 +-
 .../sysconfig/templates/cfg-finish.html            |  8 +++--
 .../sysconfig/templates/cfg-start.html             |  5 +++-
 .../sysconfig/templates/ldap-start.html            | 34 ++++++++++++----------
 .../sysconfig/templates/list-configs.html          |  8 +++--
 .../sysconfig/templates/list-modules.html          |  8 +++--
 .../sysconfig/templates/sshconfig-start.html       | 12 ++++----
 modules-available/sysconfig/templates/start.html   |  2 +-
 .../sysconfig/templates/sysconfig_heading.html     |  1 +
 15 files changed, 77 insertions(+), 51 deletions(-)
 create mode 100644 modules-available/sysconfig/templates/sysconfig_heading.html

(limited to 'modules-available/sysconfig')

diff --git a/modules-available/sysconfig/lang/de/template-tags.json b/modules-available/sysconfig/lang/de/template-tags.json
index d3b0bb9f..900b67a8 100644
--- a/modules-available/sysconfig/lang/de/template-tags.json
+++ b/modules-available/sysconfig/lang/de/template-tags.json
@@ -109,7 +109,7 @@
     "lang_supportedFiles": "Unterst\u00fctzte Archivformate",
     "lang_systemConfiguration": "Systemkonfiguration",
     "lang_systemConfigurationAlert": "Bevor Sie eine Systemkonfiguration erstellen k\u00f6nnen, m\u00fcssen Sie zun\u00e4chst ein Konfigurationsmodul erzeugen.",
-    "lang_systemConfigurationNotFound": "Keine Systemkonfigurationen gefunden.Erstellen Sie eine neue Konfiguration aus den unten aufgef\u00fchrten Konfigurationsmodulen.",
+    "lang_systemConfigurationNotFound": "Keine Systemkonfigurationen gefunden. Erstellen Sie eine neue Konfiguration aus den unten aufgef\u00fchrten Konfigurationsmodulen.",
     "lang_title": "Titel",
     "lang_to": "Zur",
     "lang_toSystemConfiguration": "Zur Systemkonfiguration",
diff --git a/modules-available/sysconfig/lang/en/template-tags.json b/modules-available/sysconfig/lang/en/template-tags.json
index 1374d87f..6a482772 100644
--- a/modules-available/sysconfig/lang/en/template-tags.json
+++ b/modules-available/sysconfig/lang/en/template-tags.json
@@ -37,7 +37,7 @@
     "lang_determiningHomeDirectory": "Trying to determine home directory attribute...",
     "lang_dnLookup": "Looking up bind dn",
     "lang_download": "Download",
-    "lang_downloadLong": "Download module \"as is\".",
+    "lang_downloadLong": "Download module \"as it is\".",
     "lang_driveLetterNote": "IMPORTANT: Pick a drive letter for the home directory that will be free in the Virtual Machines. Otherwise, a random letter will be assigned.",
     "lang_editLong": "Edit module or configuration.",
     "lang_editingLocationInfo": "You're setting the configuration for a specific location, not the global one",
diff --git a/modules-available/sysconfig/page.inc.php b/modules-available/sysconfig/page.inc.php
index e9fcdee9..c169f490 100644
--- a/modules-available/sysconfig/page.inc.php
+++ b/modules-available/sysconfig/page.inc.php
@@ -135,6 +135,9 @@ class Page_SysConfig extends Page
 	 */
 	protected function doRender()
 	{
+
+		Render::addTemplate('sysconfig_heading');
+
 		$action = Request::any('action', 'list');
 		switch ($action) {
 		case 'addmodule':
diff --git a/modules-available/sysconfig/templates/ad-start.html b/modules-available/sysconfig/templates/ad-start.html
index 1f8e1e01..0a14a44c 100644
--- a/modules-available/sysconfig/templates/ad-start.html
+++ b/modules-available/sysconfig/templates/ad-start.html
@@ -1,8 +1,10 @@
 <p>
 	{{lang_adText1}}
 	<br>
+	<br/>
 	{{lang_adText2}}
 	<br>
+	<br/>
 	{{lang_adText3}}
 </p>
 <pre>dsquery user -name &quot;Username&quot;</pre>
@@ -18,35 +20,35 @@
 	<input type="hidden" name="token" value="{{token}}">
 	<input type="hidden" name="edit" value="{{edit}}">
 	<div class="input-group">
-		<span class="input-group-addon slx-ga">{{lang_moduleTitle}}</span>
+		<span style="min-width:150px;" class="input-group-addon slx-ga">{{lang_moduleTitle}}</span>
 		<input tabindex="1" name="title" value="{{title}}" type="text" class="form-control" autofocus>
 	</div>
 	<div class="input-group">
-		<span class="input-group-addon slx-ga">Server *</span>
+		<span style="min-width:150px;" class="input-group-addon slx-ga">Server *</span>
 		<input tabindex="2" name="server" value="{{server}}" type="text" class="form-control" placeholder="dc0.institution.example.com">
 	</div>
 	<div class="input-group">
-		<span class="input-group-addon slx-ga">{{lang_bindDN}} *</span>
+		<span style="min-width:150px;" class="input-group-addon slx-ga">{{lang_bindDN}} *</span>
 		<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">
 	</div>
 	<div class="input-group">
-		<span class="input-group-addon slx-ga">{{lang_password}} *</span>
+		<span style="min-width:150px;" class="input-group-addon slx-ga">{{lang_password}} *</span>
 		<input tabindex="4" name="bindpw" value="{{bindpw}}" type="{{password_type}}" class="form-control" placeholder="{{lang_password}}">
 	</div>
 	<div class="input-group">
-		<span class="input-group-addon slx-ga">{{lang_searchBase}}</span>
+		<span style="min-width:150px;" class="input-group-addon slx-ga">{{lang_searchBase}}</span>
 		<input tabindex="5" name="searchbase" value="{{searchbase}}" type="text" class="form-control" placeholder="dc=windows,dc=hs-beispiel,dc=de">
 	</div>
 	<br>
 	<div class="input-group">
-		<span class="input-group-addon slx-ga">Home</span>
+		<span style="min-width:150px;" class="input-group-addon slx-ga">Home</span>
 		<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>
 	</div>
 	<div class="input-group">
-		<span class="input-group-addon slx-ga">{{lang_homeAttr}}</span>
+		<span style="min-width:150px;" class="input-group-addon slx-ga">{{lang_homeAttr}}</span>
 		<input tabindex="6" name="homeattr" value="{{homeattr}}" type="text" class="form-control" placeholder="homeDirectory">
 		<span class="input-group-btn">
 			<a class="btn btn-default" data-toggle="modal" data-target="#help-homeattr"><span class="glyphicon glyphicon-question-sign"></span></a>
@@ -54,23 +56,26 @@
 	</div>
 	<br>
 	<div>
-		<label>
-			<input type="checkbox" name="fixnumeric" {{#fixnumeric}}checked{{/fixnumeric}}> {{lang_fixNumeric}}
-		</label>
+		<div class="checkbox">
+			<input type="checkbox" name="fixnumeric" {{#fixnumeric}}checked{{/fixnumeric}}>
+			<label><b>{{lang_fixNumeric}}</b></label>
+		</div>
 		<div>
 			<i>{{lang_fixNumericDescription}}</i>
 		</div>
 	</div>
 	<br>
 	<div>
-		<label>
-			<input type="checkbox" name="ssl" onchange="$('#cert-box').css('display', this.checked ? '' : 'none')" {{#ssl}}checked{{/ssl}}> {{lang_ssl}}
-		</label>
+		<div class="checkbox">
+			<input type="checkbox" name="ssl" onchange="$('#cert-box').css('display', this.checked ? '' : 'none')" {{#ssl}}checked{{/ssl}}>
+			<label><b>{{lang_ssl}}</b></label>
+		</div>
 		<div>
 			<i>{{lang_sslDescription}}</i>
 		</div>
 	</div>
 	<br/>
+
 	<hr>
 	<div class="btn-group">
 		<a class="btn btn-default" href="?do=SysConfig&action=addmodule">{{lang_back}}</a>
@@ -78,7 +83,9 @@
 	<div class="btn-group pull-right">
 		<button type="submit" class="btn btn-primary">{{lang_next}} &raquo;</button>
 	</div>
+
 	<div class="clearfix"></div>
+	<hr>
 	<div {{^ssl}}style="display:none"{{/ssl}} id="cert-box">
 		<div class="well well-sm" id="wcustom">
 			{{lang_customCertificate}}
diff --git a/modules-available/sysconfig/templates/ad_ldap-checkconnection.html b/modules-available/sysconfig/templates/ad_ldap-checkconnection.html
index f3194308..35c8f1ee 100644
--- a/modules-available/sysconfig/templates/ad_ldap-checkconnection.html
+++ b/modules-available/sysconfig/templates/ad_ldap-checkconnection.html
@@ -11,7 +11,7 @@
 <div id="supplied-cert-invalid" style="display:none" class="alert alert-danger">{{lang_userCertInvalid}}</div>
 <div id="trying-fingerprint" style="display:none" class="alert alert-warning">{{lang_tryingFingerprint}}</div>
 <br>
-<div class="pull-left">
+<div class="text-left">
 	<form role="form" method="post" action="?do=SysConfig&amp;action=addmodule&amp;step={{prev}}">
 		<input type="hidden" name="token" value="{{token}}">
 		<input type="hidden" name="edit" value="{{edit}}">
@@ -30,7 +30,7 @@
 		<button type="submit" class="btn btn-primary">&laquo; {{lang_back}}</button>
 	</form>
 </div>
-<div class="pull-right">
+<div class="text-right">
 	<form id="nextform" role="form" method="post" action="?do=SysConfig&amp;action=addmodule&amp;step={{next}}">
 		<input type="hidden" name="token" value="{{token}}">
 		<input type="hidden" name="edit" value="{{edit}}">
diff --git a/modules-available/sysconfig/templates/branding-check.html b/modules-available/sysconfig/templates/branding-check.html
index 1a021309..d48f9631 100644
--- a/modules-available/sysconfig/templates/branding-check.html
+++ b/modules-available/sysconfig/templates/branding-check.html
@@ -13,6 +13,7 @@
 </div>
 <div class="clearfix"></div>
 <div>{{error}}</div>
+<br/>
 <div>
 	<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}}">
@@ -25,7 +26,7 @@
 			<a class="btn btn-default" href="?do=SysConfig&action=addmodule&step=Branding_Start">{{lang_cancel}}</a>
 		</div>
 		<div class="btn-group pull-right">
-			<button type="submit" class="btn btn-primary">{{lang_save}}</button>
+			<button type="submit" class="btn btn-primary"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}</button>
 		</div>
 	</form>
 </div>
diff --git a/modules-available/sysconfig/templates/branding-start.html b/modules-available/sysconfig/templates/branding-start.html
index 7f2a0132..ddb5b3d9 100644
--- a/modules-available/sysconfig/templates/branding-start.html
+++ b/modules-available/sysconfig/templates/branding-start.html
@@ -8,9 +8,8 @@
 		<label for="input-url">{{lang_urlLoad}}</label>
 		<input class="form-control" type="text" name="url" id="input-url">
 	</div>
-	{{lang_or}}
 	<div class="form-group">
-		<label for="input-file">{{lang_computerLoad}}</label>
+		<label for="input-file">{{lang_or}} {{lang_computerLoad}}</label>
 			<div class="input-group upload-ex">
 				<input type="text" class="form-control" readonly placeholder="{{lang_selectFile}}">
 				<span class="input-group-btn">
diff --git a/modules-available/sysconfig/templates/cfg-finish.html b/modules-available/sysconfig/templates/cfg-finish.html
index c9622db0..21c7c690 100644
--- a/modules-available/sysconfig/templates/cfg-finish.html
+++ b/modules-available/sysconfig/templates/cfg-finish.html
@@ -6,8 +6,10 @@
 	<input type="hidden" name="token" value="{{token}}">
 	<input type="hidden" name="action" value="config">
 	<input type="hidden" name="activate" value="{{configid}}">
-	<div class="btn-group">
-		<button type="submit" class="btn btn-primary">{{lang_activateGlobally}}</button>
-		<a href="?do=SysConfig" class="btn btn-default">{{lang_backToSysconfig}}</a>
+	<div class="text-right">
+		<div class="btn-group">
+			<a href="?do=SysConfig" class="btn btn-default">{{lang_backToSysconfig}}</a>
+			<button type="submit" class="btn btn-primary">{{lang_activateGlobally}}</button>
+		</div>
 	</div>
 </form>
diff --git a/modules-available/sysconfig/templates/cfg-start.html b/modules-available/sysconfig/templates/cfg-start.html
index 8c33f0e5..6196d475 100644
--- a/modules-available/sysconfig/templates/cfg-start.html
+++ b/modules-available/sysconfig/templates/cfg-start.html
@@ -18,7 +18,10 @@
 						<input type="radio" name="module[{{groupid}}]" value="{{moduleid}}" id="module{{moduleid}}" {{#active}}checked{{/active}}>
 						{{/unique}}
 						{{^unique}}
-						<input type="checkbox" name="module[{{moduleid}}]" value="{{moduleid}}" id="module{{moduleid}}" {{#active}}checked{{/active}}>
+						<div class="checkbox">
+							<input type="checkbox" name="module[{{moduleid}}]" value="{{moduleid}}" id="module{{moduleid}}" {{#active}}checked{{/active}}>
+							<label></label>
+						</div>
 						{{/unique}}
 					</span>
 					<label class="form-control" for="module{{moduleid}}">{{title}}</label>
diff --git a/modules-available/sysconfig/templates/ldap-start.html b/modules-available/sysconfig/templates/ldap-start.html
index 22f4e2fa..c13b6939 100644
--- a/modules-available/sysconfig/templates/ldap-start.html
+++ b/modules-available/sysconfig/templates/ldap-start.html
@@ -10,32 +10,32 @@
 	<input type="hidden" name="token" value="{{token}}">
 	<input type="hidden" name="edit" value="{{edit}}">
 	<div class="input-group">
-		<span class="input-group-addon slx-ga">{{lang_moduleTitle}}</span>
+		<span style="min-width:150px;" 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>
+		<span style="min-width:150px;" class="input-group-addon slx-ga">Server *</span>
 		<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>
+		<span style="min-width:150px;" class="input-group-addon slx-ga">{{lang_bindDN}}</span>
 		<input tabindex="3" name="binddn" value="{{binddn}}" type="text" class="form-control" placeholder="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>
+		<span style="min-width:150px;" class="input-group-addon slx-ga">{{lang_password}}</span>
 		<input tabindex="4" name="bindpw" value="{{bindpw}}" type="{{password_type}}" 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>
+	<div style="min-width:150px;" class="input-group">
+		<span style="min-width:150px;" class="input-group-addon slx-ga">{{lang_searchBase}} *</span>
 		<input tabindex="5" name="searchbase" value="{{searchbase}}" type="text" class="form-control" placeholder="ou=users,dc=hochschule,dc=de">
 		<!--span class="input-group-btn">
 			<a class="btn btn-default"><span class="glyphicon glyphicon-question-sign"></span></a>
@@ -43,7 +43,7 @@
 	</div>
 	<br>
 	<div class="input-group">
-		<span class="input-group-addon slx-ga">Home</span>
+		<span style="min-width:150px;" class="input-group-addon slx-ga">Home</span>
 		<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>
@@ -51,23 +51,27 @@
 	</div>
 	<br>
 	<div>
-		<label>
-			<input type="checkbox" name="fixnumeric" {{#fixnumeric}}checked{{/fixnumeric}}> {{lang_fixNumeric}}
-		</label>
+		<div class="checkbox">
+			<input type="checkbox" name="fixnumeric" {{#fixnumeric}}checked{{/fixnumeric}}>
+			<label><b>{{lang_fixNumeric}}</b></label>
+		</div>
 		<div>
 			<i>{{lang_fixNumericDescription}}</i>
 		</div>
 	</div>
 	<br>
 	<div>
-		<label>
-			<input type="checkbox" name="ssl" onchange="$('#cert-box').css('display', this.checked ? '' : 'none')" {{#ssl}}checked{{/ssl}}> {{lang_ssl}}
-		</label>
+		<div class="checkbox">
+			<input type="checkbox" name="ssl" onchange="$('#cert-box').css('display', this.checked ? '' : 'none')" {{#ssl}}checked{{/ssl}}>
+			<label><b>{{lang_ssl}}</b></label>
+		</div>
+		<div>
+			<i>{{lang_sslDescription}}</i>
+		</div>
 	</div>
-	<i>{{lang_sslDescription}}</i>
 	<br>
 
-
+	<hr>
 
 	<div class="btn-group">
 		<a class="btn btn-default" href="?do=SysConfig&action=addmodule">{{lang_back}}</a>
diff --git a/modules-available/sysconfig/templates/list-configs.html b/modules-available/sysconfig/templates/list-configs.html
index d2cedca4..eb67d7a3 100644
--- a/modules-available/sysconfig/templates/list-configs.html
+++ b/modules-available/sysconfig/templates/list-configs.html
@@ -100,7 +100,7 @@
 			</form>
 		</div>
 		{{^locationid}}
-		<div class="panel-footer">
+		<div class="panel-footer text-right">
 			<a class="btn btn-primary" href="?do=SysConfig&amp;action=addconfig">{{lang_newConfiguration}}</a>
 		</div>
 		{{/locationid}}
@@ -109,11 +109,13 @@
 	<div class="modal fade" id="help-config" tabindex="-1" role="dialog">
 		<div class="modal-dialog">
 			<div class="modal-content">
-				<div class="modal-header">{{lang_systemConfiguration}}</div>
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal">&times;</button>
+					<h4 class="modal-title"><b>{{lang_systemConfiguration}}</b></h4>
+				</div>
 				<div class="modal-body">
 					{{lang_helpSystemConfiguration}}
 				</div>
-				<div class="modal-footer"><a class="btn btn-primary" data-dismiss="modal">{{lang_close}}</a></div>
 			</div>
 		</div>
 	</div>
diff --git a/modules-available/sysconfig/templates/list-modules.html b/modules-available/sysconfig/templates/list-modules.html
index c6622ee7..f15814f2 100644
--- a/modules-available/sysconfig/templates/list-modules.html
+++ b/modules-available/sysconfig/templates/list-modules.html
@@ -39,7 +39,7 @@
 				{{/modules}}
 			</form>
 		</div>
-		<div class="panel-footer">
+		<div class="panel-footer text-right">
 			<a class="btn btn-primary" href="?do=SysConfig&amp;action=addmodule">{{lang_newModule}}</a>
 		</div>
 	</div>
@@ -47,11 +47,13 @@
 	<div class="modal fade" id="help-module" tabindex="-1" role="dialog">
 		<div class="modal-dialog">
 			<div class="modal-content">
-				<div class="modal-header">{{lang_moduleConfiguration}}</div>
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal">&times;</button>
+					<h4 class="modal-title"><b>{{lang_moduleConfiguration}}</b></h4>
+				</div>
 				<div class="modal-body">
 					{{lang_helpModuleConfiguration}}
 				</div>
-				<div class="modal-footer"><a class="btn btn-primary" data-dismiss="modal">{{lang_close}}</a></div>
 			</div>
 		</div>
 	</div>
diff --git a/modules-available/sysconfig/templates/sshconfig-start.html b/modules-available/sysconfig/templates/sshconfig-start.html
index a208dbac..ea4297f2 100644
--- a/modules-available/sysconfig/templates/sshconfig-start.html
+++ b/modules-available/sysconfig/templates/sshconfig-start.html
@@ -6,11 +6,13 @@
 		<input type="text" name="title" value="{{title}}" class="form-control" autofocus="autofocus">
 	</div>
 	<div class="form-group">
-		<label>
+		<div class="checkbox">
 			<input type="checkbox" name="allowPasswordLogin" value="yes" {{#apl}}checked{{/apl}}>
-			{{lang_allowPass}}
-		</label>
-		<p><i>{{lang_allowPassInfo}}</i></p>
+			<label><b>{{lang_allowPass}}</b></label>
+		</div>
+		<div>
+			<i>{{lang_allowPassInfo}}</i>
+		</div>
 	</div>
 	<div class="form-group">
 		<label for="root-key">{{lang_rootKey}}</label>
@@ -26,7 +28,7 @@
 		<a class="btn btn-default" href="?do=SysConfig&action=addmodule">{{lang_back}}</a>
 	</div>
 	<div class="btn-group pull-right">
-		<button type="submit" class="btn btn-primary">{{lang_save}}</button>
+		<button type="submit" class="btn btn-primary"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}</button>
 	</div>
 </form>
 
diff --git a/modules-available/sysconfig/templates/start.html b/modules-available/sysconfig/templates/start.html
index 360d20fa..4bdd4853 100644
--- a/modules-available/sysconfig/templates/start.html
+++ b/modules-available/sysconfig/templates/start.html
@@ -10,6 +10,6 @@
 	</div>
 </div>
 {{/modules}}
-<div class="btn-group">
+<div class="text-right">
 	<a class="btn btn-default" href="?do=SysConfig">{{lang_cancel}}</a>
 </div>
diff --git a/modules-available/sysconfig/templates/sysconfig_heading.html b/modules-available/sysconfig/templates/sysconfig_heading.html
new file mode 100644
index 00000000..2cef3326
--- /dev/null
+++ b/modules-available/sysconfig/templates/sysconfig_heading.html
@@ -0,0 +1 @@
+<h1>{{lang_systemConfiguration}}</h1>
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522