diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index 397c7fe6d0..43eb5c7ee9 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -100,18 +100,18 @@
"name": "standard_permissions",
"type": "table",
"label": "Domain-Wide User Permissions",
- "help": "Indicate which users or groups can have which domain-wide permissions.",
+ "help": "Indicate which users or groups can have which domain-wide permissions.",
"caption": "Standard Permissions",
"can_add_new_rows": false,
"groups": [
{
"label": "User / Group",
- "span": 1
+ "span": 1
},
{
- "label": "Permissions",
- "span": 6
+ "label": "Permissions ?",
+ "span": 6
}
],
@@ -176,11 +176,11 @@
"groups": [
{
"label": "User / Group",
- "span": 1
+ "span": 1
},
{
- "label": "Permissions",
- "span": 6
+ "label": "Permissions ?",
+ "span": 6
}
],
diff --git a/domain-server/resources/web/css/style.css b/domain-server/resources/web/css/style.css
index 35cb6ad492..21cf753bfd 100644
--- a/domain-server/resources/web/css/style.css
+++ b/domain-server/resources/web/css/style.css
@@ -121,6 +121,11 @@ table[name="security.standard_permissions"] .headers td + td, table[name="securi
text-align: center;
}
+#security .tooltip-inner {
+ max-width: 520px;
+ text-align: left;
+}
+
#xs-advanced-container {
margin-bottom: 20px;
}
diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js
index 97da975748..9188772ec9 100644
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -852,6 +852,8 @@ function reloadSettings(callback) {
// setup any bootstrap switches
$('.toggle-checkbox').bootstrapSwitch();
+ $('[data-toggle="tooltip"]').tooltip();
+
// add tooltip to locked settings
$('label.locked').tooltip({
placement: 'right',