From ee1580427e9a1bc4e2b86906f7b42d3071ed516d Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 2 Feb 2014 17:54:36 -0800 Subject: don't draw attention to advanced permissions and their corresponding complexity and clearly mark the simple permissions which people are encouraged to use. --- mod/connedit.php | 8 ++++---- mod/settings.php | 10 ++++++---- view/css/mod_connedit.css | 14 ++++++++++++++ view/css/mod_settings.css | 14 ++++++++++++++ view/tpl/abook_edit.tpl | 37 ++++++++++++++++++++++--------------- view/tpl/settings.tpl | 3 ++- 6 files changed, 62 insertions(+), 24 deletions(-) diff --git a/mod/connedit.php b/mod/connedit.php index e2d4b861c..b7101fcab 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -442,13 +442,13 @@ function connedit_content(&$a) { '$perms' => $perms, '$forum' => t('Forum Members'), '$soapbox' => t('Soapbox'), - '$full' => t('Full Sharing'), - '$cautious' => t('Cautious Sharing'), + '$full' => t('Full Sharing (typical social network permissions)'), + '$cautious' => t('Cautious Sharing '), '$follow' => t('Follow Only'), '$permlbl' => t('Individual Permissions'), - '$permnote' => t('Some permissions may be inherited from your channel privacy settings, which have higher priority. Changing those inherited settings on this page will have no effect.'), + '$permnote' => t('Some permissions may be inherited from your channel privacy settings, which have higher priority than individual settings. Changing those inherited settings on this page will have no effect.'), '$advanced' => t('Advanced Permissions'), - '$quick' => t('Quick Links'), + '$quick' => t('Simple Permissions (select one and submit)'), '$common_link' => $a->get_baseurl(true) . '/common/loc/' . local_user() . '/' . $contact['id'], '$all_friends' => $all_friends, '$relation_text' => $relation_text, diff --git a/mod/settings.php b/mod/settings.php index 7ff76cd3e..c0e8122cb 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -923,15 +923,17 @@ function settings_content(&$a) { '$h_prv' => t('Security and Privacy Settings'), - '$hide_presence' => array('hide_presence', t('Hide my online presence'),$hide_presence, t('Prevents showing if you are available for chat')), + '$hide_presence' => array('hide_presence', t('Hide my online presence'),$hide_presence, t('Prevents displaying in your profile that you are online')), - '$lbl_pmacro' => t('Quick Privacy Settings:'), - '$pmacro3' => t('Very Public - extremely permissive'), - '$pmacro2' => t('Typical - default public, privacy when desired'), + '$lbl_pmacro' => t('Simple Privacy Settings:'), + '$pmacro3' => t('Very Public - extremely permissive (use with caution)'), + '$pmacro2' => t('Typical - default public, privacy when desired (similar to social network permissions)'), '$pmacro1' => t('Private - default private, rarely open or public'), '$pmacro0' => t('Blocked - default blocked to/from everybody'), '$permiss_arr' => $permiss, + '$lbl_p2macro' => t('Advanced Privacy Settings'), + '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), intval($channel['channel_max_friend_req']) , t('May reduce spam activity')), '$permissions' => t('Default Post Permissions'), '$permdesc' => t("\x28click to open/close\x29"), diff --git a/view/css/mod_connedit.css b/view/css/mod_connedit.css index c460fec28..f6da96433 100644 --- a/view/css/mod_connedit.css +++ b/view/css/mod_connedit.css @@ -135,3 +135,17 @@ .contact-entry-end { clear: both; } + +#abook-advanced-panel, #abook-advanced { + opacity: 0.3; + filter:alpha(opacity=30); +} + +#abook-advanced-panel:hover, #abook-advanced:hover { + opacity: 1.0; + filter:alpha(opacity=100); +} + +#abook-advanced { + margin-top: 15px; +} \ No newline at end of file diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css index 601cb2e0e..2049d9bc6 100644 --- a/view/css/mod_settings.css +++ b/view/css/mod_settings.css @@ -1,3 +1,17 @@ +#settings-permissions-wrapper, #settings-perm-advanced { + opacity: 0.3; + filter:alpha(opacity=30); +} + +#settings-permissions-wrapper:hover, #settings-perm-advanced:hover { + opacity: 1.0; + filter:alpha(opacity=100); +} + +#settings-perm-advanced { + margin-top: 15px; +} + #settings-permissions-wrapper .field { margin-bottom: 10px; } diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 590213fd3..265a1a953 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -31,6 +31,22 @@ + +{{if $is_pending}} +
+{{include file="field_checkbox.tpl" field=$unapproved}} +
+{{/if}} + +{{if $multiprofs }} +
+

{{$lbl_vis1}}

+
{{$lbl_vis2}}
+ +{{$profile_select}} +
+{{/if}} +

{{$permlbl}}

{{$permnote}}
@@ -38,20 +54,16 @@ -{{if $noperms}} +{{* {{if $noperms}}
{{$noperms}}
{{$noperm_desc}}
{{/if}} +*}} -{{if $is_pending}} -
-{{include file="field_checkbox.tpl" field=$unapproved}} -
-{{/if}}
-{{$quick}} +

{{$quick}}

+ + +
@@ -76,14 +91,6 @@
-{{if $multiprofs }} -
-

{{$lbl_vis1}}

-
{{$lbl_vis2}}
- -{{$profile_select}} -
-{{/if}} diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index b1a4f956d..ab5bb02cc 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -25,7 +25,7 @@ {{include file="field_checkbox.tpl" field=$hide_presence}} -
{{$lbl_pmacro}}
+

{{$lbl_pmacro}}

+

{{$lbl_p2macro}}

{{foreach $permiss_arr as $permit}} -- cgit v1.2.3