diff options
| author | redmatrix <git@macgirvin.com> | 2016-05-09 06:53:31 +1000 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-05-09 06:53:31 +1000 |
| commit | 5ac262bd610097b0e756003c39bc9fad4df7c321 (patch) | |
| tree | 0c3ef6ae7bd82e2b7337d8cb4b336faee89b7d59 /view | |
| parent | 2b77c9a74bf4393dd3894420e602e7212c29ba42 (diff) | |
| parent | 09ef30feb0e6f38ee3de34a37270cf796850b3d4 (diff) | |
| download | volse-hubzilla-5ac262bd610097b0e756003c39bc9fad4df7c321.tar.gz volse-hubzilla-5ac262bd610097b0e756003c39bc9fad4df7c321.tar.bz2 volse-hubzilla-5ac262bd610097b0e756003c39bc9fad4df7c321.zip | |
Merge pull request #370 from Treer/permissions
ACL dialogs: Make the non-ACL-option description more accurate
Diffstat (limited to 'view')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 7 | ||||
| -rwxr-xr-x | view/tpl/acl_selector.tpl | 8 |
2 files changed, 14 insertions, 1 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 547fe9ec3..ebabd68e4 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1046,6 +1046,13 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover { font-size: 140%; } +#acl-info-icon, +#acl-info-icon:active { + font-size: 110%; + color: $link_colour; + text-decoration: none; +} + #acl-showall-caption { margin-left: 0.35em; } diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index 0df72747a..050417257 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -25,8 +25,12 @@ <div id="acl-radiowrapper-showall" class="radio"> <label> <input id="acl-showall" type="radio" name="optionsRadios" value="option1" checked> - <i class="fa fa-globe"></i><span id=acl-showall-caption>{{$showall}}</span> + {{if $showallIcon}}<i class="fa {{$showallIcon}}"></i>{{/if}} + <span id="acl-showall-caption">{{$showall}}</span> </label> + {{if $showallOrigin}} + <a id="acl-info-icon" role="button" tabindex="0" class="fa fa-info-circle" data-trigger="focus" data-toggle="popover" data-placement="top" data-content="{{$showallOrigin}}"></a> + {{/if}} </div> <div id="acl-radiowrapper-showlimited" class="radio"> <label> @@ -61,6 +65,8 @@ </div><!-- /.modal --> <script> + $('[data-toggle="popover"]').popover(); // Init the popover, if present + if(typeof acl=="undefined"){ acl = new ACL( baseurl+"/acl", |