more indicators of public visibility

7 files changed, 47 insertions, 9 deletions

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index f2763a569..b1bcf5108 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -130,7 +130,7 @@ function populate_acl($user = null,$celeb = false) {
 	$o = '';
 	$o .= '<div id="acl-wrapper">';
 	$o .= '<div id="acl-permit-outer-wrapper">';
-	$o .= '<div id="acl-permit-text">' . t('Visible To:') . '</div>';
+	$o .= '<div id="acl-permit-text">' . t('Visible To:') . '</div><div id="jot-public">' . t('everybody') . '</div>';
 	$o .= '<div id="acl-permit-text-end"></div>';
 	$o .= '<div id="acl-permit-wrapper">';
 	$o .= '<div id="group_allow_wrapper">';
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index eae6cb0f4..0fcd1e42f 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -83,12 +83,12 @@ tinyMCE.init({
 			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
 				selstr = $(this).text();
 				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$('#jot-public').attr('checked', false);
+				$('#jot-public').hide();
 				$('.profile-jot-net input').attr('disabled', 'disabled');
 			});
 			if(selstr == null) { 
 				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$('#jot-public').attr('checked', 'checked');
+				$('#jot-public').show();
 				$('.profile-jot-net input').attr('disabled', false);
 			}
 
diff --git a/view/jot.tpl b/view/jot.tpl
index ab7d97733..31abafe50 100644
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -58,7 +58,6 @@
 	<div id="profile-jot-perms-end"></div>
 	<div id="profile-jot-email-wrapper" style="display: none;" >
 		<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-		<!-- div id="profile-jot-publabel">$public</div><input type="checkbox" name="public" id="jot-public" /  --> 
 		<div id="profile-jot-email-end"></div>
 	</div>
 	
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index 4661161b3..40584878a 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -77,10 +77,12 @@ tinyMCE.init({
 			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
 				selstr = $(this).text();
 				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+				$('#jot-public').hide();
 				$('.profile-jot-net input').attr('disabled', 'disabled');
 			});
 			if(selstr == null) { 
 				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+				$('#jot-public').show();
 				$('.profile-jot-net input').attr('disabled', false);
 			}
 
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index a0f860494..a212c1935 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -296,8 +296,15 @@ aside #viewcontacts { text-align: right;}
 #contact_deny_wrapper,
 #acl-deny-outer-wrapper { width: 47%; float: right; }
 
-#acl-permit-text,
-#acl-deny-text {background-color: #555753; color: #ccccce; padding: 5px;}
+#acl-permit-text {background-color: #555753; color: #ccccce; padding: 5px; float: left;}
+#jot-public {background-color: #555753; color: #ff0000; padding: 5px; float: left;}
+#acl-deny-text {background-color: #555753; color: #ccccce; padding: 5px; float: left;}
+
+#acl-permit-text-end,
+#acl-deny-text-end { clear: both; }
+
+
+
 
 #acl-permit-wrapper,
 #acl-deny-wrapper { padding: 5px; }
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index de5c77299..8a397c10c 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -1584,11 +1584,26 @@ input#dfrn-url {
 	display: block;
 }
 
-#acl-permit-text,
+#acl-permit-text {
+	margin-top: 10px;
+	float: left;
+}
+
 #acl-deny-text {
 	margin-top: 10px;
 }
 
+#jot-public {
+	float: left;
+	margin-top: 10px;
+	margin-left: 15px;
+	color: #FF0000;
+}
+
+#acl-permit-text-end {
+	clear: both;
+}
+
 #acl-allow-group-label,
 #acl-allow-contact-label,
 #acl-deny-group-label,
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 9404a632c..0ae2ab4cd 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -1644,9 +1644,24 @@ padding: 5px 10px 0px;
 	display: block;
 }
 
-#acl-permit-text,
+#acl-permit-text {
+    margin-top: 10px;
+    float: left;
+}
+
 #acl-deny-text {
-	margin-top: 10px;
+    margin-top: 10px;
+}
+
+#jot-public {
+    float: left;
+    margin-top: 10px;
+    margin-left: 15px;
+    color: #FF0000;
+}
+
+#acl-permit-text-end {
+    clear: both;
 }
 
 #acl-allow-group-label,