acl cleanup

3 files changed, 87 insertions, 8 deletions

diff --git a/view/acl_selectors.php b/view/acl_selectors.php
index 7a69fdd5a..02cc285c7 100644
--- a/view/acl_selectors.php
+++ b/view/acl_selectors.php
@@ -59,12 +59,39 @@ function contact_select($selname,$selclass,$preselected = false) {
 function populate_acl() {
 
 	$o = '';
-
-	$o .= "Allow Groups: " . group_select('group_allow','group_allow');
-	$o .= "Allow Contacts: " . contact_select('contact_allow','contact_allow');
-	$o .= "<br />\r\n";
-	$o .= "Except Groups: " . group_select('group_deny','group_deny');
-	$o .= "Except Contacts: " . contact_select('contact_deny','contact_deny');
+	$o .= "<div id=\"acl-wrapper\">";
+	$o .= "<div id=\"acl-permit-outer-wrapper\">";
+	$o .= "<div id=\"acl-permit-text\">Visible To:</div>";
+	$o .= "<div id=\"acl-permit-text-end\"></div>";
+	$o .= "<div id=\"acl-permit-wrapper\">";
+	$o .= "<div id=\"group_allow_wrapper\">";
+	$o .= "<label id=\"acl-allow-group-label\" for=\"group_allow\" >Groups</label>";
+	$o .= group_select('group_allow','group_allow');
+	$o .= "</div>";
+	$o .= "<div id=\"contact_allow_wrapper\">";
+	$o .= "<label id=\"acl-allow-contact-label\" for=\"contact_allow\" >Contacts</label>";
+	$o .= contact_select('contact_allow','contact_allow');
+	$o .= "</div>";
+	$o .= "</div>\r\n";
+	$o .= "<div id=\"acl-allow-end\"></div>\r\n";
+	$o .= "</div>";
+	$o .= "<div id=\"acl-deny-outer-wrapper\">";
+	$o .= "<div id=\"acl-deny-text\">Except For:</div>";
+	$o .= "<div id=\"acl-deny-text-end\"></div>";
+	$o .= "<div id=\"acl-deny-wrapper\">";
+	$o .= "<div id=\"group_deny_wrapper\" >";
+	$o .= "<label id=\"acl-deny-group-label\" for=\"group_deny\" >Groups</label>";
+	$o .= group_select('group_deny','group_deny');
+	$o .= "</div>";
+	$o .= "<div id=\"contact_deny_wrapper\" >";
+	$o .= "<label id=\"acl-deny-contact-label\" for=\"contact_deny\" >Contacts</label>";
+	$o .= contact_select('contact_deny','contact_deny');
+	$o .= "</div>";
+	$o .= "</div>\r\n";
+	$o .= "<div id=\"acl-deny-end\"></div>\r\n";
+	$o .= "</div>";
+	$o .= "</div>\r\n";
+	$o .= "<div id=\"acl-wrapper-end\"></div>";
 	return $o;
 
 }
\ No newline at end of file
diff --git a/view/jot.tpl b/view/jot.tpl
index 55ee5388c..1c92df49e 100644
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -12,8 +12,9 @@ What's on your mind?
 </div>
 <div id="profile-jot-submit-wrapper" >
 <input type="submit" id="profile-jot-submit" name="submit" value="Submit" />
-	<div id="profile-jot-perms" class="profile-jot-perms" ><img src="images/$lockstate_icon.gif" alt="Permission Settings" title="Permission Settings" onClick="openClose('profile-jot-acl-wrapper');" /><div id="profile-jot-acl-wrapper" style="display: none;" >$acl</div>
-	</div>
+	<div id="profile-jot-perms" class="profile-jot-perms" ><img src="images/$lockstate_icon.gif" alt="Permission Settings" title="Permission Settings" onClick="openClose('profile-jot-acl-wrapper');" /></div>
+	<div id="profile-jot-perms-end"></div>
+	<div id="profile-jot-acl-wrapper" style="display: none;" >$acl</div>
 </div>
 <div id="profile-jot-end"></div>
 </form>
diff --git a/view/style.css b/view/style.css
index 261965129..3093dd745 100644
--- a/view/style.css
+++ b/view/style.css
@@ -461,6 +461,10 @@ input#dfrn-url {
 	margin-left: 350px;
 }
 
+#profile-jot-perms-end {
+	clear: both;
+}
+
 #profile-jot-end {
 	clear: both;
 	margin-bottom: 30px;
@@ -780,3 +784,50 @@ input#dfrn-url {
 }
 
 
+#acl-allow-group-label, 
+#acl-allow-contact-label,
+#acl-deny-group-label,
+#acl-deny-contact-label {
+	display: block;
+}
+
+#acl-permit-text,
+#acl-deny-text {
+	margin-top: 10px;
+}
+
+#acl-allow-group-label,
+#acl-allow-contact-label,
+#acl-deny-group-label,
+#acl-deny-contact-label {
+	margin-top: 5px;
+	margin-bottom: 5px;
+}
+
+
+#group_allow_wrapper, 
+#group_deny_wrapper {
+	float: left;
+	width: 100px;
+	margin-right: 10px;
+}
+
+#contact_allow_wrapper,
+#contact_deny_wrapper {
+	float: left;
+	width: 150px;
+	margin-right: 10px;
+}
+
+#acl-allow-end,
+#acl-deny-end {
+	clear: both;
+}
+#acl-permit-outer-wrapper,
+#acl-deny-outer-wrapper {
+	float: left;
+}
+
+#acl-wrapper-end {
+	clear: both;
+}
\ No newline at end of file