From 5f6e43734d8fb60b74e47b91f81adac41ae69597 Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Fri, 29 Sep 2017 13:36:54 +0200
Subject:
 [baseconfig][baseconfig_partitions_cdn][eventlog][minilinux][permissionmanager][rebootcontrol][statisics_reporting][syslog]
 fixed inconsistencies

---
 .../permissionmanager/lang/de/template-tags.json   |  4 ++-
 .../permissionmanager/lang/en/template-tags.json   |  4 ++-
 modules-available/permissionmanager/style.css      |  5 ++-
 .../permissionmanager/templates/_page.html         | 39 +++++++++++++---------
 .../permissionmanager/templates/roleeditor.html    |  7 ++--
 .../permissionmanager/templates/rolestable.html    | 12 +++----
 6 files changed, 41 insertions(+), 30 deletions(-)

(limited to 'modules-available/permissionmanager')

diff --git a/modules-available/permissionmanager/lang/de/template-tags.json b/modules-available/permissionmanager/lang/de/template-tags.json
index e9146d2c..23b2dc68 100644
--- a/modules-available/permissionmanager/lang/de/template-tags.json
+++ b/modules-available/permissionmanager/lang/de/template-tags.json
@@ -19,5 +19,7 @@
     "lang_selected": "ausgewählte",
     "lang_Permissions": "Rechte",
     "lang_selectizePlaceholder": "Nach Rollen filtern...",
-    "lang_searchPlaceholder": "Nach Rollen suchen..."
+    "lang_searchPlaceholder": "Nach Rollen suchen...",
+    "lang_moduleName": "Rechtemanager",
+    "lang_roleEditor": "Rollen Editor"
 }
\ No newline at end of file
diff --git a/modules-available/permissionmanager/lang/en/template-tags.json b/modules-available/permissionmanager/lang/en/template-tags.json
index ce35a6ce..01056632 100644
--- a/modules-available/permissionmanager/lang/en/template-tags.json
+++ b/modules-available/permissionmanager/lang/en/template-tags.json
@@ -19,5 +19,7 @@
     "lang_selected": "selected",
     "lang_Permissions": "Permissions",
     "lang_selectizePlaceholder": "Filter for roles...",
-    "lang_searchPlaceholder": "Search for roles..."
+    "lang_searchPlaceholder": "Search for roles...",
+    "lang_moduleName": "Permission Manager",
+    "lang_roleEditor": "Role Editor"
 }
\ No newline at end of file
diff --git a/modules-available/permissionmanager/style.css b/modules-available/permissionmanager/style.css
index 504df511..f1d0646f 100644
--- a/modules-available/permissionmanager/style.css
+++ b/modules-available/permissionmanager/style.css
@@ -4,10 +4,9 @@
 }
 
 #saveButton {
-    margin-right: 10px;
+    margin-left: 10px;
 }
 
-
 #roleName {
     width: 200px;
     display: inline-block;
@@ -38,7 +37,7 @@
     background-image: none;
 }
 
-.panel, .row {
+.panel{
     margin-bottom: 20px;
 }
 
diff --git a/modules-available/permissionmanager/templates/_page.html b/modules-available/permissionmanager/templates/_page.html
index 3b436eda..65a52c52 100644
--- a/modules-available/permissionmanager/templates/_page.html
+++ b/modules-available/permissionmanager/templates/_page.html
@@ -1,20 +1,27 @@
-<form id="switchForm" method="GET" action="?do=permissionmanager">
-	<input type="hidden" name="do" value="permissionmanager">
+<div class="col-md-12" style="margin-bottom: 0px;">
+	<div class='page-header'>
+		<div class='pull-right'>
+			<form id="switchForm" method="GET" action="?do=permissionmanager">
+				<input type="hidden" name="do" value="permissionmanager">
 
-	<div class="btn-group">
-		<button class="btn {{rolesButtonClass}}" type="submit" name="show" value="roles">
-			<span class="glyphicon glyphicon-education"></span>
-			{{lang_Roles}}
-		</button>
+				<div class="btn-group">
+					<button class="btn {{rolesButtonClass}}" type="submit" name="show" value="roles">
+						<span class="glyphicon glyphicon-education"></span>
+						{{lang_Roles}}
+					</button>
 
-		<button class="btn {{usersButtonClass}}" type="submit" name="show" value="users">
-			<span class="glyphicon glyphicon-user"></span>
-			{{lang_Users}}
-		</button>
+					<button class="btn {{usersButtonClass}}" type="submit" name="show" value="users">
+						<span class="glyphicon glyphicon-user"></span>
+						{{lang_Users}}
+					</button>
 
-		<button class="btn {{locationsButtonClass}}" type="submit" name="show" value="locations">
-			<span class="glyphicon glyphicon-home"></span>
-			{{lang_Locations}}
-		</button>
+					<button class="btn {{locationsButtonClass}}" type="submit" name="show" value="locations">
+						<span class="glyphicon glyphicon-home"></span>
+						{{lang_Locations}}
+					</button>
+				</div>
+			</form>
+		</div>
+		<h1>{{lang_moduleName}}</h1>
 	</div>
-</form>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/modules-available/permissionmanager/templates/roleeditor.html b/modules-available/permissionmanager/templates/roleeditor.html
index d1535332..fd78fc54 100644
--- a/modules-available/permissionmanager/templates/roleeditor.html
+++ b/modules-available/permissionmanager/templates/roleeditor.html
@@ -1,16 +1,17 @@
+<h1>{{lang_roleEditor}}</h1>
 <form method="post" action="?do=permissionmanager">
 	<input type="hidden" name="action" value="saveRole">
 	<input type="hidden" name="token" value="{{token}}">
 	<input type="hidden" name="roleid" value="{{roleid}}">
 	<div class="row">
-		<div class="col-md-12">
+		<div class="col-md-12" style="margin-bottom: 20px;">
 			<b>{{lang_Name}}:</b>
 			<input name="roleName" value="{{roleName}}" type="text" id="roleName" class="form-control">
-			<button type="button" id="cancelButton" class="btn btn-default pull-right"><span class="glyphicon glyphicon-remove"></span> {{lang_Cancel}}</button>
 			<button type="submit" id="saveButton" class="btn btn-primary pull-right"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_Save}}</button>
+			<button type="button" id="cancelButton" class="btn btn-default pull-right">{{lang_Cancel}}</button>
 		</div>
 	</div>
-	<div class="row">
+	<div class="row" style="margin-bottom: 20px;">
 		<div class="col-md-3">
 			<b style="line-height: 34px">{{lang_Locations}}:</b>
 			<div class="pull-right"><input name="allLocations" {{allLocChecked}} type="checkbox" id="allLocations"></div>
diff --git a/modules-available/permissionmanager/templates/rolestable.html b/modules-available/permissionmanager/templates/rolestable.html
index a3e31e15..dab0faeb 100644
--- a/modules-available/permissionmanager/templates/rolestable.html
+++ b/modules-available/permissionmanager/templates/rolestable.html
@@ -16,8 +16,8 @@
 				<thead>
 					<tr>
 						<th data-sort="string">{{lang_Roles}}</th>
-						<th>{{lang_Edit}}</th>
-						<th>{{lang_Delete}}</th>
+						<th class="text-center">{{lang_Edit}}</th>
+						<th class="text-center">{{lang_Delete}}</th>
 					</tr>
 				</thead>
 
@@ -25,11 +25,11 @@
 				{{#roles}}
 					<tr class="rolesRow">
 						<td class="rolesData">{{roleName}}</td>
-						<td>
-							<a href="?do=permissionmanager&show=roleEditor&roleid={{roleId}}">{{lang_Edit}}</a>
+						<td class="text-center">
+							<a class="btn btn-xs btn-info" href="?do=permissionmanager&show=roleEditor&roleid={{roleId}}"><span class="glyphicon glyphicon-edit"></span></a>
 						</td>
-						<td>
-							<a href="#deleteModal" data-toggle="modal" data-target="#deleteModal" onclick="deleteRole('{{roleId}}')">{{lang_Delete}}</a>
+						<td class="text-center">
+							<a class="btn btn-xs btn-danger" href="#deleteModal" data-toggle="modal" data-target="#deleteModal" onclick="deleteRole('{{roleId}}')"><span class="glyphicon glyphicon-trash"></span></a>
 						</td>
 					</tr>
 				{{/roles}}
-- 
cgit v1.2.3-55-g7522