From 9a20216e51555cfe53130329a421ed374df16301 Mon Sep 17 00:00:00 2001 From: Mike Macgirvin Date: Mon, 12 Jul 2010 19:53:56 -0700 Subject: [PATCH] acl cleanup --- view/acl_selectors.php | 39 +++++++++++++++++++++++++++----- view/jot.tpl | 5 +++-- view/style.css | 51 ++++++++++++++++++++++++++++++++++++++++++ 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 .= "
\r\n"; - $o .= "Except Groups: " . group_select('group_deny','group_deny'); - $o .= "Except Contacts: " . contact_select('contact_deny','contact_deny'); + $o .= "
"; + $o .= "
"; + $o .= "
Visible To:
"; + $o .= "
"; + $o .= "
"; + $o .= "
"; + $o .= ""; + $o .= group_select('group_allow','group_allow'); + $o .= "
"; + $o .= "
"; + $o .= ""; + $o .= contact_select('contact_allow','contact_allow'); + $o .= "
"; + $o .= "
\r\n"; + $o .= "
\r\n"; + $o .= "
"; + $o .= "
"; + $o .= "
Except For:
"; + $o .= "
"; + $o .= "
"; + $o .= "
"; + $o .= ""; + $o .= group_select('group_deny','group_deny'); + $o .= "
"; + $o .= "
"; + $o .= ""; + $o .= contact_select('contact_deny','contact_deny'); + $o .= "
"; + $o .= "
\r\n"; + $o .= "
\r\n"; + $o .= "
"; + $o .= "
\r\n"; + $o .= "
"; 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?
-
Permission Settings -
+
Permission Settings
+
+
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