fixed errors in CSS, synchronized style of user list with other lists

This commit is contained in:
Roland Gruber 2003-07-01 19:49:57 +00:00
parent c48945f39b
commit 9f9641160a
3 changed files with 42 additions and 39 deletions

View File

@ -26,7 +26,7 @@ $Id$
// mouseOver function // mouseOver function
function user_over(list, box) { function user_over(list, box) {
cbox = document.getElementsByName(box)[0]; cbox = document.getElementsByName(box)[0];
if (cbox.checked == false) list.setAttribute('class','userlist_over', 0); if (cbox.checked == false) list.setAttribute('class','userlist-over', 0);
} }
// mouseOut function // mouseOut function
@ -40,11 +40,11 @@ function user_click(list, box) {
cbox = document.getElementsByName(box)[0]; cbox = document.getElementsByName(box)[0];
if (cbox.checked == true) { if (cbox.checked == true) {
cbox.checked = false; cbox.checked = false;
list.setAttribute('class','userlist_over', 0); list.setAttribute('class','userlist-over', 0);
} }
else { else {
cbox.checked = true; cbox.checked = true;
list.setAttribute('class','userlist_checked', 0); list.setAttribute('class','userlist-checked', 0);
} }
} }

View File

@ -76,53 +76,56 @@ color:green;
table.userlist { table.userlist {
border-width:1px; border-width:1px;
border-style:solid; border-style:solid;
border-color:#000000; border-color:#9b8523;
} }
/* color of entry rows */ /* color of entry rows */
tr.userlist { tr.userlist {
background-color:#FFFFEE; background-color:#fffde2;
} }
/* color of head row */ /* color of head row */
tr.userlist_head { tr.userlist-head {
background-color:#FFFFAA; background-color:#fff2a3;
font-weight:bold; font-weight:bold;
} }
/* color of rows on mouseOver */ /* color of rows on mouseOver */
tr.userlist_over { tr.userlist-over {
background-color:#CCCCFF; background-color:#CCCCFF;
} }
/* color of checked rows */ /* color of checked rows */
tr.userlist_checked { tr.userlist-checked {
background-color:#FFCCCC; background-color:#f27c71;
} }
/* color for active page digit */ /* color for active page digit */
td.userlist_activepage { td.userlist-activepage {
color:violet; color:red;
} }
/* style of navigation bar */ /* style of navigation bar */
td.userlist_navbar { td.userlist-navbar {
color:#AAAAAA; color:#AAAAAA;
} }
table.userlist_navbar { table.userlist-navbar {
background-color:#DDDDDD; background-color:#fff2a3;
border-width:1px;
border-style:solid;
border-color:#9b8523;
} }
td.userlist_navbartext { td.userlist-navbartext {
color:green; color:green;
font-family:Verdana; font-family:Verdana,sans-serif;
font-size:10px; font-size:12px;
} }
/* style of active column */ /* style of active column */
th.userlist_activecolumn { th.userlist-activecolumn {
background-color:#DDDDAC; background-color:#fffde2;
} }
@ -142,8 +145,8 @@ table.groupnav {
/* text in navigation bar */ /* text in navigation bar */
td.groupnav-text { td.groupnav-text {
color:green; color:green;
font-family:Verdana; font-family:Verdana,sans-serif;
font-size:10px; font-size:12px;
} }
/* color for active page digit */ /* color for active page digit */
@ -199,8 +202,8 @@ table.hostnav {
/* text in navigation bar */ /* text in navigation bar */
td.hostnav-text { td.hostnav-text {
color:green; color:green;
font-family:Verdana; font-family:Verdana,sans-serif;
font-size:10px; font-size:12px;
} }
/* color for active page digit */ /* color for active page digit */

View File

@ -3,7 +3,7 @@
$Id$ $Id$
This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam) This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
Copyright (C) 2003 Leonhard Walchshäusl Copyright (C) 2003 Roland Gruber, Leonhard Walchshäusl
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -125,11 +125,11 @@ for ($k = 0; $k < sizeof($desc_array); $k++) {
// Users have the attribute "*" // Users have the attribute "*"
if ($_SESSION['config']->get_samba3() == "yes") { if ($_SESSION['config']->get_samba3() == "yes") {
// Samba users have the attribute "sambaSamAccount" and end with "$" // Samba users have the attribute "sambaSamAccount" and end with "$"
$filter = "(&(&(|(objectClass=posixAccount) (objectClass=sambaSamAccount)) (!(uid=*$)))"; $filter = "(&(objectClass=sambaSamAccount) (!(uid=*$))";
} }
else { else {
// Samba users have the attribute "sambaAccount" and end with "$" // Samba users have the attribute "sambaAccount" and end with "$"
$filter = "(&(&(|(objectClass=posixAccount) (objectClass=sambaAccount)) (!(uid=*$)))"; $filter = "(&(objectClass=sambaAccount) (!(uid=*$))";
} }
for ($k = 0; $k < sizeof($desc_array); $k++) { for ($k = 0; $k < sizeof($desc_array); $k++) {
if ($_POST["filter" . strtolower($attr_array[$k])]) if ($_POST["filter" . strtolower($attr_array[$k])])
@ -165,7 +165,7 @@ if ($_SESSION["userlist"] && $_GET["norefresh"]) {
} }
else else
StatusMessage("ERROR", StatusMessage("ERROR",
_("LDAP Search failed! Please check your preferences."), _("LDAP Search failed! Please check your preferences."),
_("No Groups found!")); _("No Groups found!"));
} }
@ -186,27 +186,27 @@ if ($user_count != 0) {
echo "<table rules=\"all\" class=\"userlist\" width=\"100%\">\n"; echo "<table rules=\"all\" class=\"userlist\" width=\"100%\">\n";
echo "<tr class=\"userlist_head\"><th width=22 height=34></th><th></th>\n"; echo "<tr class=\"userlist-head\"><th width=22 height=34></th><th></th>\n";
// table header // table header
for ($k = 0; $k < sizeof ($desc_array); $k++) { for ($k = 0; $k < sizeof ($desc_array); $k++) {
if ($sortattrib == strtolower($attr_array[$k])) if ($sortattrib == strtolower($attr_array[$k]))
echo "<th class=\"userlist_activecolumn\">\n"; echo "<th class=\"userlist-activecolumn\">\n";
else else
echo "<th>\n"; echo "<th>\n";
echo "<a class=\"userlist\" href=\"listusers.php?norefresh=1&amp;sortattrib=" . echo "<a class=\"userlist\" href=\"listusers.php?norefresh=1&amp;sortattrib=" .
strtolower($attr_array[$k]) . $searchfilter . "\">" . strtolower($attr_array[$k]) . $searchfilter . "\">" .
$desc_array[$k] . "</a></th>\n"; $desc_array[$k] . "</a></th>\n";
} }
echo "</tr>\n"; echo "</tr>\n";
echo "<tr class=\"test\"><th width=22 height=34></th><th>\n"; echo "<tr class=\"userlist\"><th width=22 height=34></th><th>\n";
echo "<input type=\"submit\" name=\"apply_filter\" value=\"" . _("Apply") . "\">"; echo "<input type=\"submit\" name=\"apply_filter\" value=\"" . _("Apply") . "\">";
echo "</th>\n"; echo "</th>\n";
// print input boxes for filters // print input boxes for filters
for ($k = 0; $k < sizeof ($desc_array); $k++) { for ($k = 0; $k < sizeof ($desc_array); $k++) {
echo "<th>"; echo "<th>";
echo ("<input type=\"text\" name=\"filter" . strtolower ($attr_array[$k]) . echo ("<input type=\"text\" name=\"filter" . strtolower ($attr_array[$k]) .
"\" value=\"" . $_POST["filter" . strtolower($attr_array[$k])] . "\">"); "\" value=\"" . $_POST["filter" . strtolower($attr_array[$k])] . "\">");
echo "</th>"; echo "</th>";
} }
@ -214,8 +214,8 @@ if ($user_count != 0) {
if ($user_count != 0) { if ($user_count != 0) {
// print user list // print user list
$userinfo = array_slice ($userinfo, ($page - 1) * $max_pageentrys, $userinfo = array_slice ($userinfo, ($page - 1) * $max_pageentrys,
$max_pageentrys); $max_pageentrys);
for ($i = 0; $i < sizeof ($userinfo); $i++) { // ignore last entry in array which is "count" for ($i = 0; $i < sizeof ($userinfo); $i++) { // ignore last entry in array which is "count"
echo("<tr class=\"userlist\" onMouseOver=\"user_over(this, '" . $userinfo[$i]["dn"] . "')\"" . echo("<tr class=\"userlist\" onMouseOver=\"user_over(this, '" . $userinfo[$i]["dn"] . "')\"" .
" onMouseOut=\"user_out(this, '" . $userinfo[$i]["dn"] . "')\"" . " onMouseOut=\"user_out(this, '" . $userinfo[$i]["dn"] . "')\"" .
@ -283,9 +283,9 @@ function draw_navigation_bar ($user_count) {
global $sortattrib; global $sortattrib;
global $searchfilter; global $searchfilter;
echo ("<table class=\"userlist_navbar\" width=\"100%\" border=\"0\"\n"); echo ("<table class=\"userlist-navbar\" width=\"100%\" border=\"0\"\n");
echo ("<tr>"); echo ("<tr>");
echo ("<td class=\"userlist_navbar\"><input type=\"submit\" name=\"refresh\" value=\"" . _("Refresh") . "\">&nbsp;&nbsp;"); echo ("<td class=\"userlist-navbar\"><input type=\"submit\" name=\"refresh\" value=\"" . _("Refresh") . "\">&nbsp;&nbsp;");
if ($page != 1) if ($page != 1)
echo ("<a class=\"userlist\" href=\"listusers.php?norefresh=1&amp;page=" . echo ("<a class=\"userlist\" href=\"listusers.php?norefresh=1&amp;page=" .
($page - 1) . "&amp;sortattrib=" . $sortattrib . ($page - 1) . "&amp;sortattrib=" . $sortattrib .
@ -300,12 +300,12 @@ function draw_navigation_bar ($user_count) {
else else
echo ("=&gt;"); echo ("=&gt;");
echo ("</td>"); echo ("</td>");
echo ("<td class=\"userlist_navbartext\">"); echo ("<td class=\"userlist-navbartext\">");
echo "&nbsp;" . $user_count . " " . _("Users found"); echo "&nbsp;" . $user_count . " " . _("Users found");
echo ("</td>"); echo ("</td>");
echo ("<td class=\"userlist_activepage\" align=\"right\">"); echo ("<td class=\"userlist-activepage\" align=\"right\">");
for ($i = 0; $i < ($user_count / $max_pageentrys); $i++) { for ($i = 0; $i < ($user_count / $max_pageentrys); $i++) {
if ($i == $page - 1) if ($i == $page - 1)
echo ("&nbsp;" . ($i + 1)); echo ("&nbsp;" . ($i + 1));