don't draw attention to advanced permissions and their corresponding complexity and clearly mark the simple permissions which people are encouraged to use.

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 <a href="settings">privacy settings</a>, 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 <a href="settings">privacy settings</a>, 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}}
+<div class="abook-pending-contact">
+{{include file="field_checkbox.tpl" field=$unapproved}}
+</div>
+{{/if}}
+
+{{if $multiprofs }}
+<div>
+<h3>{{$lbl_vis1}}</h3>
+<div>{{$lbl_vis2}}</div>
+
+{{$profile_select}}
+</div>
+{{/if}}
+
 <h3>{{$permlbl}}</h3>
 <div id="perm-desc" class="descriptive-text">{{$permnote}}</div>
 
@@ -38,20 +54,16 @@
 <input type="hidden" name="contact_id" value="{{$contact_id}}">
 <input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
 
-{{if $noperms}}
+{{* {{if $noperms}}
 <div id="noperm-msg" class="warning-text">{{$noperms}}</div>
 <div id="noperm-text" class="descriptive-text">{{$noperm_desc}}</div>
 {{/if}}
+*}}
 
 
-{{if $is_pending}}
-<div class="abook-pending-contact">
-{{include file="field_checkbox.tpl" field=$unapproved}}
-</div>
-{{/if}}
 
 <br />
-<b>{{$quick}}</b>
+<h3>{{$quick}}</h3>
 <ul>
 {{if $self}}
 <li><span class="fakelink" onclick="connectForum(); // $('#abook-edit-form').submit();">{{$forum}}</span></li>
@@ -62,6 +74,9 @@
 <li><span class="fakelink" onclick="connectFollowOnly(); // $('#abook-edit-form').submit();">{{$follow}}</span></li>
 </ul>
 
+<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
+
+
 <div id="abook-advanced" class="fakelink" onclick="openClose('abook-advanced-panel');">{{$advanced}}</div>
 
 <div id="abook-advanced-panel" style="display: block;">
@@ -76,14 +91,6 @@
 
 </div>
 
-{{if $multiprofs }}
-<div>
-<h3>{{$lbl_vis1}}</h3>
-<div>{{$lbl_vis2}}</div>
-
-{{$profile_select}}
-</div>
-{{/if}}
 
 <input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
 
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}}
 
 
-<div id="settings-privacy-macros">{{$lbl_pmacro}}</div>
+<h3 id="settings-privacy-macros">{{$lbl_pmacro}}</h3>
 <ul>
 <li><a href="#" onclick="channel_privacy_macro(3); return false" id="settings_pmacro3">{{$pmacro3}}</a></li>
 <li><a href="#" onclick="channel_privacy_macro(2); return false" id="settings_pmacro2">{{$pmacro2}}</a></li>
@@ -34,6 +34,7 @@
 </ul>
 
 
+<h3 id="settings-perm-advanced">{{$lbl_p2macro}}</h3>
 
 <div id="settings-permissions-wrapper">
 {{foreach $permiss_arr as $permit}}