aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-07-22 20:20:01 -0700
committerfriendica <info@friendica.com>2014-07-22 20:20:01 -0700
commit8dc3446be4ae26afdbf42cbaeb8b572f5a4658a0 (patch)
tree8059a679ef4fcae2c645a5ca58ad670440e16c72
parent1476812e9098e18e266d0fddf4575234f28561f9 (diff)
downloadvolse-hubzilla-8dc3446be4ae26afdbf42cbaeb8b572f5a4658a0.tar.gz
volse-hubzilla-8dc3446be4ae26afdbf42cbaeb8b572f5a4658a0.tar.bz2
volse-hubzilla-8dc3446be4ae26afdbf42cbaeb8b572f5a4658a0.zip
when telling somebody that permissions have changed but not yet submitted, give them a submit button *right there* so they don't have to look for it.
-rw-r--r--view/css/mod_connedit.css4
-rw-r--r--view/js/mod_connedit.js32
-rwxr-xr-xview/tpl/abook_edit.tpl4
3 files changed, 24 insertions, 16 deletions
diff --git a/view/css/mod_connedit.css b/view/css/mod_connedit.css
index 8b80b4e70..5bf598062 100644
--- a/view/css/mod_connedit.css
+++ b/view/css/mod_connedit.css
@@ -21,6 +21,10 @@
padding: 20px 5px 10px;
}
+.abook-permssave {
+ margin-left: 10px;
+}
+
#contact-slider {
width: 600px !important;
}
diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js
index 4d25bb8c4..6231dbd0c 100644
--- a/view/js/mod_connedit.js
+++ b/view/js/mod_connedit.js
@@ -1,4 +1,10 @@
+function abook_perms_msg() {
+ $('.abook-permschange').show();
+ $('.abook-permschange').html(aStr['permschange']);
+ $('.abook-permssave').show();
+}
+
$(document).ready(function() {
if(typeof(after_following) !== 'undefined' && after_following)
connectFullShare();
@@ -8,13 +14,12 @@ $(document).ready(function() {
});
$('.abook-edit-me').click(function() {
- $('.abook-permschange').show();
- $('.abook-permschange').html(aStr['permschange']);
+ abook_perms_msg();
});
-
});
+
function connectFullShare() {
$('.abook-edit-me').each(function() {
if(! $(this).is(':disabled'))
@@ -34,9 +39,7 @@ function connectFullShare() {
$('#me_id_perms_view_storage').attr('checked','checked');
$('#me_id_perms_republish').attr('checked','checked');
$('#me_id_perms_post_like').attr('checked','checked');
-
- $('.abook-permschange').show();
- $('.abook-permschange').html(aStr['permschange']);
+ abook_perms_msg();
}
function connectCautiousShare() {
@@ -54,8 +57,7 @@ function connectCautiousShare() {
$('#me_id_perms_post_comments').attr('checked','checked');
$('#me_id_perms_post_mail').attr('checked','checked');
$('#me_id_perms_post_like').attr('checked','checked');
- $('.abook-permschange').show();
- $('.abook-permschange').html(aStr['permschange']);
+ abook_perms_msg();
}
@@ -78,8 +80,7 @@ function connectForum() {
$('#me_id_perms_tag_deliver').attr('checked','checked');
$('#me_id_perms_republish').attr('checked','checked');
$('#me_id_perms_post_like').attr('checked','checked');
- $('.abook-permschange').show();
- $('.abook-permschange').html(aStr['permschange']);
+ abook_perms_msg();
}
@@ -88,8 +89,8 @@ function connectClear() {
if(! $(this).is(':disabled'))
$(this).removeAttr('checked');
});
- $('.abook-permschange').show();
- $('.abook-permschange').html(aStr['permschange']);
+ abook_perms_msg();
+
}
function connectSoapBox() {
@@ -104,8 +105,8 @@ function connectSoapBox() {
$('#me_id_perms_view_contacts').attr('checked','checked');
$('#me_id_perms_view_storage').attr('checked','checked');
$('#me_id_perms_view_pages').attr('checked','checked');
- $('.abook-permschange').show();
- $('.abook-permschange').html(aStr['permschange']);
+ abook_perms_msg();
+
}
@@ -116,8 +117,7 @@ function connectFollowOnly() {
});
$('#me_id_perms_send_stream').attr('checked','checked');
- $('.abook-permschange').show();
- $('.abook-permschange').html(aStr['permschange']);
+ abook_perms_msg();
}
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 9b12b5f29..f7bcb56c3 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -35,6 +35,10 @@
<input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
<div class="abook-permschange" style="display: none;"></div>
+<div class="abook-permssave" style="display: none;">
+<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
+</div>
+
{{if $is_pending}}
<div class="abook-pending-contact">