aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-05-21 17:13:51 -0700
committerfriendica <info@friendica.com>2013-05-21 17:13:51 -0700
commitd72d30fabb3e081e0b2c749e512bb3989d9d1f4a (patch)
tree3443cb1c32b29a2b1477abd2c3954eb5514bd0dc
parent09b80b2f65c2f8e9f24d4ef90dc5841c71a75480 (diff)
downloadvolse-hubzilla-d72d30fabb3e081e0b2c749e512bb3989d9d1f4a.tar.gz
volse-hubzilla-d72d30fabb3e081e0b2c749e512bb3989d9d1f4a.tar.bz2
volse-hubzilla-d72d30fabb3e081e0b2c749e512bb3989d9d1f4a.zip
more permissions descriptive text to lessen confusion
-rw-r--r--include/permissions.php2
-rw-r--r--mod/connections.php6
-rw-r--r--version.inc2
-rw-r--r--view/theme/redbasic/css/style.css8
-rwxr-xr-xview/tpl/abook_edit.tpl4
5 files changed, 16 insertions, 6 deletions
diff --git a/include/permissions.php b/include/permissions.php
index 9641d224a..a8f8d2629 100644
--- a/include/permissions.php
+++ b/include/permissions.php
@@ -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_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'), ''),
- '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')),
'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'), ''),
diff --git a/mod/connections.php b/mod/connections.php
index 507a587ba..a54f77b1f 100644
--- a/mod/connections.php
+++ b/mod/connections.php
@@ -376,7 +376,8 @@ function connections_content(&$a) {
'$is_pending' => (($contact['abook_flags'] & ABOOK_FLAG_PENDING) ? 1 : ''),
'$unapproved' => $unapproved,
'$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'),
'$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']),
@@ -391,7 +392,8 @@ function connections_content(&$a) {
'$full' => t('Full Sharing'),
'$cautious' => t('Cautious Sharing'),
'$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'),
'$quick' => t('Quick Links'),
'$common_link' => $a->get_baseurl(true) . '/common/loc/' . local_user() . '/' . $contact['id'],
diff --git a/version.inc b/version.inc
index 3e34b8199..6f17f8169 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-05-20.319
+2013-05-21.320
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 33ccd5cbf..c2caedd08 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -350,12 +350,15 @@ footer {
}
.warning-text {
- width: auto;
font-size: 1.2em;
font-weight: bold;
color: #ff0000;
}
+#noperm-msg {
+ margin-top: 15px;
+}
+
.preview {
background: url('../img/gray_and_white_diagonal_stripes_background_seamless.gif');
}
@@ -2460,6 +2463,9 @@ aside input[type='text'] {
font-size: 70%;
}
+.descriptive-text {
+ color: #888;
+}
#plugin-settings-link, #account-settings-link {
margin-bottom: 10px;
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index e226da72c..442692b3d 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -33,13 +33,15 @@
<h3>{{$permlbl}}</h3>
+<div id="perm-desc" class="descriptive-text">{{$permnote}}</div>
<form id="abook-edit-form" action="connections/{{$contact_id}}" method="post" >
<input type="hidden" name="contact_id" value="{{$contact_id}}">
<input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
{{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}}