harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

notify when permissions change and haven't been saved.

Browse Source
This commit is contained in:
friendica 2014-03-07 21:55:52 -08:00
parent ab0eab49e8
commit 5ec38459dc
5 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/js_strings.php
View File

@ -13,6 +13,7 @@ function js_strings() {
'$everybody' => t('everybody'), '$everybody' => t('everybody'),
'$passphrase' => t('Secret Passphrase'), '$passphrase' => t('Secret Passphrase'),
'$passhint' => t('Passphrase hint'), '$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') : ''), '$t01' => ((t('timeago.prefixAgo') != 'timeago.prefixAgo') ? t('timeago.prefixAgo') : ''),
'$t02' => ((t('timeago.prefixFromNow') != 'timeago.prefixFromNow') ? t('timeago.prefixFromNow') : ''), '$t02' => ((t('timeago.prefixFromNow') != 'timeago.prefixFromNow') ? t('timeago.prefixFromNow') : ''),

2
view/css/mod_connedit.css
View File

@ -14,7 +14,7 @@
margin-bottom: 5px !important; margin-bottom: 5px !important;
} }
.abook-pending-contact { .abook-pending-contact, .abook-permschange {
background: orange; background: orange;
font-weight: bold; font-weight: bold;
margin: 10px; margin: 10px;

12
view/js/mod_connedit.js
View File

@ -27,6 +27,8 @@ function connectFullShare() {
$('#me_id_perms_view_storage').attr('checked','checked'); $('#me_id_perms_view_storage').attr('checked','checked');
$('#me_id_perms_republish').attr('checked','checked'); $('#me_id_perms_republish').attr('checked','checked');
$('.abook-permschange').show();
$('.abook-permschange').html(aStr['permschange']);
} }
function connectCautiousShare() { function connectCautiousShare() {
@ -43,6 +45,9 @@ function connectCautiousShare() {
$('#me_id_perms_send_stream').attr('checked','checked'); $('#me_id_perms_send_stream').attr('checked','checked');
$('#me_id_perms_post_comments').attr('checked','checked'); $('#me_id_perms_post_comments').attr('checked','checked');
$('#me_id_perms_post_mail').attr('checked','checked'); $('#me_id_perms_post_mail').attr('checked','checked');
$('.abook-permschange').show();
$('.abook-permschange').html(aStr['permschange']);
} }
function connectForum() { function connectForum() {
@ -63,6 +68,8 @@ function connectForum() {
$('#me_id_perms_post_mail').attr('checked','checked'); $('#me_id_perms_post_mail').attr('checked','checked');
$('#me_id_perms_tag_deliver').attr('checked','checked'); $('#me_id_perms_tag_deliver').attr('checked','checked');
$('#me_id_perms_republish').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_contacts').attr('checked','checked');
$('#me_id_perms_view_storage').attr('checked','checked'); $('#me_id_perms_view_storage').attr('checked','checked');
$('#me_id_perms_view_pages').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'); $('#me_id_perms_send_stream').attr('checked','checked');
$('.abook-permschange').show();
$('.abook-permschange').html(aStr['permschange']);
} }

1
view/tpl/abook_edit.tpl
View File

@ -34,6 +34,7 @@
<input type="hidden" name="contact_id" value="{{$contact_id}}"> <input type="hidden" name="contact_id" value="{{$contact_id}}">
<input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" /> <input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
<div class="abook-permschange" style="display: none;"></div>
{{if $is_pending}} {{if $is_pending}}
<div class="abook-pending-contact"> <div class="abook-pending-contact">

1
view/tpl/js_strings.tpl
View File

@ -13,6 +13,7 @@
'everybody' : "{{$everybody}}", 'everybody' : "{{$everybody}}",
'passphrase' : "{{$passphrase}}", 'passphrase' : "{{$passphrase}}",
'passhint' : "{{$passhint}}", 'passhint' : "{{$passhint}}",
'permschange' : "{{$permschange}}",
't01' : "{{$t01}}", 't01' : "{{$t01}}",
't02' : "{{$t02}}", 't02' : "{{$t02}}",