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

more permissions descriptive text to lessen confusion

Browse Source
This commit is contained in:
friendica 2013-05-21 17:13:51 -07:00
parent 09b80b2f65
commit d72d30fabb
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/permissions.php
View File

@ -23,7 +23,7 @@ function get_perms() {
'post_comments' => array('channel_w_comment', intval(PERMS_W_COMMENT), false, t('Can comment on my posts'), ''), 'post_comments' => array('channel_w_comment', intval(PERMS_W_COMMENT), false, t('Can comment on my posts'), ''),
'post_mail' => array('channel_w_mail', intval(PERMS_W_MAIL), false, t('Can send me private mail messages'), ''), 'post_mail' => array('channel_w_mail', intval(PERMS_W_MAIL), false, t('Can send me private mail messages'), ''),
'post_photos' => array('channel_w_photos', intval(PERMS_W_PHOTOS), false, t('Can post photos to my photo albums'), ''), 'post_photos' => array('channel_w_photos', intval(PERMS_W_PHOTOS), false, t('Can post photos to my photo albums'), ''),
'tag_deliver' => array('channel_w_tagwall', intval(PERMS_W_TAGWALL), false, t('Can forward to all my channel contacts via post tags'), t('Advanced - useful for creating group forum channels')), 'tag_deliver' => array('channel_w_tagwall', intval(PERMS_W_TAGWALL), false, t('Can forward to all my channel contacts via post hashtags'), t('Advanced - useful for creating group forum channels')),
'chat' => array('channel_w_chat', intval(PERMS_W_CHAT), false, t('Can chat with me (when available)'), t('Requires compatible chat plugin')), 'chat' => array('channel_w_chat', intval(PERMS_W_CHAT), false, t('Can chat with me (when available)'), t('Requires compatible chat plugin')),
'write_storage' => array('channel_w_storage', intval(PERMS_W_STORAGE), false, t('Can write to my "public" file storage'), ''), 'write_storage' => array('channel_w_storage', intval(PERMS_W_STORAGE), false, t('Can write to my "public" file storage'), ''),
'write_pages' => array('channel_w_pages', intval(PERMS_W_PAGES), false, t('Can edit my "public" pages'), ''), 'write_pages' => array('channel_w_pages', intval(PERMS_W_PAGES), false, t('Can edit my "public" pages'), ''),

6
mod/connections.php
View File

@ -376,7 +376,8 @@ function connections_content(&$a) {
'$is_pending' => (($contact['abook_flags'] & ABOOK_FLAG_PENDING) ? 1 : ''), '$is_pending' => (($contact['abook_flags'] & ABOOK_FLAG_PENDING) ? 1 : ''),
'$unapproved' => $unapproved, '$unapproved' => $unapproved,
'$approve' => t('Approve this connection'), '$approve' => t('Approve this connection'),
'$noperms' => (((! $self) && (! $contact['abook_my_perms'])) ? t('Connection has no permissions!') : ''), '$noperms' => (((! $self) && (! $contact['abook_my_perms'])) ? t('Connection has no individual permissions!') : ''),
'$noperm_desc' => (((! $self) && (! $contact['abook_my_perms'])) ? t('This may be appropriate based on your <a href="settings">privacy settings</a>, though you may wish to review the "Advanced Permissions"') : ''),
'$submit' => t('Submit'), '$submit' => t('Submit'),
'$lbl_vis1' => t('Profile Visibility'), '$lbl_vis1' => t('Profile Visibility'),
'$lbl_vis2' => sprintf( t('Please choose the profile you would like to display to %s when viewing your profile securely.'), $contact['name']), '$lbl_vis2' => sprintf( t('Please choose the profile you would like to display to %s when viewing your profile securely.'), $contact['name']),
@ -391,7 +392,8 @@ function connections_content(&$a) {
'$full' => t('Full Sharing'), '$full' => t('Full Sharing'),
'$cautious' => t('Cautious Sharing'), '$cautious' => t('Cautious Sharing'),
'$follow' => t('Follow Only'), '$follow' => t('Follow Only'),
'$permlbl' => t('Permissions'), '$permlbl' => t('Individual Permissions'),
'$permnote' => t('Individual permissions are only enabled for <a href="settings">privacy settings</a> which are set to "Only those you specifically allow". Otherwise they are controlled by your privacy settings.'),
'$advanced' => t('Advanced Permissions'), '$advanced' => t('Advanced Permissions'),
'$quick' => t('Quick Links'), '$quick' => t('Quick Links'),
'$common_link' => $a->get_baseurl(true) . '/common/loc/' . local_user() . '/' . $contact['id'], '$common_link' => $a->get_baseurl(true) . '/common/loc/' . local_user() . '/' . $contact['id'],

2
version.inc
View File

@ -1 +1 @@
2013-05-20.319 2013-05-21.320

8
view/theme/redbasic/css/style.css
View File

@ -350,12 +350,15 @@ footer {
} }
.warning-text { .warning-text {
width: auto;
font-size: 1.2em; font-size: 1.2em;
font-weight: bold; font-weight: bold;
color: #ff0000; color: #ff0000;
} }
#noperm-msg {
margin-top: 15px;
}
.preview { .preview {
background: url('../img/gray_and_white_diagonal_stripes_background_seamless.gif'); background: url('../img/gray_and_white_diagonal_stripes_background_seamless.gif');
} }
@ -2460,6 +2463,9 @@ aside input[type='text'] {
font-size: 70%; font-size: 70%;
} }
.descriptive-text {
color: #888;
}
#plugin-settings-link, #account-settings-link { #plugin-settings-link, #account-settings-link {
margin-bottom: 10px; margin-bottom: 10px;

4
view/tpl/abook_edit.tpl
View File

@ -33,13 +33,15 @@
<h3>{{$permlbl}}</h3> <h3>{{$permlbl}}</h3>
<div id="perm-desc" class="descriptive-text">{{$permnote}}</div>
<form id="abook-edit-form" action="connections/{{$contact_id}}" method="post" > <form id="abook-edit-form" action="connections/{{$contact_id}}" method="post" >
<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}}" />
{{if $noperms}} {{if $noperms}}
<div id="noperm-desc" class="warning-text">{{$noperms}}</div> <div id="noperm-msg" class="warning-text">{{$noperms}}</div>
<div id="noperm-text" class="descriptive-text">{{$noperm_desc}}</div>
{{/if}} {{/if}}