aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-11-29 14:08:37 -0800
committerfriendica <info@friendica.com>2013-11-29 14:09:21 -0800
commit1c5f98440da1b4713d0f5b9f8f6a2d3ca39e23af (patch)
treeb1d8d2a83e8b0f18a5841f49af09603e9c636b6c /view
parentb707495b5072d6f15e801155b2ce54854224b33c (diff)
downloadvolse-hubzilla-1c5f98440da1b4713d0f5b9f8f6a2d3ca39e23af.tar.gz
volse-hubzilla-1c5f98440da1b4713d0f5b9f8f6a2d3ca39e23af.tar.bz2
volse-hubzilla-1c5f98440da1b4713d0f5b9f8f6a2d3ca39e23af.zip
quite a bit of work on default acl permissions and various acl quirks
Diffstat (limited to 'view')
-rw-r--r--view/js/mod_settings.js5
-rwxr-xr-xview/tpl/settings.tpl4
2 files changed, 7 insertions, 2 deletions
diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js
index e749cd761..7f9a9e960 100644
--- a/view/js/mod_settings.js
+++ b/view/js/mod_settings.js
@@ -3,6 +3,11 @@ var ispublic = aStr['everybody'] ;
$(document).ready(function() {
+ $("a#settings-default-perms-menu").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
+ });
+
$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
var selstr;
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 10378e599..8781304c1 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -4,7 +4,7 @@
{{$nickname_block}}
<form action="settings" id="settings-form" method="post" autocomplete="off" >
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+<input type='hidden' name='form_security_token' value='{{$form_security_token}}' />
<h3 class="settings-heading">{{$h_basic}}</h3>
@@ -73,7 +73,7 @@
{{/if}}
<div id="settings-default-perms" class="settings-default-perms" >
- <a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>{{$permissions}} {{$permdesc}}</a>
+ <a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" >{{$permissions}} {{$permdesc}}</a>
<div id="settings-default-perms-menu-end"></div>
<div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >