From 0ba49ba63e81bf2f4b68f83c035bf0bef37bb3be Mon Sep 17 00:00:00 2001 From: Christian Hofmaier Date: Thu, 7 Dec 2017 18:20:06 +0100 Subject: [dozmod] reworked permission system from "click and you get error" to "button is disabled due to lack of permission" + in log as there is no button, the links to the user/target are disabled (not clickable). --- modules-available/dozmod/templates/actionlog-log.html | 4 ++-- modules-available/dozmod/templates/images-delete.html | 2 +- modules-available/dozmod/templates/mailconfig.html | 4 ++-- modules-available/dozmod/templates/orglist.html | 14 +++++++++++++- modules-available/dozmod/templates/runtimeconfig.html | 2 +- modules-available/dozmod/templates/templates.html | 4 ++-- 6 files changed, 21 insertions(+), 9 deletions(-) (limited to 'modules-available/dozmod/templates') diff --git a/modules-available/dozmod/templates/actionlog-log.html b/modules-available/dozmod/templates/actionlog-log.html index 09f3a183..8aa57207 100644 --- a/modules-available/dozmod/templates/actionlog-log.html +++ b/modules-available/dozmod/templates/actionlog-log.html @@ -18,7 +18,7 @@ {{#showActor}} {{#uuserid}} - {{ulastname}}, {{ufirstname}} + {{#allowedShowUser}}{{/allowedShowUser}} {{ulastname}}, {{ufirstname}}{{#allowedShowUser}}{{/allowedShowUser}} {{/uuserid}} {{^uuserid}} {{lang_system}} @@ -28,7 +28,7 @@ {{#showTarget}} {{#targeturl}} - {{targetname}} + {{#allowedShowTarget}}{{/allowedShowTarget}}{{targetname}}{{#allowedShowTarget}}{{/allowedShowTarget}} {{/targeturl}} {{^targeturl}} {{targetname}} diff --git a/modules-available/dozmod/templates/images-delete.html b/modules-available/dozmod/templates/images-delete.html index dd4c61bc..ed75a0d2 100644 --- a/modules-available/dozmod/templates/images-delete.html +++ b/modules-available/dozmod/templates/images-delete.html @@ -45,7 +45,7 @@ {{/images}} - + diff --git a/modules-available/dozmod/templates/mailconfig.html b/modules-available/dozmod/templates/mailconfig.html index 6edc65ae..d5d4db29 100644 --- a/modules-available/dozmod/templates/mailconfig.html +++ b/modules-available/dozmod/templates/mailconfig.html @@ -55,10 +55,10 @@
- + - +
diff --git a/modules-available/dozmod/templates/orglist.html b/modules-available/dozmod/templates/orglist.html index 361421c5..5224c962 100644 --- a/modules-available/dozmod/templates/orglist.html +++ b/modules-available/dozmod/templates/orglist.html @@ -41,7 +41,19 @@ function seto(action, el, orgid) { if (data !== '1' && data !== '0') { el.checked = !old; - box.parent().css('background-color', 'red !important'); + box.parent().css('background-color', ''); + /* show success notification */ + $notification = $('') + .addClass('glyphicon glyphicon-remove') + .css('color', 'red') + .css('width', '0px') + .css('position', 'relative') + .css('right', '20px') + .hide(); + box.before($notification); + $notification.fadeIn('fast', function () { + $notification.fadeOut('slow', function () { $notification.remove() }); + }); } else { el.checked = (data == 1); box.parent().css('background-color', ''); diff --git a/modules-available/dozmod/templates/runtimeconfig.html b/modules-available/dozmod/templates/runtimeconfig.html index cff61441..4d97ade0 100644 --- a/modules-available/dozmod/templates/runtimeconfig.html +++ b/modules-available/dozmod/templates/runtimeconfig.html @@ -113,7 +113,7 @@
- +
diff --git a/modules-available/dozmod/templates/templates.html b/modules-available/dozmod/templates/templates.html index 4764c0e9..3ee0ccbc 100644 --- a/modules-available/dozmod/templates/templates.html +++ b/modules-available/dozmod/templates/templates.html @@ -80,12 +80,12 @@ {{/templates}} - +
- +