aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-03-07 21:55:52 -0800
committerfriendica <info@friendica.com>2014-03-07 21:55:52 -0800
commit5ec38459dc474700ec89304786228ba06bfbed53 (patch)
treede273b8b432615065323289fd2b14196046726cd
parentab0eab49e866e29b1c1b5ef58897c6a446d24864 (diff)
downloadvolse-hubzilla-5ec38459dc474700ec89304786228ba06bfbed53.tar.gz
volse-hubzilla-5ec38459dc474700ec89304786228ba06bfbed53.tar.bz2
volse-hubzilla-5ec38459dc474700ec89304786228ba06bfbed53.zip
notify when permissions change and haven't been saved.
-rw-r--r--include/js_strings.php1
-rw-r--r--view/css/mod_connedit.css2
-rw-r--r--view/js/mod_connedit.js12
-rwxr-xr-xview/tpl/abook_edit.tpl1
-rwxr-xr-xview/tpl/js_strings.tpl1
5 files changed, 16 insertions, 1 deletions
diff --git a/include/js_strings.php b/include/js_strings.php
index cd0ee8c7c..fef84077e 100644
--- a/include/js_strings.php
+++ b/include/js_strings.php
@@ -13,6 +13,7 @@ function js_strings() {
'$everybody' => t('everybody'),
'$passphrase' => t('Secret Passphrase'),
'$passhint' => t('Passphrase hint'),
+ '$permschange' => t('Notice: Permissions have changed but have not yet been submitted.'),
'$t01' => ((t('timeago.prefixAgo') != 'timeago.prefixAgo') ? t('timeago.prefixAgo') : ''),
'$t02' => ((t('timeago.prefixFromNow') != 'timeago.prefixFromNow') ? t('timeago.prefixFromNow') : ''),
diff --git a/view/css/mod_connedit.css b/view/css/mod_connedit.css
index f6da96433..83f167915 100644
--- a/view/css/mod_connedit.css
+++ b/view/css/mod_connedit.css
@@ -14,7 +14,7 @@
margin-bottom: 5px !important;
}
-.abook-pending-contact {
+.abook-pending-contact, .abook-permschange {
background: orange;
font-weight: bold;
margin: 10px;
diff --git a/view/js/mod_connedit.js b/view/js/mod_connedit.js
index 80a56f854..8f06aeee9 100644
--- a/view/js/mod_connedit.js
+++ b/view/js/mod_connedit.js
@@ -27,6 +27,8 @@ function connectFullShare() {
$('#me_id_perms_view_storage').attr('checked','checked');
$('#me_id_perms_republish').attr('checked','checked');
+ $('.abook-permschange').show();
+ $('.abook-permschange').html(aStr['permschange']);
}
function connectCautiousShare() {
@@ -43,6 +45,9 @@ function connectCautiousShare() {
$('#me_id_perms_send_stream').attr('checked','checked');
$('#me_id_perms_post_comments').attr('checked','checked');
$('#me_id_perms_post_mail').attr('checked','checked');
+ $('.abook-permschange').show();
+ $('.abook-permschange').html(aStr['permschange']);
+
}
function connectForum() {
@@ -63,6 +68,8 @@ function connectForum() {
$('#me_id_perms_post_mail').attr('checked','checked');
$('#me_id_perms_tag_deliver').attr('checked','checked');
$('#me_id_perms_republish').attr('checked','checked');
+ $('.abook-permschange').show();
+ $('.abook-permschange').html(aStr['permschange']);
}
@@ -78,6 +85,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']);
}
@@ -88,5 +97,8 @@ function connectFollowOnly() {
});
$('#me_id_perms_send_stream').attr('checked','checked');
+ $('.abook-permschange').show();
+ $('.abook-permschange').html(aStr['permschange']);
+
}
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 274d0d5de..b7a02c15e 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -34,6 +34,7 @@
<input type="hidden" name="contact_id" value="{{$contact_id}}">
<input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
+<div class="abook-permschange" style="display: none;"></div>
{{if $is_pending}}
<div class="abook-pending-contact">
diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl
index fe5228ee9..cac5be65b 100755
--- a/view/tpl/js_strings.tpl
+++ b/view/tpl/js_strings.tpl
@@ -13,6 +13,7 @@
'everybody' : "{{$everybody}}",
'passphrase' : "{{$passphrase}}",
'passhint' : "{{$passhint}}",
+ 'permschange' : "{{$permschange}}",
't01' : "{{$t01}}",
't02' : "{{$t02}}",