diff --git a/mod/connections.php b/mod/connections.php index 95fc18174..bcb78f138 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -422,6 +422,7 @@ function connections_content(&$a) { '$tab_str' => $tab_str, '$is_pending' => (($contact['abook_flags'] & ABOOK_FLAG_PENDING) ? 1 : ''), '$unapproved' => $unapproved, + '$inherited' => t('inherited'), '$approve' => t('Approve this connection'), '$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 privacy settings, though you may wish to review the "Advanced Permissions".') : ''), @@ -440,7 +441,7 @@ function connections_content(&$a) { '$cautious' => t('Cautious Sharing'), '$follow' => t('Follow Only'), '$permlbl' => t('Individual Permissions'), - '$permnote' => t('Individual permissions are only enabled for privacy settings which are set to "Only those you specifically allow". Otherwise they are controlled by your privacy settings.'), + '$permnote' => t('Some permissions may be inherited from your privacy settings, which have higher priority. Changing those on this page will have no effect.'), '$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 08609ebf2..3d9c7ec6f 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-10-12.464 +2013-10-13.465 diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e91e4dc5a..0770bd160 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3448,3 +3448,10 @@ a .drop-icons { .drop-icons:hover { color: #FF0000; } + +.permission-inherited { + float: left; + margin-right: 10px; + color: #FF0000; +} + \ No newline at end of file diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index cb63f7ca2..f5dda4cc0 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -1,6 +1,6 @@
- + {{if $field.5}} {{$inherited}} {{/if}} {{$field.6}}