aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-04-21 15:41:04 -0700
committerfriendica <info@friendica.com>2014-04-21 15:41:04 -0700
commitaafbd11a375c97c66d8c5eab6966119b20219e50 (patch)
tree287746ce86648ce1e66f9e6a6acaba9cf05f9d1f
parent8c92a445b2036c2c02950b80c3dd296cc587f8b8 (diff)
downloadvolse-hubzilla-aafbd11a375c97c66d8c5eab6966119b20219e50.tar.gz
volse-hubzilla-aafbd11a375c97c66d8c5eab6966119b20219e50.tar.bz2
volse-hubzilla-aafbd11a375c97c66d8c5eab6966119b20219e50.zip
Setting to undo/clear auto permissions
-rw-r--r--mod/connedit.php1
-rw-r--r--version.inc2
-rw-r--r--view/js/mod_connedit.js9
-rwxr-xr-xview/tpl/abook_edit.tpl11
4 files changed, 17 insertions, 6 deletions
diff --git a/mod/connedit.php b/mod/connedit.php
index 198a66b56..61bb62766 100644
--- a/mod/connedit.php
+++ b/mod/connedit.php
@@ -482,6 +482,7 @@ function connedit_content(&$a) {
'$them' => t('Their Settings'),
'$me' => t('My Settings'),
'$perms' => $perms,
+ '$clear' => t('Clear/Disable Automatic Permissions'),
'$forum' => t('Forum Members'),
'$soapbox' => t('Soapbox'),
'$full' => t('Full Sharing (typical social network permissions)'),
diff --git a/version.inc b/version.inc
index b701accdf..8b6f8c940 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-04-20.651
+2014-04-21.652
diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js
index 64240abb8..e66c26cda 100644
--- a/view/js/mod_connedit.js
+++ b/view/js/mod_connedit.js
@@ -80,6 +80,15 @@ function connectForum() {
}
+function connectClear() {
+ $('.abook-edit-me').each(function() {
+ if(! $(this).is(':disabled'))
+ $(this).removeAttr('checked');
+ });
+ $('.abook-permschange').show();
+ $('.abook-permschange').html(aStr['permschange']);
+}
+
function connectSoapBox() {
$('.abook-edit-me').each(function() {
if(! $(this).is(':disabled'))
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index b7a02c15e..b8b01df4c 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -67,12 +67,13 @@
<h3>{{$quick}}</h3>
<ul>
{{if $self}}
-<li><span class="fakelink" onclick="connectForum(); // $('#abook-edit-form').submit();">{{$forum}}</span></li>
-<li><span class="fakelink" onclick="connectSoapBox(); // $('#abook-edit-form').submit();">{{$soapbox}}</span></li>
+<li><span class="fakelink" onclick="connectClear();">{{$clear}}</span></li>
+<li><span class="fakelink" onclick="connectForum();">{{$forum}}</span></li>
+<li><span class="fakelink" onclick="connectSoapBox();">{{$soapbox}}</span></li>
{{/if}}
-<li><span class="fakelink" onclick="connectFullShare(); // $('#abook-edit-form').submit();">{{$full}}</span></li>
-<li><span class="fakelink" onclick="connectCautiousShare(); // $('#abook-edit-form').submit();">{{$cautious}}</span></li>
-<li><span class="fakelink" onclick="connectFollowOnly(); // $('#abook-edit-form').submit();">{{$follow}}</span></li>
+<li><span class="fakelink" onclick="connectFullShare();">{{$full}}</span></li>
+<li><span class="fakelink" onclick="connectCautiousShare();">{{$cautious}}</span></li>
+<li><span class="fakelink" onclick="connectFollowOnly();">{{$follow}}</span></li>
</ul>
<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />