[dozmod] fixed inconsistencies + some issues in [internetaccess] and [news]

13 files changed, 249 insertions, 178 deletions

diff --git a/modules-available/dozmod/lang/de/template-tags.json b/modules-available/dozmod/lang/de/template-tags.json
index 97ab0a21..0c7d8348 100644
--- a/modules-available/dozmod/lang/de/template-tags.json
+++ b/modules-available/dozmod/lang/de/template-tags.json
@@ -4,6 +4,7 @@
     "lang_allowLoginDescription": "Wenn diese Option aktiviert ist, k\u00f6nnen sich alle Mitarbeiter der Einrichtung \u00fcber die bwLehrpool-Suite anmelden und VMs\/Veranstaltungen verwalten. Wenn Sie diese Option deaktivieren, m\u00fcssen Sie in der Untersektion \"Benutzer und Berechtigungen\" jeden Benutzer nach dem ersten Loginversuch manuell freischalten.",
     "lang_asteriskRequired": "Felder mit (*) sind erforderlich",
     "lang_blockCount": "Anzahl Bl\u00f6cke",
+    "lang_bwlehrpoolsuite": "bwLehrpool-Suite",
     "lang_canLoginOrganization": "Nutzer dieser Einrichtung k\u00f6nnen sich am Satelliten anmelden",
     "lang_canLoginUser": "Nutzer kann sich am Satelliten anmelden",
     "lang_createTime": "Erstellt",
@@ -53,11 +54,12 @@
     "lang_os": "Betriebssystem",
     "lang_owner": "Besitzer",
     "lang_password": "Passwort",
+    "lang_passwordplaceholder": "SMTP Passwort",
     "lang_placeholders": "Platzhalter",
     "lang_port": "Port",
     "lang_reallyResetTemplates": "Sind Sie sicher, dass Sie alle Texte l\u00f6schen und auf die Standardwerte zur\u00fccksetzen wollen?",
     "lang_replaceWithOriginal": "Originaltext in Textbox laden",
-    "lang_replyTo": "Reply-To Adresse (z.B. Helpdesk)",
+    "lang_replyTo": "Reply-To Adresse",
     "lang_runtimeConfig": "Laufzeit-Konfiguration",
     "lang_runtimeConfigHeadline": "Laufzeit-Konfiguration",
     "lang_runtimeConfigLimits": "Beschr\u00e4nkungen",
@@ -84,7 +86,8 @@
     "lang_userList": "Benutzerliste",
     "lang_userListDescription": "Hier k\u00f6nnen Sie individuelle Nutzer zu \"Super-Usern\" machen. Diese haben in der bwLehrpool-Suite auf alle Veranstaltungen und VMs Vollzugriff, unabh\u00e4ngig von den gesetzten Berechtigungen. Au\u00dferdem k\u00f6nnen Sie hier Benutzer vom Zugriff mittels der bwLehrpool-Suite ausschlie\u00dfen.",
     "lang_userListHeader": "Dem Satelliten bekannte Benutzer",
-    "lang_username": "Benutzername (SMTP-Auth)",
+    "lang_username": "Benutzername",
+    "lang_usernameplaceholder": "SMTP Benutzername",
     "lang_version": "Version vom",
     "lang_when": "Wann"
 }
\ No newline at end of file
diff --git a/modules-available/dozmod/lang/en/template-tags.json b/modules-available/dozmod/lang/en/template-tags.json
index e2e085b4..95edfe49 100644
--- a/modules-available/dozmod/lang/en/template-tags.json
+++ b/modules-available/dozmod/lang/en/template-tags.json
@@ -4,6 +4,7 @@
     "lang_allowLoginDescription": "If this option is enabled, all members of the organization marked as staff or employee are allowed to login to this server and manage VMs\/courses. Otherwise, new users need to be individually allowed access after their first login attempt by visiting the sub page \"users and permissions\" in this web interface.",
     "lang_asteriskRequired": "Fields marked with (*) are required",
     "lang_blockCount": "Block count",
+    "lang_bwlehrpoolsuite": "bwLehrpool-Suite",
     "lang_canLoginOrganization": "Users from this organization can login",
     "lang_canLoginUser": "This user can login",
     "lang_createTime": "Created",
@@ -28,7 +29,7 @@
     "lang_followingPlaceholdersUnused": "The following placeholders are not being used",
     "lang_hasNewer": "Newer version exists",
     "lang_hash": "Hash",
-    "lang_heading": "Images marked for deletion",
+    "lang_heading": "Images Marked for Deletion",
     "lang_host": "Host",
     "lang_image": "VM",
     "lang_lastEditor": "Edited by",
@@ -39,27 +40,28 @@
     "lang_lecturePermissionEdit": "Edit",
     "lang_loadDefaults": "Reset all templates to their defaults",
     "lang_mailConfig": "SMTP configuration for sending mails",
-    "lang_mailConfigHeadline": "email configuration",
+    "lang_mailConfigHeadline": "Email Configuration",
     "lang_mailDescription": "Fill in the following fields if you want to notify tutors\/professors\/lecturers about expiring VMs and lectures. If you leave one of the required fields blank, the feature will be disabled.",
-    "lang_mailTemplates": "E-Mail templates",
+    "lang_mailTemplates": "E-Mail Templates",
     "lang_maxImageValidity": "New VM validity (days)",
     "lang_maxLectureVisibility": "Max time lecture end date may lie in the future (days)",
     "lang_maxTransfers": "Max concurrent transfers per user",
     "lang_miscOptions": "Misc options",
     "lang_modified": "modified",
     "lang_organization": "Organization",
-    "lang_organizationList": "List of organizations",
+    "lang_organizationList": "List of Organizations",
     "lang_organizationListHeader": "Set access permissions for organizations",
     "lang_os": "Operating System",
     "lang_owner": "Owner",
     "lang_password": "Password",
+    "lang_passwordplaceholder": "SMTP Password",
     "lang_placeholders": "Placeholders",
     "lang_port": "Port",
     "lang_reallyResetTemplates": "Are you sure you want to reset all texts to their default values?",
     "lang_replaceWithOriginal": "load original text into text box",
     "lang_replyTo": "Reply-To address",
     "lang_runtimeConfig": "Limits and Defaults",
-    "lang_runtimeConfigHeadline": "Configure limits and defaults for bwLehrpool-Suite",
+    "lang_runtimeConfigHeadline": "Configure Limits and Defaults for bwLehrpool-Suite",
     "lang_runtimeConfigLimits": "Limitations",
     "lang_senderAddress": "Sender address",
     "lang_senderName": "Sender's display name",
@@ -81,10 +83,11 @@
     "lang_updateTime": "Last update",
     "lang_user": "User name",
     "lang_userId": "User id",
-    "lang_userList": "User list",
+    "lang_userList": "User List",
     "lang_userListDescription": "Here you can promote \"super users\", which will have all permissions in the bwLehrpool-Suite. You can also ban users from accessing this server via the bwLehrpool-Suite.",
     "lang_userListHeader": "Users known to this satellite",
-    "lang_username": "User name (SMTP auth)",
+    "lang_username": "Username",
+    "lang_usernameplaceholder": "SMTP Username",
     "lang_version": "Version timestamp",
     "lang_when": "When"
 }
\ No newline at end of file
diff --git a/modules-available/dozmod/page.inc.php b/modules-available/dozmod/page.inc.php
index 9c247770..24ad00d8 100644
--- a/modules-available/dozmod/page.inc.php
+++ b/modules-available/dozmod/page.inc.php
@@ -180,6 +180,7 @@ class Page_DozMod extends Page
 				$row['name_extra_class'] = 'slx-strike';
 			}
 			$row['version'] = date('d.m.Y H:i:s', $row['createtime']);
+			$row['rawfilesize'] = $row['filesize'];
 			$row['filesize'] = Util::readableFileSize($row['filesize']);
 			$rows[] = $row;
 		}
diff --git a/modules-available/dozmod/style.css b/modules-available/dozmod/style.css
index 22d769ed..15b0afe0 100644
--- a/modules-available/dozmod/style.css
+++ b/modules-available/dozmod/style.css
@@ -35,3 +35,15 @@
 .table-input-group tr.input-group td:last-child input {
   border-radius: 0px 4px 4px 0px;
 }
+
+.input-group-addon {
+  min-width:200px;
+}
+
+.table > tbody > tr > td {
+  vertical-align: middle;
+}
+
+.table > tbody > tr > td > div {
+  display: inline-block;
+}
\ No newline at end of file
diff --git a/modules-available/dozmod/templates/actionlog-log.html b/modules-available/dozmod/templates/actionlog-log.html
index 151d2545..0f84a4ec 100644
--- a/modules-available/dozmod/templates/actionlog-log.html
+++ b/modules-available/dozmod/templates/actionlog-log.html
@@ -1,41 +1,45 @@
-<table class="table table-striped table-bordered">
-	<tr>
-		<th class="text-nowrap">{{lang_when}}</th>
-		{{#showActor}}
-		<th class="text-nowrap">{{lang_user}}</th>
-		{{/showActor}}
-		{{#showTarget}}
-		<th class="text-nowrap">{{lang_actionTarget}}</th>
-		{{/showTarget}}
-		<th class="text-nowrap">{{lang_event}}</th>
-	</tr>
-	{{#events}}
-	<tr>
-		<td class="text-nowrap">{{dateline_s}}</td>
-		{{#showActor}}
-		<td style="min-width:140px">
-			{{#uuserid}}
-			<a href="?do=dozmod&amp;section=actionlog&amp;action=showuser&amp;uuid={{uuserid}}">{{ulastname}}, {{ufirstname}}</a>
-			{{/uuserid}}
-			{{^uuserid}}
-			{{lang_system}}
-			{{/uuserid}}
-		</td>
-		{{/showActor}}
-		{{#showTarget}}
-		<td>
-			{{#targeturl}}
-			<a href="{{targeturl}}">{{targetname}}</a>
-			{{/targeturl}}
-			{{^targeturl}}
-			{{targetname}}
-			{{^targetname}}
-			<span class="small">{{targetid}}</span>
-			{{/targetname}}
-			{{/targeturl}}
-		</td>
-		{{/showTarget}}
-		<td>{{description}}</td>
-	</tr>
-	{{/events}}
+<table style="table-layout: fixed; width: 100%" class="table table-striped table-bordered stupidtable">
+	<thead>
+		<tr>
+			<th class="text-nowrap" data-sort="int">{{lang_when}}</th>
+			{{#showActor}}
+			<th class="text-nowrap" data-sort="string">{{lang_user}}</th>
+			{{/showActor}}
+			{{#showTarget}}
+			<th class="text-nowrap" data-sort="string">{{lang_actionTarget}}</th>
+			{{/showTarget}}
+			<th class="text-nowrap" data-sort="string">{{lang_event}}</th>
+		</tr>
+	</thead>
+	<tbody>
+		{{#events}}
+		<tr>
+			<td class="text-nowrap" data-sort-value="{{dateline}}">{{dateline_s}}</td>
+			{{#showActor}}
+			<td style="min-width:140px">
+				{{#uuserid}}
+				<a href="?do=dozmod&amp;section=actionlog&amp;action=showuser&amp;uuid={{uuserid}}">{{ulastname}}, {{ufirstname}}</a>
+				{{/uuserid}}
+				{{^uuserid}}
+				{{lang_system}}
+				{{/uuserid}}
+			</td>
+			{{/showActor}}
+			{{#showTarget}}
+			<td>
+				{{#targeturl}}
+				<a href="{{targeturl}}">{{targetname}}</a>
+				{{/targeturl}}
+				{{^targeturl}}
+				{{targetname}}
+				{{^targetname}}
+				<span class="small">{{targetid}}</span>
+				{{/targetname}}
+				{{/targeturl}}
+			</td>
+			{{/showTarget}}
+			<td style="word-wrap: break-word">{{description}}</td>
+		</tr>
+		{{/events}}
+	</tbody>
 </table>
\ No newline at end of file
diff --git a/modules-available/dozmod/templates/images-delete.html b/modules-available/dozmod/templates/images-delete.html
index 0ee90835..f46ac870 100644
--- a/modules-available/dozmod/templates/images-delete.html
+++ b/modules-available/dozmod/templates/images-delete.html
@@ -1,8 +1,8 @@
-<h2>{{lang_heading}}</h2>
+<h1>{{lang_bwlehrpoolsuite}}</h1>
 
 <div class="panel panel-default">
 	<div class="panel-heading">
-		{{lang_subHeading}}
+		{{lang_heading}}
 	</div>
 	<div class="panel-body">
 		<p>{{lang_description_delete_images}}</p>
@@ -10,17 +10,20 @@
 			<form id="delform" method="post" action="?do=DozMod" onsubmit="return slxPostdel()">
 				<input type="hidden" name="token" value="{{token}}">
 				<input type="hidden" name="action" value="delimages">
-				<table class="table table-stripped table-condensed">
+				<table class="table table-stripped table-condensed stupidtable">
 					<thead>
 						<tr>
-							<th>{{lang_image}}</th>
-							<th>{{lang_version}}</th>
-							<th>{{lang_owner}}</th>
+							<th data-sort="string">{{lang_image}}</th>
+							<th data-sort="int">{{lang_version}}</th>
+							<th data-sort="string">{{lang_owner}}</th>
 							<th><span class="glyphicon glyphicon-upload" title="{{lang_hasNewer}}"></span></th>
-							<th>{{lang_size}}</th>
+							<th data-sort="int">{{lang_size}}</th>
 							<th>
-								<input id="del-all" type="checkbox" onclick="slxChangeAll()">
-								<span class="glyphicon glyphicon-trash" title="{{lang_delete}}"></span>
+								<div class="checkbox">
+									<input id="del-all" type="checkbox" onclick="slxChangeAll()">
+									<label for="del-all"></label>
+									<span class="glyphicon glyphicon-trash" title="{{lang_delete}}"></span>
+								</div>
 							</th>
 						</tr>
 					</thead>
@@ -28,16 +31,21 @@
 						{{#images}}
 						<tr>
 							<td class="text-left text-nowrap {{name_extra_class}}">{{displayname}}<br><span class="small">{{imageversionid}}</span></td>
-							<td class="text-left text-nowrap">{{version}}</td>
+							<td class="text-left text-nowrap" data-sort-value="{{createtime}}" >{{version}}</td>
 							<td class="text-left text-nowrap"><a href="mailto:{{email}}">{{lastname}}, {{firstname}}</a></td>
 							<td class="text-left text-nowrap"><span class="glyphicon {{hasNewerClass}}"></span></td>
-							<td class="text-right text-nowrap">{{filesize}}</td>
-							<td><input class="del-check" name="images[{{imageversionid}}]" type="checkbox" {{checked}}></td>
+							<td class="text-right text-nowrap" data-sort-value="{{rawfilesize}}">{{filesize}}</td>
+							<td>
+								<div class="checkbox">
+									<input type="checkbox" id="images[{{imageversionid}}]" class="del-check" name="images[{{imageversionid}}]" {{checked}}>
+									<label for="images[{{imageversionid}}]"></label>
+								</div>
+							</td>
 						</tr>
 						{{/images}}
 					</tbody>
 				</table>
-				<button id="delbtn" class="btn btn-danger" type="submit" name="button" value="save">{{lang_delButton}}</button>
+				<button id="delbtn" class="btn btn-danger pull-right" type="submit" name="button" value="save">{{lang_delButton}}</button>
 			</form>
 			<pre style="display:none" id="deloutput"></pre>
 		</div>
diff --git a/modules-available/dozmod/templates/mailconfig.html b/modules-available/dozmod/templates/mailconfig.html
index 4f8b81fa..8e0a3ce2 100644
--- a/modules-available/dozmod/templates/mailconfig.html
+++ b/modules-available/dozmod/templates/mailconfig.html
@@ -1,24 +1,25 @@
-<h2>{{lang_mailConfigHeadline}}</h2>
+<h1>{{lang_bwlehrpoolsuite}}</h1>
 
 <div class="panel panel-default">
 	<div class="panel-heading">
 		{{lang_mailConfig}}
 	</div>
 	<div class="panel-body">
+
 		<p>{{lang_mailDescription}}</p>
 		<form action="?do=DozMod" method="post" id="mailconf">
 			<input type="text" name="prevent_autofill" id="prevent_autofill" value="" style="position:absolute;top:-2000px" tabindex="-1">
 			<input type="password" name="password_fake" id="password_fake" value="" style="position:absolute;top:-2000px" tabindex="-1">
 			<div class="input-group">
-				<label class="input-group-addon slx-ga2" for="host-id">{{lang_host}} *</label>
+				<label class="input-group-addon" for="host-id">{{lang_host}} *</label>
 				<input type="text" name="host" id ="host-id" class="form-control" placeholder="smtp.example.com" value="{{host}}">
 			</div>
 			<div class="input-group">
-				<label class="input-group-addon slx-ga2" for="port-id">{{lang_port}} *</label>
+				<label class="input-group-addon" for="port-id">{{lang_port}} *</label>
 				<input type="text" name="port" id ="port-id" class="form-control" placeholder="465" value="{{port}}">
 			</div>
 			<div class="input-group">
-				<label class="input-group-addon slx-ga2" for="ssl-id">{{lang_ssl}} *</label>
+				<label class="input-group-addon" for="ssl-id">{{lang_ssl}} *</label>
 				<select class="form-control" name="ssl" id="ssl-id">
 					<option value="NONE" {{set_NONE}}>{{lang_sslNone}}</option>
 					<option value="IMPLICIT" {{set_IMPLICIT}}>{{lang_sslImplicit}}</option>
@@ -26,40 +27,42 @@
 				</select>
 			</div>
 			<div class="input-group">
-				<label class="input-group-addon slx-ga2" for="senderAddress-id">{{lang_senderAddress}} *</label>
+				<label class="input-group-addon" for="senderAddress-id">{{lang_senderAddress}} *</label>
 				<input type="text" name="senderAddress" id ="senderAddress-id" class="form-control" placeholder="smtp-username@hs-example.com" value="{{senderAddress}}">
 			</div>
 			<div class="input-group">
-				<label class="input-group-addon slx-ga2" for="serverName-id">{{lang_senderName}}</label>
+				<label class="input-group-addon" for="serverName-id">{{lang_senderName}}</label>
 				<input type="text" name="serverName" id ="serverName-id" class="form-control" placeholder="bwLehrpool HS Example" value="{{serverName}}">
 			</div>
 			<div class="input-group">
-				<label class="input-group-addon slx-ga2" for="replyTo-id">{{lang_replyTo}}</label>
+				<label class="input-group-addon" for="replyTo-id">{{lang_replyTo}}</label>
 				<input type="text" name="replyTo" id ="replyTo-id" class="form-control" placeholder="helpdesk@hs-example.com" value="{{replyTo}}">
 			</div>
 			<div class="input-group">
-				<label class="input-group-addon slx-ga2" for="username-id">{{lang_username}}</label>
-				<input type="text" name="username" id ="username-id" class="form-control" placeholder="smtp-username" value="{{username}}">
+				<label class="input-group-addon" for="username-id">{{lang_username}}</label>
+				<input type="text" name="username" id ="username-id" class="form-control" placeholder="{{lang_usernameplaceholder}}" value="{{username}}">
 			</div>
 			<div class="input-group">
-				<label class="input-group-addon slx-ga2" for="password-id">{{lang_password}}</label>
-				<input type="{{password_type}}" name="password" id ="password-id" class="form-control" placeholder="geheim" value="{{password}}">
+				<label class="input-group-addon" for="password-id">{{lang_password}}</label>
+				<input type="{{password_type}}" name="password" id ="password-id" class="form-control" placeholder="{{lang_passwordplaceholder}}" value="{{password}}">
 			</div>
 			<p>{{lang_asteriskRequired}}</p>
 			<br>
 			<p>{{lang_testConfiguration}}</p>
 			<div class="input-group">
-				<label class="input-group-addon slx-ga2" for="test-id">{{lang_testRecipient}}</label>
+				<label class="input-group-addon" for="test-id">{{lang_testRecipient}}</label>
 				<input type="text" name="recipient" id ="test-id" class="form-control" placeholder="test@example.com" value="">
 			</div>
 			<br>
-			<button class="btn btn-primary btn-sm" type="button" id="test-button" name="button" value="test" onclick="slxTestConfig()">{{lang_test}}</button>
-			<span id="test-spin" style="display:none"><span class="glyphicon glyphicon-refresh slx-rotation"></span></span>
-			<pre id="test-output" style="display:none"></pre>
-			<button class="btn btn-primary btn-sm" type="submit" name="button" value="save">{{lang_save}}</button>
-			<br>
-			<input type="hidden" name="token" value="{{token}}">
-			<input type="hidden" name="action" value="mail">
+			<div class="text-right">
+				<button class="btn btn-warning btn-sm" type="button" id="test-button" name="button" value="test" onclick="slxTestConfig()">{{lang_test}}</button>
+				<span id="test-spin" style="display:none"><span class="glyphicon glyphicon-refresh slx-rotation"></span></span>
+				<pre id="test-output" style="display:none"></pre>
+				<button class="btn btn-primary btn-sm" type="submit" name="button" value="save">{{lang_save}}</button>
+				<br>
+				<input type="hidden" name="token" value="{{token}}">
+				<input type="hidden" name="action" value="mail">
+			</div>
 		</form>
 	</div>
 </div>
diff --git a/modules-available/dozmod/templates/orglist.html b/modules-available/dozmod/templates/orglist.html
index 21495bba..ef4f8d8b 100644
--- a/modules-available/dozmod/templates/orglist.html
+++ b/modules-available/dozmod/templates/orglist.html
@@ -1,15 +1,13 @@
-<h2>{{lang_organizationList}}</h2>
-
 <div class="panel panel-default">
 	<div class="panel-heading">
 		{{lang_organizationListHeader}}
 	</div>
 	<div class="panel-body">
 		<div class="table-responsive">
-			<table class="table table-stripped table-condensed">
+			<table class="table table-stripped table-condensed stupidtable">
 				<thead>
 					<tr>
-						<th>{{lang_organization}}</th>
+						<th data-sort="string">{{lang_organization}}</th>
 						<th><span class="glyphicon glyphicon-ok" title="{{lang_canLoginOrganization}}"></span></th>
 					</tr>
 				</thead>
@@ -17,8 +15,11 @@
 					{{#organizations}}
 					<tr>
 						<td class="text-left text-nowrap">{{displayname}}</td>
-						<td class="text-nowrap">
-							<input onclick="seto('setorglogin', this, '{{organizationid}}')" type="checkbox" {{{canlogin}}}>
+						<td>
+							<div class="checkbox">
+								<input onclick="seto('setorglogin', this, '{{organizationid}}')" type="checkbox" {{{canlogin}}}>
+								<label></label>
+							</div>
 						</td>
 					</tr>
 					{{/organizations}}
@@ -32,6 +33,7 @@
 
 function seto(action, el, orgid) {
 	var box = $(el);
+	box = box.parent();
 	var v = el.checked ? '1' : '0';
 	var old = el.checked == true;
 	box.css('display', 'none');
diff --git a/modules-available/dozmod/templates/runtimeconfig.html b/modules-available/dozmod/templates/runtimeconfig.html
index 9bdc44b0..4c92b558 100644
--- a/modules-available/dozmod/templates/runtimeconfig.html
+++ b/modules-available/dozmod/templates/runtimeconfig.html
@@ -1,4 +1,4 @@
-<h2 id="runtime-configuration">{{lang_runtimeConfigHeadline}}</h2>
+<h1>{{lang_bwlehrpoolsuite}}</h1>
 
 <div class="panel panel-default">
 	<div class="panel-heading">
@@ -106,7 +106,9 @@
 			<br>
 			<input type="hidden" name="token" value="{{token}}">
 			<input type="hidden" name="action" value="runtime">
-			<button class="btn btn-primary" type="submit" name="button" value="save">{{lang_save}}</button>
+			<div class="text-right">
+				<button class="btn btn-primary" type="submit" name="button" value="save">{{lang_save}}</button>
+			</div>
 		</form>
 	</div>
 </div>
diff --git a/modules-available/dozmod/templates/templates.html b/modules-available/dozmod/templates/templates.html
index 8a3caf26..56fc6677 100644
--- a/modules-available/dozmod/templates/templates.html
+++ b/modules-available/dozmod/templates/templates.html
@@ -1,91 +1,98 @@
-<h1>{{lang_mailTemplates}}</h1>
+<h1>{{lang_bwlehrpoolsuite}}</h1>
 
-<p><i>{{lang_templatePageDescription}}</i></p>
+<div class="panel panel-default">
+	<div class="panel-heading">
+		{{lang_mailTemplates}}
+	</div>
+	<div class="panel-body">
 
-<form id="templateForm" role="form" method="POST" action="?do=dozmod&amp;section=templates">
-	<input type="hidden" name="token" value="{{token}}">
-	<input type="hidden" name="action" value="save">
+		<p><i>{{lang_templatePageDescription}}</i></p>
 
+		<form id="templateForm" role="form" method="POST" action="?do=dozmod&amp;section=templates">
+			<input type="hidden" name="token" value="{{token}}">
+			<input type="hidden" name="action" value="save">
 
-	<div class="panel-group" id="accordion">
 
-	{{#templates}}
+			<div class="panel-group" id="accordion">
 
-	<div id="frame_{{name}}" class="panel panel-default">
-		<div class="panel-heading">
-			<div class="panel-title">
-				{{#conflict}}
-					<span class="glyphicon glyphicon-exclamation-sign pull-left text-danger"></span>
-				{{/conflict}}
-				{{#modified}}
-					<span class="glyphicon glyphicon-pencil pull-left"></span>
-				{{/modified}}
-				<h4>
-					<a class="collapsed" data-toggle="collapse" data-parent="#accordion" href="#panel_{{name}}">
-					{{name}}
-					</a>
-				</h4>
-				<small>{{description}}</small>
+			{{#templates}}
 
-			</div>
-		</div>
-		<div id="panel_{{name}}" class="panel-collapse collapse">
-			<div class="panel-body">
-				<div id="msgbox_{{name}}">
-				</div>
+			<div id="frame_{{name}}" class="panel panel-default">
+				<div class="panel-heading">
+					<div class="panel-title">
+						{{#conflict}}
+							<span class="glyphicon glyphicon-exclamation-sign pull-left text-danger"></span>
+						{{/conflict}}
+						{{#modified}}
+							<span class="glyphicon glyphicon-pencil pull-left"></span>
+						{{/modified}}
+						<h4>
+							<a class="collapsed" data-toggle="collapse" data-parent="#accordion" href="#panel_{{name}}">
+							{{name}}
+							</a>
+						</h4>
+						<small>{{description}}</small>
 
-				<label for="ta_{{name}}">{{lang_template}}</label>
-				<div class="form-group">
-					<textarea data-mandatory="{{list_mandatoryVariables}}" name="templates[{{name}}][template]"
-								 data-setting="{{name}}" id="ta_{{name}}"
-								 class="form-control templateEditor" style="min-height:200px">{{template}}</textarea>
+					</div>
 				</div>
-
-				<h4>{{lang_placeholders}}</h4>
-				<select name="templates[{{name}}][mandatory_variables]" multiple="multiple" class="hidden">
-					{{{html_mandatoryVariables}}}
-				</select>
-				<select name="templates[{{name}}][optional_variables]" multiple="multiple" class="hidden">
-					{{{html_optionalVariables}}}
-				</select>
-				<ul>
-					{{{html_availableVariables}}}
-				</ul>
-				{{#original_template}}
-					<textarea class="hidden" id="orig_{{name}}">{{original_template}}</textarea>
-					<div class="pull-right">
-						<a href="#" class="btn btn-default" onclick="$('#ta_{{name}}').val($('#orig_{{name}}').val());return false">
-							<span class="glyphicon glyphicon-refresh"></span>
-							{{lang_replaceWithOriginal}}
-						</a>
+				<div id="panel_{{name}}" class="panel-collapse collapse">
+					<div class="panel-body">
+						<div id="msgbox_{{name}}">
+						</div>
+
+						<label for="ta_{{name}}">{{lang_template}}</label>
+						<div class="form-group">
+							<textarea data-mandatory="{{list_mandatoryVariables}}" name="templates[{{name}}][template]"
+										 data-setting="{{name}}" id="ta_{{name}}"
+										 class="form-control templateEditor" style="min-height:200px">{{template}}</textarea>
+						</div>
+
+						<h4>{{lang_placeholders}}</h4>
+						<select name="templates[{{name}}][mandatory_variables]" multiple="multiple" class="hidden">
+							{{{html_mandatoryVariables}}}
+						</select>
+						<select name="templates[{{name}}][optional_variables]" multiple="multiple" class="hidden">
+							{{{html_optionalVariables}}}
+						</select>
+						<ul>
+							{{{html_availableVariables}}}
+						</ul>
+						{{#original_template}}
+							<textarea class="hidden" id="orig_{{name}}">{{original_template}}</textarea>
+							<div class="pull-right">
+								<a href="#" class="btn btn-default" onclick="$('#ta_{{name}}').val($('#orig_{{name}}').val());return false">
+									<span class="glyphicon glyphicon-refresh"></span>
+									{{lang_replaceWithOriginal}}
+								</a>
+							</div>
+						{{/original_template}}
+						<div class="small">
+							{{lang_modified}}: {{#modified}}<b>{{lang_yes}}</b>{{/modified}}{{^modified}}{{lang_no}}{{/modified}},
+							{{lang_hasNewer}}: {{#conflict}}<b>{{lang_yes}}</b>{{/conflict}}{{^conflict}}{{lang_no}}{{/conflict}},
+							{{lang_thisVersion}}: {{edit_version}},
+							{{lang_latestVersion}}: {{version}}
+						</div>
 					</div>
-				{{/original_template}}
-				<div class="small">
-					{{lang_modified}}: {{#modified}}<b>{{lang_yes}}</b>{{/modified}}{{^modified}}{{lang_no}}{{/modified}},
-					{{lang_hasNewer}}: {{#conflict}}<b>{{lang_yes}}</b>{{/conflict}}{{^conflict}}{{lang_no}}{{/conflict}},
-					{{lang_thisVersion}}: {{edit_version}},
-					{{lang_latestVersion}}: {{version}}
 				</div>
 			</div>
-		</div>
-	</div>
 
 
-	{{/templates}}
-	</div>
+			{{/templates}}
+			</div>
 
-	<div class="pull-left">
-		<button type="submit" onclick="return validateForm()" class="btn btn-primary">{{lang_save}}</button>
-	</div>
-</form>
-<form method="POST" action="?do=dozmod&amp;section=templates">
-	<input type="hidden" name="token" value="{{token}}">
-	<input type="hidden" name="action" value="reset">
-	<div>
-		<button type="submit" onclick="return confirm('{{lang_reallyResetTemplates}}')" class="btn btn-danger">{{lang_loadDefaults}}</button>
+			<button type="submit" onclick="return validateForm()" class="btn btn-primary pull-right">{{lang_save}}</button>
+		</form>
+		<form method="POST" action="?do=dozmod&amp;section=templates">
+			<input type="hidden" name="token" value="{{token}}">
+			<input type="hidden" name="action" value="reset">
+			<div>
+				<button type="submit" onclick="return confirm('{{lang_reallyResetTemplates}}')" class="btn btn-danger">{{lang_loadDefaults}}</button>
+			</div>
+		</form>
+		<div class="clearfix"></div>
 	</div>
-</form>
-<div class="clearfix"></div>
+</div>
+
 <script type="application/javascript"><!--
 
 
diff --git a/modules-available/dozmod/templates/userlist.html b/modules-available/dozmod/templates/userlist.html
index a4f415e1..29f55708 100644
--- a/modules-available/dozmod/templates/userlist.html
+++ b/modules-available/dozmod/templates/userlist.html
@@ -1,4 +1,4 @@
-<h2 id="users">{{lang_userList}}</h2>
+<h1>{{lang_bwlehrpoolsuite}}</h1>
 
 <div class="panel panel-default">
 	<div class="panel-heading">
@@ -7,13 +7,13 @@
 	<div class="panel-body">
 		<p>{{lang_userListDescription}}</p>
 		<div class="table-responsive">
-			<table class="table table-stripped table-condensed">
+			<table class="table table-stripped table-condensed stupidtable">
 				<thead>
 					<tr>
-						<th>{{lang_user}}</th>
-						<th>{{lang_organization}}</th>
-						<th>{{lang_lastLogin}}</th>
-						<th>{{lang_email}}</th>
+						<th data-sort="string">{{lang_user}}</th>
+						<th data-sort="string">{{lang_organization}}</th>
+						<th data-sort="int">{{lang_lastLogin}}</th>
+						<th data-sort="string">{{lang_email}}</th>
 						<th><span class="glyphicon glyphicon-envelope" title="{{lang_emailNotifications}}"></span></th>
 						<th><span class="glyphicon glyphicon-king" title="{{lang_superUser}}"></span></th>
 						<th><span class="glyphicon glyphicon-ok" title="{{lang_canLoginUser}}"></span></th>
@@ -26,9 +26,24 @@
 						<td class="text-left text-nowrap">{{orgname}}</td>
 						<td class="text-left text-nowrap">{{lastlogin}}</td>
 						<td class="text-left text-nowrap"><a href="mailto:{{email}}">{{email}}</a></td>
-						<td><input onclick="setu('setmail', this, '{{userid}}')" type="checkbox" {{{emailnotifications}}}></td>
-						<td><input onclick="setu('setsu', this, '{{userid}}')" type="checkbox" {{{issuperuser}}}></td>
-						<td><input onclick="setu('setlogin', this, '{{userid}}')" type="checkbox" {{{canlogin}}}></td>
+						<td>
+							<div class="checkbox">
+								<input onclick="setu('setmail', this, '{{userid}}')" type="checkbox" {{{emailnotifications}}}>
+								<label></label>
+							</div>
+						</td>
+						<td>
+							<div class="checkbox">
+								<input onclick="setu('setsu', this, '{{userid}}')" type="checkbox" {{{issuperuser}}}>
+								<label></label>
+							</div>
+						</td>
+						<td>
+							<div class="checkbox">
+								<input onclick="setu('setlogin', this, '{{userid}}')" type="checkbox" {{{canlogin}}}>
+								<label></label>
+							</div>
+						</td>
 					</tr>
 					{{/users}}
 				</tbody>
@@ -41,6 +56,7 @@
 
 function setu(action, el, uid) {
 	var box = $(el);
+	box = box.parent();
 	var v = el.checked ? '1' : '0';
 	var old = el.checked == true;
 	box.css('display', 'none');
diff --git a/modules-available/internetaccess/templates/_page.html b/modules-available/internetaccess/templates/_page.html
index 7b1584ee..1c9232cc 100644
--- a/modules-available/internetaccess/templates/_page.html
+++ b/modules-available/internetaccess/templates/_page.html
@@ -32,5 +32,7 @@
 		<input name="PROXY_PASSWORD" value="{{PROXY_PASSWORD}}" type="{{password_type}}" class="form-control">
 	</div>
 	<br/>
-	<button class="btn btn-primary pull-right" type="submit">{{lang_save}}</button>
+	<div class="text-right">
+		<button class="btn btn-primary" type="submit">{{lang_save}}</button>
+	</div>
 </form>
diff --git a/modules-available/news/templates/page-news.html b/modules-available/news/templates/page-news.html
index 494d356b..37e3471d 100644
--- a/modules-available/news/templates/page-news.html
+++ b/modules-available/news/templates/page-news.html
@@ -17,9 +17,16 @@
 				<label for="news-content-id">{{lang_content}}</label>
 				<textarea name="news-content" id ="news-content-id" class="form-control summernote" rows="5" cols="30"  placeholder="">{{latestContent}}</textarea>
 			</div>
-			<button class="btn btn-primary btn-sm sn-btn pull-right" name="news-type" value="news" type="submit">{{lang_save}}</button>
-			<input type="hidden" name="token" value="{{token}}">
-			<p>{{lang_latestUpdate}}: {{latestDate}}</p>
+			<div class="row">
+				<div class="text-left col-md-6">
+					<p>{{lang_latestUpdate}}: {{latestDate}}</p>
+				</div>
+				<div class="text-right col-md-6">
+					<button class="btn btn-primary sn-btn" name="news-type" value="news" type="submit"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}</button>
+					<input type="hidden" name="token" value="{{token}}">
+				</div>
+			</div>
+
 		</form>
 		<br/>
 		<div class="panel panel-default">
@@ -59,15 +66,16 @@
 		</div>
 	</div>
 	<div role="tabpanel" class="tab-pane {{#editHelp}}active{{/editHelp}}" id="help">
-		<form class="bottom-margin-50" action="?do=News&amp;action=save" method="post">
+		<form action="?do=News&amp;action=save" method="post">
 			<div class="form-group">
 				<br/>
 				<label for="news-content-id">{{lang_content}}</label>
 				<textarea name="help-content" id="help-content-id" class="form-control summernote" style="min-height:400px"  placeholder="">{{latestHelp}}</textarea>
 			</div>
-			<button class="btn btn-primary btn-sm sn-btn pull-right" name="news-type" value="help" type="submit">{{lang_save}}</button>
-			<input type="hidden" name="token" value="{{token}}">
-			<p> </p>
+			<div class="text-right">
+				<button class="btn btn-primary sn-btn" name="news-type" value="help" type="submit"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}</button>
+				<input type="hidden" name="token" value="{{token}}">
+			</div>
 		</form>
 		<br/>
 		<div class="panel panel-default">