From a7d95108d04d057b6c07984f46647be7d708632a Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 7 Aug 2014 18:22:50 -0700
Subject: [PATCH] cleanup some text where we said "public" or "visible to
 anybody on the internet" when that isn't necessarily true.

---
 include/acl_selectors.php | 2 +-
 include/items.php         | 2 +-
 mod/profiles.php          | 4 +++-
 view/css/mod_profiles.css | 8 ++++----
 view/tpl/profile_edit.tpl | 4 +++-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 8d94264e4..0b68ba227 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -237,7 +237,7 @@ function populate_acl($defaults = null,$show_jotnets = true) {
 
 	$tpl = get_markup_template("acl_selector.tpl");
 	$o = replace_macros($tpl, array(
-		'$showall'=> t("Visible to everybody"),
+		'$showall'=> t("Visible to your default audience"),
 		'$show'		 => t("Show"),
 		'$hide'		 => t("Don't show"),
 		'$allowcid' => json_encode($allow_cid),
diff --git a/include/items.php b/include/items.php
index 6af92d7e5..b5c28a453 100755
--- a/include/items.php
+++ b/include/items.php
@@ -951,7 +951,7 @@ function map_scope($scope,$strip = false) {
 
 function translate_scope($scope) {
 	if(! $scope || $scope === 'public')
-		return t('Visible to anybody on the internet');
+		return t('Visible to anybody on the internet.');
 	if(strpos($scope,'self') === 0)
 		return t('Visible to you only.');
 	if(strpos($scope,'network:') === 0)
diff --git a/mod/profiles.php b/mod/profiles.php
index bcaae909b..791f93465 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -518,6 +518,7 @@ function profiles_content(&$a) {
 
 	$o = '';
 
+	$channel = $a->get_channel();
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
@@ -634,7 +635,8 @@ function profiles_content(&$a) {
 			'$baseurl'      => $a->get_baseurl(true),
 			'$profile_id'   => $r[0]['id'],
 			'$profile_name' => $r[0]['profile_name'],
-			'$default'      => (($is_default) ? '<p id="profile-edit-default-desc">' . t('This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.') . '</p>' : ""),
+			'$is_default'   => $is_default,
+			'$default'      => t('This is your default profile.') . EOL . translate_scope(map_scope($channel['channel_r_profile'])),
 			'$advanced'     => $advanced,
 			'$name'         => $r[0]['name'],
 			'$pdesc'        => $r[0]['pdesc'],
diff --git a/view/css/mod_profiles.css b/view/css/mod_profiles.css
index 5f930248f..78f8e6cc5 100644
--- a/view/css/mod_profiles.css
+++ b/view/css/mod_profiles.css
@@ -1,8 +1,8 @@
 #profile-edit-default-desc {
-	color: #FF0000;
-	border: 1px solid #FF8888;
-	background-color: #FFEEEE;
-	padding: 7px;
+    background: none repeat scroll 0 0 orange;
+    font-weight: bold;
+    margin: 10px;
+    padding: 20px 5px 10px;
 }
 
 #profile-edit-clone-link-wrapper {
diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
index b007d54ca..0e902e9e2 100755
--- a/view/tpl/profile_edit.tpl
+++ b/view/tpl/profile_edit.tpl
@@ -1,4 +1,6 @@
-{{$default}}
+{{if $is_default}}
+<p id="profile-edit-default-desc">{{$default}}</p>
+{{/if}}
 
 <h1>{{$banner}}</h1>