Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 13:43:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add permissions tool-tips

Browse source
This commit is contained in:
David Rowe 2016-06-08 09:11:37 +12:00
parent f2d81f1338
commit 801981816b
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
domain-server/resources/describe-settings.json
View file

@ -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 <a data-toggle='tooltip' data-html=true title='<p><strong>Connect</strong> &ndash; Sets whether a user can connect to the the domain.<br /><strong>Lock / Unlock</strong> &ndash; Sets whether a user change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).<br /><strong>Rez</strong> &ndash; Sets whether a user can create new entities.<br /><strong>Rez Temporary</strong> &ndash; Sets whether a user can create new entities with a finite lifetime.<br /><strong>Write Assets</strong> &ndash; Sets whether a user can make changes to the domain&rsquo;s asset-server assets.<br /><strong>Ignore Max Capacity</strong> &ndash; Sets whether a user can connect even if the domain has reached or exceeded its maximum allowed agents.<br /></p><p>Note that permissions assigned to a specific user will supersede any parameter-level permissions that might otherwise apply to that user. Additionally, if more than one parameter is applicable to a given user, the permissions given to that user will be the sum of all applicable parameters. For example, let&rsquo;s say only localhost users can connect and only logged in users can lock and unlock entities. If a user is both logged in and on localhost then they will be able to both connect and lock/unlock entities.</p>'>domain-wide permissions</a>.",
"caption": "Standard Permissions",
"can_add_new_rows": false,
"groups": [
{
"label": "User / Group",
"span": 1
"span": 1
},
{
"label": "Permissions",
"span": 6
"label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Connect</strong> &ndash; Sets whether a user can connect to the the domain.<br /><strong>Lock / Unlock</strong> &ndash; Sets whether a user change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).<br /><strong>Rez</strong> &ndash; Sets whether a user can create new entities.<br /><strong>Rez Temporary</strong> &ndash; Sets whether a user can create new entities with a finite lifetime.<br /><strong>Write Assets</strong> &ndash; Sets whether a user can make changes to the domain&rsquo;s asset-server assets.<br /><strong>Ignore Max Capacity</strong> &ndash; Sets whether a user can connect even if the domain has reached or exceeded its maximum allowed agents.<br /></p><p>Note that permissions assigned to a specific user will supersede any parameter-level permissions that might otherwise apply to that user. Additionally, if more than one parameter is applicable to a given user, the permissions given to that user will be the sum of all applicable parameters. For example, let&rsquo;s say only localhost users can connect and only logged in users can lock and unlock entities. If a user is both logged in and on localhost then they will be able to both connect and lock/unlock entities.</p>'>?</a>",
"span": 6
}
],
@ -176,11 +176,11 @@
"groups": [
{
"label": "User / Group",
"span": 1
"span": 1
},
{
"label": "Permissions",
"span": 6
"label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Connect</strong> &ndash; Sets whether a user can connect to the the domain.<br /><strong>Lock / Unlock</strong> &ndash; Sets whether a user change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).<br /><strong>Rez</strong> &ndash; Sets whether a user can create new entities.<br /><strong>Rez Temporary</strong> &ndash; Sets whether a user can create new entities with a finite lifetime.<br /><strong>Write Assets</strong> &ndash; Sets whether a user can make changes to the domain&rsquo;s asset-server assets.<br /><strong>Ignore Max Capacity</strong> &ndash; Sets whether a user can connect even if the domain has reached or exceeded its maximum allowed agents.<br /></p><p>Note that permissions assigned to a specific user will supersede any parameter-level permissions that might otherwise apply to that user. Additionally, if more than one parameter is applicable to a given user, the permissions given to that user will be the sum of all applicable parameters. For example, let&rsquo;s say only localhost users can connect and only logged in users can lock and unlock entities. If a user is both logged in and on localhost then they will be able to both connect and lock/unlock entities.</p>'>?</a>",
"span": 6
}
],

5
domain-server/resources/web/css/style.css
View file

@ -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;
}

2
domain-server/resources/web/settings/js/settings.js
View file

@ -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',