From 9f9641160aceb1bae3b4b14fc9dc5e83df59f991 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Tue, 1 Jul 2003 19:49:57 +0000 Subject: [PATCH] fixed errors in CSS, synchronized style of user list with other lists --- lam/lib/functions.js | 6 ++--- lam/style/500_layout.css | 45 ++++++++++++++++--------------- lam/templates/lists/listusers.php | 30 ++++++++++----------- 3 files changed, 42 insertions(+), 39 deletions(-) diff --git a/lam/lib/functions.js b/lam/lib/functions.js index 66b57907..1d48c7b3 100644 --- a/lam/lib/functions.js +++ b/lam/lib/functions.js @@ -26,7 +26,7 @@ $Id$ // mouseOver function function user_over(list, box) { 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 @@ -40,11 +40,11 @@ function user_click(list, box) { cbox = document.getElementsByName(box)[0]; if (cbox.checked == true) { cbox.checked = false; - list.setAttribute('class','userlist_over', 0); + list.setAttribute('class','userlist-over', 0); } else { cbox.checked = true; - list.setAttribute('class','userlist_checked', 0); + list.setAttribute('class','userlist-checked', 0); } } diff --git a/lam/style/500_layout.css b/lam/style/500_layout.css index 84da28d5..2eb7dbc9 100644 --- a/lam/style/500_layout.css +++ b/lam/style/500_layout.css @@ -76,53 +76,56 @@ color:green; table.userlist { border-width:1px; border-style:solid; - border-color:#000000; + border-color:#9b8523; } /* color of entry rows */ tr.userlist { - background-color:#FFFFEE; + background-color:#fffde2; } /* color of head row */ -tr.userlist_head { - background-color:#FFFFAA; +tr.userlist-head { + background-color:#fff2a3; font-weight:bold; } /* color of rows on mouseOver */ -tr.userlist_over { +tr.userlist-over { background-color:#CCCCFF; } /* color of checked rows */ -tr.userlist_checked { - background-color:#FFCCCC; +tr.userlist-checked { + background-color:#f27c71; } /* color for active page digit */ -td.userlist_activepage { - color:violet; +td.userlist-activepage { + color:red; } /* style of navigation bar */ -td.userlist_navbar { +td.userlist-navbar { color:#AAAAAA; } -table.userlist_navbar { - background-color:#DDDDDD; +table.userlist-navbar { + background-color:#fff2a3; + border-width:1px; + border-style:solid; + border-color:#9b8523; } -td.userlist_navbartext { +td.userlist-navbartext { color:green; - font-family:Verdana; - font-size:10px; + font-family:Verdana,sans-serif; + font-size:12px; } /* style of active column */ -th.userlist_activecolumn { - background-color:#DDDDAC; +th.userlist-activecolumn { + background-color:#fffde2; } @@ -142,8 +145,8 @@ table.groupnav { /* text in navigation bar */ td.groupnav-text { color:green; - font-family:Verdana; - font-size:10px; + font-family:Verdana,sans-serif; + font-size:12px; } /* color for active page digit */ @@ -199,8 +202,8 @@ table.hostnav { /* text in navigation bar */ td.hostnav-text { color:green; - font-family:Verdana; - font-size:10px; + font-family:Verdana,sans-serif; + font-size:12px; } /* color for active page digit */ diff --git a/lam/templates/lists/listusers.php b/lam/templates/lists/listusers.php index 3f41ca19..7c57ef23 100644 --- a/lam/templates/lists/listusers.php +++ b/lam/templates/lists/listusers.php @@ -3,7 +3,7 @@ $Id$ 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 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 "*" if ($_SESSION['config']->get_samba3() == "yes") { // Samba users have the attribute "sambaSamAccount" and end with "$" - $filter = "(&(&(|(objectClass=posixAccount) (objectClass=sambaSamAccount)) (!(uid=*$)))"; + $filter = "(&(objectClass=sambaSamAccount) (!(uid=*$))"; } else { // 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++) { if ($_POST["filter" . strtolower($attr_array[$k])]) @@ -165,7 +165,7 @@ if ($_SESSION["userlist"] && $_GET["norefresh"]) { } else StatusMessage("ERROR", - _("LDAP Search failed! Please check your preferences."), + _("LDAP Search failed! Please check your preferences."), _("No Groups found!")); } @@ -186,27 +186,27 @@ if ($user_count != 0) { echo "\n"; - echo "\n"; + echo "\n"; // table header for ($k = 0; $k < sizeof ($desc_array); $k++) { if ($sortattrib == strtolower($attr_array[$k])) - echo "\n"; } echo "\n"; - echo "\n"; // print input boxes for filters for ($k = 0; $k < sizeof ($desc_array); $k++) { echo ""; } @@ -214,8 +214,8 @@ if ($user_count != 0) { if ($user_count != 0) { // print user list - $userinfo = array_slice ($userinfo, ($page - 1) * $max_pageentrys, - $max_pageentrys); + $userinfo = array_slice ($userinfo, ($page - 1) * $max_pageentrys, + $max_pageentrys); for ($i = 0; $i < sizeof ($userinfo); $i++) { // ignore last entry in array which is "count" echo(""); - echo (""); - echo ("
\n"; + echo "\n"; else echo "\n"; echo "" . + strtolower($attr_array[$k]) . $searchfilter . "\">" . $desc_array[$k] . "
\n"; + echo "
\n"; echo ""; echo ""; - echo (""); echo "
  "); + echo ("  "); if ($page != 1) echo (""); - echo (""); + echo (""); echo " " . $user_count . " " . _("Users found"); echo (""); + echo (""); for ($i = 0; $i < ($user_count / $max_pageentrys); $i++) { if ($i == $page - 1) echo (" " . ($i + 1));