aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-12-08 15:14:32 -0800
committerfriendica <info@friendica.com>2012-12-08 15:14:32 -0800
commit75ea0cfa32ea490314331100281183d775861789 (patch)
tree2f13e4360fecca7c46af1c6bdb01a77815a42c9e
parentc70777e19c6b48fe128e7ee9cbcaefb1de84c793 (diff)
downloadvolse-hubzilla-75ea0cfa32ea490314331100281183d775861789.tar.gz
volse-hubzilla-75ea0cfa32ea490314331100281183d775861789.tar.bz2
volse-hubzilla-75ea0cfa32ea490314331100281183d775861789.zip
make permission quick links work
-rw-r--r--mod/connections.php7
-rw-r--r--version.inc2
-rw-r--r--view/js/mod_connections.js30
-rw-r--r--view/tpl/abook_edit.tpl9
-rw-r--r--view/tpl/field_acheckbox.tpl4
5 files changed, 44 insertions, 8 deletions
diff --git a/mod/connections.php b/mod/connections.php
index 106057006..457a2db12 100644
--- a/mod/connections.php
+++ b/mod/connections.php
@@ -330,8 +330,11 @@ function connections_content(&$a) {
'$them' => t('Their Settings'),
'$me' => t('My Settings'),
'$perms' => $perms,
-
-
+ '$full' => t('Full Sharing'),
+ '$cautious' => t('Cautious Sharing'),
+ '$follow' => t('Follow Only'),
+ '$advanced' => t('Advanced Permissions'),
+ '$quick' => t('Quick Links'),
'$common_link' => $a->get_baseurl(true) . '/common/loc/' . local_user() . '/' . $contact['id'],
'$all_friends' => $all_friends,
'$relation_text' => $relation_text,
diff --git a/version.inc b/version.inc
index 80e6e78db..8acdaf442 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2012-12-07.162
+2012-12-08.163
diff --git a/view/js/mod_connections.js b/view/js/mod_connections.js
index 6a7f2eaed..cb4badff5 100644
--- a/view/js/mod_connections.js
+++ b/view/js/mod_connections.js
@@ -19,3 +19,33 @@ $(".autocomplete-w1 .selected").keyup(function(event){
$("#contacts-search-submit").click();
}
});
+
+
+function connectFullShare() {
+ $('#me_id_perms_view_stream').attr('checked','checked');
+ $('#me_id_perms_view_profile').attr('checked','checked');
+ $('#me_id_perms_view_photos').attr('checked','checked');
+ $('#me_id_perms_view_contacts').attr('checked','checked');
+ $('#me_id_perms_send_stream').attr('checked','checked');
+ $('#me_id_perms_post_wall').attr('checked','checked');
+ $('#me_id_perms_post_comments').attr('checked','checked');
+ $('#me_id_perms_post_mail').attr('checked','checked');
+ $('#me_id_perms_chat').attr('checked','checked');
+
+}
+
+function connectCautiousShare() {
+ $('#me_id_perms_view_stream').attr('checked','checked');
+ $('#me_id_perms_view_profile').attr('checked','checked');
+ $('#me_id_perms_view_photos').attr('checked','checked');
+ $('#me_id_perms_send_stream').attr('checked','checked');
+ $('#me_id_perms_post_comments').attr('checked','checked');
+ $('#me_id_perms_post_mail').attr('checked','checked');
+
+}
+
+function connectFollowOnly() {
+ $('#me_id_perms_send_stream').attr('checked','checked');
+
+}
+
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index b9664835f..abded1979 100644
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -22,11 +22,14 @@ $slide
<input id="contact-closeness-mirror" type="hidden" name="closeness" value="$close" />
<br />
-<b>Quick Links:</b>
-<a href="" style="background-color: #CCC; padding: 3px; border-radius: 5px; margin-left: 15px;">Full Sharing</a><a href="" style="background-color: #CCC; padding: 3px; border-radius: 5px; margin-left: 15px;">Cautious Sharing</a><a href="" style="background-color: #CCC; padding: 3px; border-radius: 5px; margin-left: 15px;">Follow Only</a><br />
+<b>$quick</b>
+<ul>
+<li><a href="#" onclick="connectFullShare(); return false;">$full</a></li>
+<li><a href="#" onclick="connectCautiousShare(); return false;">$cautious</a></li>
+<li><a href="#" onclick="connectFollowOnly(); return false;">$follow</a></li>
<br />
-<div id="abook-advanced" class="fakelink" onclick="openClose('abook-advanced-panel');">Advanced Permissions</div>
+<div id="abook-advanced" class="fakelink" onclick="openClose('abook-advanced-panel');">$advanced</div>
<div id="abook-advanced-panel" style="display: none;">
diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl
index b1edd782e..06bed38e7 100644
--- a/view/tpl/field_acheckbox.tpl
+++ b/view/tpl/field_acheckbox.tpl
@@ -1,7 +1,7 @@
<div class='field acheckbox'>
<label for='id_$field.0'>$field.1</label>
- <input type="checkbox" class="abook-edit-them" name='$field.0' id='id_$field.0' value="1" disabled="disabled" {{ if $field.2 }}checked="checked"{{ endif }} />
- <input type="checkbox" class="abook-edit-me" name='$field.0' id='id_$field.0' value="$field.4" {{ if $field.3 }}checked="checked"{{ endif }} {{ if $field.5 }} disabled="disabled" {{ endif }}/>
+ <input type="checkbox" class="abook-edit-them" name='$field.0' id='them_id_$field.0' value="1" disabled="disabled" {{ if $field.2 }}checked="checked"{{ endif }} />
+ <input type="checkbox" class="abook-edit-me" name='$field.0' id='me_id_$field.0' value="$field.4" {{ if $field.3 }}checked="checked"{{ endif }} {{ if $field.5 }} disabled="disabled" {{ endif }}/>
<span class='field_abook_help'>$field.6</span>
</div>