From 12fec381898ce5c1d5bef7a9b6bf3fcca36addf4 Mon Sep 17 00:00:00 2001
From: Udo Walter
Date: Mon, 10 Apr 2017 19:53:28 +0200
Subject: [permissionmanager] changed description to tooltips
---
modules-available/permissionmanager/style.css | 7 +++++--
modules-available/permissionmanager/templates/permission.html | 4 ++--
modules-available/permissionmanager/templates/roleeditor.html | 6 ++++++
modules-available/statistics_reporting/page.inc.php | 7 ++++++-
4 files changed, 19 insertions(+), 5 deletions(-)
(limited to 'modules-available')
diff --git a/modules-available/permissionmanager/style.css b/modules-available/permissionmanager/style.css
index f1f8e250..e1fac370 100644
--- a/modules-available/permissionmanager/style.css
+++ b/modules-available/permissionmanager/style.css
@@ -47,10 +47,13 @@
}
.disabled {
- pointer-events: none;
opacity: 0.6;
}
+input[type='checkbox']:disabled {
+ cursor: inherit;
+}
+
.module-toggle-group {
width: 100%;
margin-top: 20px;
@@ -83,4 +86,4 @@
-webkit-column-count: 2;
column-count: 2;
}
-}
\ No newline at end of file
+}
diff --git a/modules-available/permissionmanager/templates/permission.html b/modules-available/permissionmanager/templates/permission.html
index 3cc0bf97..b28b9099 100644
--- a/modules-available/permissionmanager/templates/permission.html
+++ b/modules-available/permissionmanager/templates/permission.html
@@ -1,6 +1,6 @@
-
+
-
+
\ No newline at end of file
diff --git a/modules-available/permissionmanager/templates/roleeditor.html b/modules-available/permissionmanager/templates/roleeditor.html
index d21b3fbd..bfabf4af 100644
--- a/modules-available/permissionmanager/templates/roleeditor.html
+++ b/modules-available/permissionmanager/templates/roleeditor.html
@@ -45,6 +45,7 @@
selectedPermissions = "{{selectedPermissions}}";
document.addEventListener("DOMContentLoaded", function () {
+
$('#select-location').selectize({
allowEmptyOption: false,
maxItems: null,
@@ -138,6 +139,11 @@
button.addClass("btn-primary");
}
+
+ $('[data-toggle="tooltip"]').tooltip({
+ container: 'body',
+ trigger : 'hover'
+ });
});
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index 6bd908a5..4845d5be 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -124,7 +124,12 @@ class Page_Statistics_Reporting extends Page
Render::addTemplate('columnChooser', $data);
$data['data'] = $this->fetchData(GETDATA_PRINTABLE);
- Render::addTemplate('table-' . $this->type, $data);
+
+ if (User::hasPermission("table.view.$this->type"))
+ Render::addTemplate('table-' . $this->type, $data);
+ else
+ Message::addError('main.no-permission');
+
}
}
--
cgit v1.2.3-55-g7522