From a1920b7f3f416e76863690d24de7282917698c09 Mon Sep 17 00:00:00 2001 From: Udo Walter Date: Thu, 7 Dec 2017 18:48:00 +0100 Subject: [permissionmanager] added support for localized permission descriptions; moved add/delete buttons to the right; items in the user and locations table can now be selected by clicking anywhere in the table row; --- modules-available/permissionmanager/clientscript.js | 6 ++++++ modules-available/permissionmanager/inc/permissionutil.inc.php | 7 +++---- modules-available/permissionmanager/style.css | 4 ++++ modules-available/permissionmanager/templates/rolestable.html | 4 +++- modules-available/permissionmanager/templates/userstable.html | 9 ++++++--- 5 files changed, 22 insertions(+), 8 deletions(-) (limited to 'modules-available/permissionmanager') diff --git a/modules-available/permissionmanager/clientscript.js b/modules-available/permissionmanager/clientscript.js index 700ebc11..65065e6e 100644 --- a/modules-available/permissionmanager/clientscript.js +++ b/modules-available/permissionmanager/clientscript.js @@ -42,6 +42,12 @@ document.addEventListener("DOMContentLoaded", function() { }); } + $("tr").on('click', function (e) { + if (e.target.type !== "checkbox") { + $(this).find("input:checkbox").trigger("click"); + } + }); + $("form input").keydown(function(e) { if (e.keyCode === 13) e.preventDefault(); }); diff --git a/modules-available/permissionmanager/inc/permissionutil.inc.php b/modules-available/permissionmanager/inc/permissionutil.inc.php index 391cd047..64fe8f26 100644 --- a/modules-available/permissionmanager/inc/permissionutil.inc.php +++ b/modules-available/permissionmanager/inc/permissionutil.inc.php @@ -73,10 +73,9 @@ class PermissionUtil if (!is_array($data)) continue; preg_match('#^modules/([^/]+)/#', $file, $out); - $newData = array(); - foreach( $data as $k => $v ) { - $newData[] = $v; - $permissions = self::putInPermissionTree($out[1].".".$k, $v, $permissions); + foreach( $data as $p ) { + $description = Dictionary::translateFileModule($out[1], "permissions", $p); + $permissions = self::putInPermissionTree($out[1].".".$p, $description, $permissions); } } ksort($permissions); diff --git a/modules-available/permissionmanager/style.css b/modules-available/permissionmanager/style.css index bb03d153..8e9db0e4 100644 --- a/modules-available/permissionmanager/style.css +++ b/modules-available/permissionmanager/style.css @@ -41,6 +41,10 @@ margin-bottom: 20px; } +.selectize-input { + overflow: visible; +} + .tree-container .selected { background-color: rgba(0, 182, 41, 0.23); diff --git a/modules-available/permissionmanager/templates/rolestable.html b/modules-available/permissionmanager/templates/rolestable.html index 99401624..992feca1 100644 --- a/modules-available/permissionmanager/templates/rolestable.html +++ b/modules-available/permissionmanager/templates/rolestable.html @@ -3,11 +3,13 @@
-
+
+ +
diff --git a/modules-available/permissionmanager/templates/userstable.html b/modules-available/permissionmanager/templates/userstable.html index bd48d16d..9f684e99 100644 --- a/modules-available/permissionmanager/templates/userstable.html +++ b/modules-available/permissionmanager/templates/userstable.html @@ -3,10 +3,8 @@
- -
-
+
+
+ + +
@@ -152,6 +154,7 @@ }); }); + // if remove-Role button is clicked, uncheck all checkboxes in add-role modal so they aren't submitted too function clearAddRoleModal () { $('#addRoleToUserModal') -- cgit v1.2.3-55-g7522 From 7da850f5a35841919d298bd027dd1d05b27467d5 Mon Sep 17 00:00:00 2001 From: Udo Walter Date: Thu, 14 Dec 2017 14:06:50 +0100 Subject: [permissionmanager] removed alert from roleeditor --- modules-available/permissionmanager/style.css | 5 +++++ modules-available/permissionmanager/templates/roleeditor.html | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'modules-available/permissionmanager') diff --git a/modules-available/permissionmanager/style.css b/modules-available/permissionmanager/style.css index 8e9db0e4..49d631a8 100644 --- a/modules-available/permissionmanager/style.css +++ b/modules-available/permissionmanager/style.css @@ -13,6 +13,11 @@ margin-left: 10px; } +.missingInput { + border-color: rgba(255, 0, 0, 0.8); + box-shadow: 0 1px 1px rgba(255, 0, 0, 0.075) inset, 0 0 8px rgba(255, 0, 0, 0.6); +} + .table { margin-top: 20px; } diff --git a/modules-available/permissionmanager/templates/roleeditor.html b/modules-available/permissionmanager/templates/roleeditor.html index 14839ee2..b07e2112 100644 --- a/modules-available/permissionmanager/templates/roleeditor.html +++ b/modules-available/permissionmanager/templates/roleeditor.html @@ -64,7 +64,7 @@ $('form').submit(function () { var name = $.trim($('#rolename').val()); if (name === '') { - alert('{{lang_emptyNameWarning}}'); + $("#rolename").addClass("missingInput"); return false; } }); -- cgit v1.2.3-55-g7522