diff options
| author | tony baldwin <tony@tonybaldwin.org> | 2014-04-12 08:37:56 -0400 |
|---|---|---|
| committer | tony baldwin <tony@tonybaldwin.org> | 2014-04-12 08:37:56 -0400 |
| commit | ebd33b185da1c36e718dfa4a2971c3db35cbda22 (patch) | |
| tree | c23cbf55aac433c90ac254d0684dabf9d4528133 /view/tpl/settings.tpl | |
| parent | 5cca00ddc79dad667464674e08a2a860e262eabd (diff) | |
| parent | d0834c7e1394e1986b2b00e039125deff74d9e5e (diff) | |
| download | volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.tar.gz volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.tar.bz2 volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/css/style.css
whatever
Diffstat (limited to 'view/tpl/settings.tpl')
| -rwxr-xr-x | view/tpl/settings.tpl | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 49dff4822..accd8f106 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -34,7 +34,7 @@ </ul> -<button type="button" class="btn btn-xs btn-warning" data-toggle="collapse" data-target="#settings-permissions-wrapper">{{$lbl_p2macro}}</button> +<button type="button" class="btn btn-xs btn-default" data-toggle="collapse" data-target="#settings-permissions-wrapper">{{$lbl_p2macro}}</button> @@ -67,24 +67,15 @@ {{include file="field_yesno.tpl" field=$blocktags}} -{{include file="field_input.tpl" field=$maxreq}} -{{include file="field_input.tpl" field=$cntunkmail}} +{{include file="field_input.tpl" field=$expire}} + </div> <div id="settings-default-perms" class="settings-default-perms" > - <a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" >{{$permissions}} {{$permdesc}}</a> + <button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button> + {{$aclselect}} <div id="settings-default-perms-menu-end"></div> - - <div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" > - - <div style="display: none;"> - <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;"> - {{$aclselect}} - </div> - </div> - - </div> </div> <br/> <div id="settings-default-perms-end"></div> |