diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-25 14:40:31 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-03-25 14:40:31 -0700 |
| commit | e5e0a6b31f7870a46766c1e8ff87886fdb14b6de (patch) | |
| tree | 7035d84f2edbc6b6efa435527ffdc3cd38b8027a /view/tpl/acl_selector.tpl | |
| parent | 5c63f7dd58c5b3b88efcc47120c791f92527f720 (diff) | |
| parent | 2115eb26a7fd2ca937286bd4e98ab74c7d6e9525 (diff) | |
| download | volse-hubzilla-e5e0a6b31f7870a46766c1e8ff87886fdb14b6de.tar.gz volse-hubzilla-e5e0a6b31f7870a46766c1e8ff87886fdb14b6de.tar.bz2 volse-hubzilla-e5e0a6b31f7870a46766c1e8ff87886fdb14b6de.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view/tpl/acl_selector.tpl')
| -rwxr-xr-x | view/tpl/acl_selector.tpl | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index c23840c16..e0b31162a 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -3,11 +3,13 @@ <div class="modal-dialog"> <div class="modal-content"> <div class="modal-header"> + <h4 class="modal-title"> + <i id="dialog-perms-icon" class="fa fa-fw"></i> {{$aclModalTitle}} + {{if $helpUrl}} + <a target="hubzilla-help" href="{{$helpUrl}}" class="contextual-help-tool" title="Help and documentation"><i class="fa fa-fw fa-question"></i></a> + {{/if}} + </h4> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> - {{if $helpUrl}} - <a type="button" target="hubzilla-help" href="{{$helpUrl}}" class="contextual-help-tool" title="Help and documentation"><i class="fa fa-question"></i></a> - {{/if}} - <h4 class="modal-title"><i id="dialog-perms-icon" class="fa fa-fw"></i> {{$aclModalTitle}}</h4> </div> <div class="section-content-wrapper"> {{if $aclModalDesc}} @@ -29,32 +31,30 @@ <div id="acl-wrapper"> <div id="acl-list"> - <div id="acl-search-wrapper"> - <input type="text" id="acl-search" placeholder=" {{$search}}"> - </div> - <div id="acl-list-content-wrapper"> - <div id=acl-showlimited-description>{{$showlimitedDesc}}</div> - <div id="acl-list-content"></div> - </div> + <input class="form-control" type="text" id="acl-search" placeholder=" {{$search}}"> + <div class="p-2 dropdown-sub-text">{{$showlimitedDesc}}</div> + <div id="acl-list-content"></div> </div> </div> <div class="acl-list-item" rel="acl-template" style="display:none"> - <img data-src="{0}"><p>{1}</p> - <button class="acl-button-hide btn btn-xs btn-default"><i class="fa fa-times"></i> {{$hide}}</button> - <button class="acl-button-show btn btn-xs btn-default"><i class="fa fa-check"></i> {{$show}}</button> + <div class="acl-item-header"> + <img class="menu-img-1" data-src="{0}"> {1} + </div> + <button class="acl-button-hide btn btn-sm btn-outline-danger"><i class="fa fa-times"></i> {{$hide}}</button> + <button class="acl-button-show btn btn-sm btn-outline-success"><i class="fa fa-check"></i> {{$show}}</button> </div> - </div> <div class="modal-footer clear"> - <button type="button" class="btn btn-default" data-dismiss="modal">{{$aclModalDismiss}}</button> + <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">{{$aclModalDismiss}}</button> </div> </div><!-- /.modal-content --> </div><!-- /.modal-dialog --> </div><!-- /.modal --> </form> <script> - $('[data-toggle="popover"]').popover(); // Init the popover, if present + // compatibility issue with bootstrap v4 + //$('[data-toggle="popover"]').popover(); // Init the popover, if present if(typeof acl=="undefined"){ acl = new ACL( |