aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-07-17 18:12:50 -0700
committerfriendica <info@friendica.com>2013-07-17 18:12:50 -0700
commite147bb80de80549e159cf187abbf01944f9e848a (patch)
tree09f4b5b89dcbbcd022abc8468924aea0e4acda4b
parent2323e946ee7e239ce138e0ca0a9b54624b901c66 (diff)
downloadvolse-hubzilla-e147bb80de80549e159cf187abbf01944f9e848a.tar.gz
volse-hubzilla-e147bb80de80549e159cf187abbf01944f9e848a.tar.bz2
volse-hubzilla-e147bb80de80549e159cf187abbf01944f9e848a.zip
usability improvements on abook permissions settings - keep advanced dialogue open, make quick links clear relevant settings before setting each, and don't auto submit. This shows you exactly what happens with the quick settings and allows you to change/correct it if it isn't what you want.
-rw-r--r--view/js/mod_connections.js24
-rwxr-xr-xview/tpl/abook_edit.tpl12
2 files changed, 30 insertions, 6 deletions
diff --git a/view/js/mod_connections.js b/view/js/mod_connections.js
index 9d4a03340..6bfa039a8 100644
--- a/view/js/mod_connections.js
+++ b/view/js/mod_connections.js
@@ -22,6 +22,10 @@ $(".autocomplete-w1 .selected").keyup(function(event){
function connectFullShare() {
+ $('.abook-edit-me').each(function() {
+ if(! $(this).is(':disabled'))
+ $(this).removeAttr('checked');
+ });
$('#me_id_perms_view_stream').attr('checked','checked');
$('#me_id_perms_view_profile').attr('checked','checked');
$('#me_id_perms_view_photos').attr('checked','checked');
@@ -37,6 +41,11 @@ function connectFullShare() {
}
function connectCautiousShare() {
+ $('.abook-edit-me').each(function() {
+ if(! $(this).is(':disabled'))
+ $(this).removeAttr('checked');
+ });
+
$('#me_id_perms_view_stream').attr('checked','checked');
$('#me_id_perms_view_profile').attr('checked','checked');
$('#me_id_perms_view_photos').attr('checked','checked');
@@ -48,6 +57,11 @@ function connectCautiousShare() {
}
function connectForum() {
+ $('.abook-edit-me').each(function() {
+ if(! $(this).is(':disabled'))
+ $(this).removeAttr('checked');
+ });
+
$('#me_id_perms_view_stream').attr('checked','checked');
$('#me_id_perms_view_profile').attr('checked','checked');
$('#me_id_perms_view_photos').attr('checked','checked');
@@ -62,6 +76,11 @@ function connectForum() {
}
function connectSoapBox() {
+ $('.abook-edit-me').each(function() {
+ if(! $(this).is(':disabled'))
+ $(this).removeAttr('checked');
+ });
+
$('#me_id_perms_view_stream').attr('checked','checked');
$('#me_id_perms_view_profile').attr('checked','checked');
$('#me_id_perms_view_photos').attr('checked','checked');
@@ -72,6 +91,11 @@ function connectSoapBox() {
function connectFollowOnly() {
+ $('.abook-edit-me').each(function() {
+ if(! $(this).is(':disabled'))
+ $(this).removeAttr('checked');
+ });
+
$('#me_id_perms_send_stream').attr('checked','checked');
}
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 806ded24b..c285e56d1 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -47,17 +47,17 @@
<b>{{$quick}}</b>
<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="connectForum(); // $('#abook-edit-form').submit();">{{$forum}}</span></li>
+<li><span class="fakelink" onclick="connectSoapBox(); // $('#abook-edit-form').submit();">{{$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(); // $('#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>
</ul>
<div id="abook-advanced" class="fakelink" onclick="openClose('abook-advanced-panel');">{{$advanced}}</div>
-<div id="abook-advanced-panel" style="display: none;">
+<div id="abook-advanced-panel" style="display: block;">
<span class="abook-them">{{$them}}</span><span class="abook-me">{{$me}}</span>
<br />