acl cleanup

This commit is contained in:
Mike Macgirvin 2010-07-12 19:53:56 -07:00
parent baad288430
commit 9a20216e51
3 changed files with 87 additions and 8 deletions

View file

@ -59,12 +59,39 @@ function contact_select($selname,$selclass,$preselected = false) {
function populate_acl() { function populate_acl() {
$o = ''; $o = '';
$o .= "<div id=\"acl-wrapper\">";
$o .= "Allow Groups: " . group_select('group_allow','group_allow'); $o .= "<div id=\"acl-permit-outer-wrapper\">";
$o .= "Allow Contacts: " . contact_select('contact_allow','contact_allow'); $o .= "<div id=\"acl-permit-text\">Visible To:</div>";
$o .= "<br />\r\n"; $o .= "<div id=\"acl-permit-text-end\"></div>";
$o .= "Except Groups: " . group_select('group_deny','group_deny'); $o .= "<div id=\"acl-permit-wrapper\">";
$o .= "Except Contacts: " . contact_select('contact_deny','contact_deny'); $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; return $o;
} }

View file

@ -12,8 +12,9 @@ What's on your mind?
</div> </div>
<div id="profile-jot-submit-wrapper" > <div id="profile-jot-submit-wrapper" >
<input type="submit" id="profile-jot-submit" name="submit" value="Submit" /> <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 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> <div id="profile-jot-perms-end"></div>
<div id="profile-jot-acl-wrapper" style="display: none;" >$acl</div>
</div> </div>
<div id="profile-jot-end"></div> <div id="profile-jot-end"></div>
</form> </form>

View file

@ -461,6 +461,10 @@ input#dfrn-url {
margin-left: 350px; margin-left: 350px;
} }
#profile-jot-perms-end {
clear: both;
}
#profile-jot-end { #profile-jot-end {
clear: both; clear: both;
margin-bottom: 30px; 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;
}