Merge branch 'permission-manager' of git.openslx.org:openslx-ng/slx-admin into permission-manager

12 files changed, 17 insertions, 13 deletions

diff --git a/modules-available/backup/templates/_page.html b/modules-available/backup/templates/_page.html
index ab2fb37d..1111e9ad 100644
--- a/modules-available/backup/templates/_page.html
+++ b/modules-available/backup/templates/_page.html
@@ -7,7 +7,7 @@
 		<div class="panel-heading">{{lang_backup}}</div>
 		<div class="panel-body">
 			<p>{{lang_backupDescription}}</p>
-			<button class="btn btn-primary pull-right" type="submit">{{lang_download}}</button>
+			<button class="btn btn-primary pull-right" type="submit"><span class="glyphicon glyphicon-save"></span> {{lang_download}}</button>
 		</div>
 	</div>
 </form>
@@ -41,7 +41,7 @@
 				</div>
 				<p><i>{{lang_dozmodExplanation}}</i></p>
 			</div>
-			<button class="btn btn-primary pull-right" type="submit">{{lang_restore}}</button>
+			<button class="btn btn-primary pull-right" type="submit"><span class="glyphicon glyphicon-open"></span> {{lang_restore}}</button>
 		</div>
 	</div>
 </form>
\ No newline at end of file
diff --git a/modules-available/dozmod/style.css b/modules-available/dozmod/style.css
index 15b0afe0..07853324 100644
--- a/modules-available/dozmod/style.css
+++ b/modules-available/dozmod/style.css
@@ -38,6 +38,7 @@
 
 .input-group-addon {
   min-width:200px;
+  text-align: left;
 }
 
 .table > tbody > tr > td {
diff --git a/modules-available/dozmod/templates/images-delete.html b/modules-available/dozmod/templates/images-delete.html
index 94caf3bc..dd4c61bc 100644
--- a/modules-available/dozmod/templates/images-delete.html
+++ b/modules-available/dozmod/templates/images-delete.html
@@ -45,7 +45,7 @@
 						{{/images}}
 					</tbody>
 				</table>
-				<button id="delbtn" class="btn btn-danger pull-right" type="submit" name="button" value="save"><span class="glyphicon glyphicon-trash"></span> {{lang_delButton}}</button>
+				<button style="margin-left: 20px" id="delbtn" class="btn btn-danger pull-right" type="submit" name="button" value="save"><span class="glyphicon glyphicon-trash"></span> {{lang_delButton}}</button>
 			</form>
 			<pre style="display:none" id="deloutput"></pre>
 		</div>
diff --git a/modules-available/dozmod/templates/orglist.html b/modules-available/dozmod/templates/orglist.html
index ef4f8d8b..361421c5 100644
--- a/modules-available/dozmod/templates/orglist.html
+++ b/modules-available/dozmod/templates/orglist.html
@@ -4,18 +4,18 @@
 	</div>
 	<div class="panel-body">
 		<div class="table-responsive">
-			<table class="table table-stripped table-condensed stupidtable">
+			<table class="table table-stripped table-condensed table-hover stupidtable">
 				<thead>
 					<tr>
-						<th data-sort="string">{{lang_organization}}</th>
-						<th><span class="glyphicon glyphicon-ok" title="{{lang_canLoginOrganization}}"></span></th>
+						<th width="95%" data-sort="string">{{lang_organization}}</th>
+						<th width="5%"><span class="glyphicon glyphicon-ok" title="{{lang_canLoginOrganization}}"></span></th>
 					</tr>
 				</thead>
 				<tbody>
 					{{#organizations}}
 					<tr>
-						<td class="text-left text-nowrap">{{displayname}}</td>
-						<td>
+						<td width="95%" class="text-left text-nowrap">{{displayname}}</td>
+						<td width="5%">
 							<div class="checkbox">
 								<input onclick="seto('setorglogin', this, '{{organizationid}}')" type="checkbox" {{{canlogin}}}>
 								<label></label>
diff --git a/modules-available/dozmod/templates/userlist.html b/modules-available/dozmod/templates/userlist.html
index 29f55708..8bba4ef8 100644
--- a/modules-available/dozmod/templates/userlist.html
+++ b/modules-available/dozmod/templates/userlist.html
@@ -7,7 +7,7 @@
 	<div class="panel-body">
 		<p>{{lang_userListDescription}}</p>
 		<div class="table-responsive">
-			<table class="table table-stripped table-condensed stupidtable">
+			<table class="table table-stripped table-condensed table-hover stupidtable">
 				<thead>
 					<tr>
 						<th data-sort="string">{{lang_user}}</th>
diff --git a/modules-available/eventlog/lang/de/module.json b/modules-available/eventlog/lang/de/module.json
index 61ce4d0f..8217fc02 100644
--- a/modules-available/eventlog/lang/de/module.json
+++ b/modules-available/eventlog/lang/de/module.json
@@ -1,3 +1,3 @@
 {
-    "module_name": "Event Log"
+    "module_name": "Server-Log"
 }
\ No newline at end of file
diff --git a/modules-available/eventlog/lang/de/template-tags.json b/modules-available/eventlog/lang/de/template-tags.json
index b1a292e6..6ad75329 100644
--- a/modules-available/eventlog/lang/de/template-tags.json
+++ b/modules-available/eventlog/lang/de/template-tags.json
@@ -1,6 +1,6 @@
 {
     "lang_details": "Details",
     "lang_event": "Ereignis",
-    "lang_eventLog": "Ereignisprotokoll",
+    "lang_eventLog": "Serverprotokoll",
     "lang_when": "Wann"
 }
\ No newline at end of file
diff --git a/modules-available/eventlog/lang/en/module.json b/modules-available/eventlog/lang/en/module.json
index 61ce4d0f..8217fc02 100644
--- a/modules-available/eventlog/lang/en/module.json
+++ b/modules-available/eventlog/lang/en/module.json
@@ -1,3 +1,3 @@
 {
-    "module_name": "Event Log"
+    "module_name": "Server-Log"
 }
\ No newline at end of file
diff --git a/modules-available/eventlog/lang/en/template-tags.json b/modules-available/eventlog/lang/en/template-tags.json
index 21ec64ea..3132b97c 100644
--- a/modules-available/eventlog/lang/en/template-tags.json
+++ b/modules-available/eventlog/lang/en/template-tags.json
@@ -1,6 +1,6 @@
 {
     "lang_details": "Details",
     "lang_event": "Event",
-    "lang_eventLog": "Event log",
+    "lang_eventLog": "Server Log",
     "lang_when": "When"
 }
\ No newline at end of file
diff --git a/modules-available/sysconfig/templates/branding-start.html b/modules-available/sysconfig/templates/branding-start.html
index ddb5b3d9..0db085d9 100644
--- a/modules-available/sysconfig/templates/branding-start.html
+++ b/modules-available/sysconfig/templates/branding-start.html
@@ -20,6 +20,7 @@
 			</div>
 	</div>
 
+	<hr/>
 	<div class="btn-group">
 		<a class="btn btn-default" href="?do=SysConfig&action=addmodule">{{lang_back}}</a>
 	</div>
diff --git a/modules-available/sysconfig/templates/custom-upload.html b/modules-available/sysconfig/templates/custom-upload.html
index 51677f8b..43636a49 100644
--- a/modules-available/sysconfig/templates/custom-upload.html
+++ b/modules-available/sysconfig/templates/custom-upload.html
@@ -15,6 +15,7 @@
 			</div>
 	<p class="help-block">{{lang_supportedFiles}}: .tar.gz, .tar.bz2, .zip</p>
 
+	<hr/>
 	<div class="btn-group">
 		<a class="btn btn-default" href="?do=SysConfig&action=addmodule">{{lang_back}}</a>
 	</div>
diff --git a/modules-available/sysconfig/templates/sshconfig-start.html b/modules-available/sysconfig/templates/sshconfig-start.html
index ea4297f2..c0b4b379 100644
--- a/modules-available/sysconfig/templates/sshconfig-start.html
+++ b/modules-available/sysconfig/templates/sshconfig-start.html
@@ -24,6 +24,7 @@
 		<input class="form-control" type="text" name="listenPort" value="{{listenPort}}" id="port" pattern="\d+">
 		<i>{{lang_listenPortInfo}}</i>
 	</div>
+	<hr/>
 	<div class="btn-group">
 		<a class="btn btn-default" href="?do=SysConfig&action=addmodule">{{lang_back}}</a>
 	</div>