diff options
| author | friendica <info@friendica.com> | 2013-10-13 15:42:30 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-10-13 15:42:30 -0700 |
| commit | 1354702d690add3c6ff0c331a190ef3004f7d48c (patch) | |
| tree | 8c2469413dbdcbae9fa00ea2be982cfec44ee690 | |
| parent | bb9feee370fc9eefc6b6dc79d561c30de4a37ec1 (diff) | |
| download | volse-hubzilla-1354702d690add3c6ff0c331a190ef3004f7d48c.tar.gz volse-hubzilla-1354702d690add3c6ff0c331a190ef3004f7d48c.tar.bz2 volse-hubzilla-1354702d690add3c6ff0c331a190ef3004f7d48c.zip | |
remove the disabled flag on individual permissions and improve the text to show that settings may be inherited. The reason for this change is that we want the individual settings to be stored regardless of the inherited settings, because if somebody changes the higher precedence privacy settings it could leave all their existing contacts with no permissions and this could be a support nightmare.
So this way if somebody starts off with "anybody on the network can send me their stream and posts" and later changes it to "only specific connections can send me their stream and posts", the individual setting will already be set for all their connections. The previous behaviour is that this setting would have been disabled so none of their existing connections will have this specific permission. Old-timers who were here and made lots of connections before this commit - will have to edit all their connections if they change their privacy settings from lesser restrictive to be more restrictive.
| -rw-r--r-- | mod/connections.php | 3 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 7 | ||||
| -rwxr-xr-x | view/tpl/field_acheckbox.tpl | 2 |
4 files changed, 11 insertions, 3 deletions
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 <a href="settings">privacy settings</a>, 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 <a href="settings">privacy settings</a> 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 <a href="settings">privacy settings</a>, 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 @@ <div class='field acheckbox'> <label for='id_{{$field.0}}'>{{$field.1}}</label> <input type="checkbox" class="abook-edit-them" name='them_{{$field.0}}' id='them_id_{{$field.0}}' value="1" disabled="disabled" {{if $field.2}}checked="checked"{{/if}} /> - <input type="checkbox" class="abook-edit-me" name='{{$field.0}}' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} {{if $field.5}} disabled="disabled" {{/if}}/> + <input type="checkbox" class="abook-edit-me" name='{{$field.0}}' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} />{{if $field.5}} <span class="permission-inherited">{{$inherited}}</span> {{/if}} <span class='field_abook_help'>{{$field.6}}</span> </div> |