aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl/settings.tpl
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2014-04-12 07:20:24 +1000
committerRedMatrix <info@friendica.com>2014-04-12 07:20:24 +1000
commitaa1f5ce7535d4cf17dbdafb4b780a538f35ef05f (patch)
treef56796a4410464c7f4211e2c4d5260a44c944ae1 /view/tpl/settings.tpl
parent0a871c3f14fb326efa033d89a8e413ad693c1341 (diff)
parent3197ccbf5edf51eab49623c7c21e63af7de7f127 (diff)
downloadvolse-hubzilla-aa1f5ce7535d4cf17dbdafb4b780a538f35ef05f.tar.gz
volse-hubzilla-aa1f5ce7535d4cf17dbdafb4b780a538f35ef05f.tar.bz2
volse-hubzilla-aa1f5ce7535d4cf17dbdafb4b780a538f35ef05f.zip
Merge pull request #404 from git-marijus/master
bootstrapify aclselector
Diffstat (limited to 'view/tpl/settings.tpl')
-rwxr-xr-xview/tpl/settings.tpl15
1 files changed, 3 insertions, 12 deletions
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index acea86015..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>
@@ -73,18 +73,9 @@
</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>