From 1a2857ff2e3c55c9f966e2e793ac503264596f04 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 11 Jun 2005 11:42:18 +0000 Subject: [PATCH] =?UTF-8?q?Look:=20Modif=20esth=E9tiques=20mineures?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/societe/lien.php | 9 +++- htdocs/societe/notify/fiche.php | 83 +++++++++++++++--------------- htdocs/theme/dolibarr/dolibarr.css | 5 +- htdocs/theme/eldy/eldy.css | 7 ++- htdocs/user/admin/index.php | 37 +++++-------- 5 files changed, 70 insertions(+), 71 deletions(-) diff --git a/htdocs/societe/lien.php b/htdocs/societe/lien.php index 240c3c85664..651962c82dc 100644 --- a/htdocs/societe/lien.php +++ b/htdocs/societe/lien.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004-2005 Laurent Destailleur * * 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 @@ -100,7 +100,12 @@ if($_GET["socid"]) print ''; print ''; - print ""; + print ""; + + print ""; + print ""; + + print ""; print ''; print ''; diff --git a/htdocs/societe/notify/fiche.php b/htdocs/societe/notify/fiche.php index e74d24c6e19..e993a434158 100644 --- a/htdocs/societe/notify/fiche.php +++ b/htdocs/societe/notify/fiche.php @@ -45,9 +45,8 @@ $socid = $_GET["socid"]; $sortorder=$_GET["sortorder"]; $sortfield=$_GET["sortfield"]; - if (! $sortorder) $sortorder="ASC"; -if (! $sortfield) $sortfield="nom"; +if (! $sortfield) $sortfield="c.name"; llxHeader(); @@ -162,17 +161,15 @@ if ( $soc->fetch($soc->id) ) */ print '
'.$langs->trans('Name').''.$soc->nom.''.$langs->trans('Prefix').''.$soc->prefix_comm.'
".$langs->trans('Address')."".nl2br($soc->adresse)."
".$soc->cp." ".$soc->ville." ".$soc->pays."
".$langs->trans('Address')."".nl2br($soc->adresse)."
".$langs->trans('Zip')."".$soc->cp."".$langs->trans('Town')."".$soc->ville."
".$langs->trans('Country')."".$soc->pays."
'.$langs->trans('Phone').''.dolibarr_print_phone($soc->tel).''.$langs->trans('Fax').''.dolibarr_print_phone($soc->fax).'
'; - print ''; - print ''; + print ''; + print '
'.$langs->trans("Name").''.$soc->nom.'
'.$langs->trans("Address").''.nl2br($soc->adresse).' 
'.$langs->trans("NbOfActiveNotifications").'0 (TODO Nombre non mis a jour)

'; - print ''.$langs->trans('Zip').''.$soc->cp.""; - print ''.$langs->trans('Town').''.$soc->ville.""; - - print '
'; + print ''; print "\n"; + // Ligne de titres print ''; print ''; print_liste_field_titre($langs->trans("Contact"),"fiche.php","c.name","","&socid=$socid",'',$sortfield); @@ -180,34 +177,6 @@ if ( $soc->fetch($soc->id) ) print ''; print ''; - $sql = "SELECT c.name, c.firstname, a.titre,n.rowid"; - $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c, ".MAIN_DB_PREFIX."action_def as a, ".MAIN_DB_PREFIX."notify_def as n"; - $sql.= " WHERE n.fk_contact = c.idp AND a.rowid = n.fk_action AND n.fk_soc = ".$soc->id; - - $resql=$db->query($sql); - if ($resql) - { - $num = $db->num_rows($resql); - $i = 0; - $var=True; - while ($i < $num) - { - $obj = $db->fetch_object($resql); - - print ''; - print ''; - print''; print ''; - print '
 
'.$obj->firstname . " ".$obj->name.''.$obj->titre.''.img_delete().''; - - $i++; - $var = !$var; - } - $db->free($resql); - } - else - { - dolibarr_print_error($db); - } - // Charge tableau $actions $sql = "SELECT a.rowid, a.code, a.titre"; $sql.= " FROM ".MAIN_DB_PREFIX."action_def as a"; @@ -232,6 +201,7 @@ if ( $soc->fetch($soc->id) ) dolibarr_print_error($db); } + $var=false; print '
'; print ''; print '
'; @@ -241,14 +211,45 @@ if ( $soc->fetch($soc->id) ) $html->select_array("actionid",$actions); print '
'; + print ''; + print ''; + + + // Liste + $sql = "SELECT c.name, c.firstname, a.titre,n.rowid"; + $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c, ".MAIN_DB_PREFIX."action_def as a, ".MAIN_DB_PREFIX."notify_def as n"; + $sql.= " WHERE n.fk_contact = c.idp AND a.rowid = n.fk_action AND n.fk_soc = ".$soc->id; + + $resql=$db->query($sql); + if ($resql) + { + $num = $db->num_rows($resql); + $i = 0; + while ($i < $num) + { + $var = !$var; + + $obj = $db->fetch_object($resql); + + print ''.$obj->firstname . " ".$obj->name.''; + print ''.$obj->titre.''; + print''.img_delete().''; + print ''; + $i++; + } + $db->free($resql); + } + else + { + dolibarr_print_error($db); + } + + print ''; } -/* - * - */ $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); + ?> diff --git a/htdocs/theme/dolibarr/dolibarr.css b/htdocs/theme/dolibarr/dolibarr.css index dc3a6f3f1f5..f4dbe5017b8 100644 --- a/htdocs/theme/dolibarr/dolibarr.css +++ b/htdocs/theme/dolibarr/dolibarr.css @@ -155,12 +155,12 @@ img.login a.vmenu:link { font: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: bold; } a.vmenu:visited { font: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: bold; } a.vmenu:active { font: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: bold; } -a.vmenu:hover { font: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: bold; } +a.vmenu:hover { font: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: bold; text-decoration: underline; } a.vsmenu:link { font: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; color: #202020; margin: 1em 1em 1em 1em; } a.vsmenu:visited { font: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; color: #202020; margin: 1em 1em 1em 1em; } a.vsmenu:active { font: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; color: #202020; margin: 1em 1em 1em 1em; } -a.vsmenu:hover { font: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; color: #202020; margin: 1em 1em 1em 1em; } +a.vsmenu:hover { font: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; color: #202020; margin: 1em 1em 1em 1em; text-decoration: underline; } font.vsmenudisabled { font-size:12px; font: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; color: #a3a590; margin: 1em 1em 1em 1em; } a.help:link { font: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; } @@ -313,7 +313,6 @@ a { color: #000000; } -a:hover { text-decoration: underline; } td.menu { border: 1px solid #000000; diff --git a/htdocs/theme/eldy/eldy.css b/htdocs/theme/eldy/eldy.css index 50625970913..7b1b9902470 100644 --- a/htdocs/theme/eldy/eldy.css +++ b/htdocs/theme/eldy/eldy.css @@ -290,7 +290,7 @@ td.barre_select { color: #000000 } -td.photo { +td.photo { background: #FFFFFF; color: #000000 } @@ -728,9 +728,12 @@ td.delete { font-weight: bold; } +td.validtitle { + font-weight: bold; + background: #EECC55; + } td.valid { background: #EECC55; - font-weight: bold; } td.small { diff --git a/htdocs/user/admin/index.php b/htdocs/user/admin/index.php index 03d62271c7b..2a464c2fb92 100644 --- a/htdocs/user/admin/index.php +++ b/htdocs/user/admin/index.php @@ -20,10 +20,10 @@ * $Source$ */ -/*! - \file htdocs/admin/compta.php - \ingroup comptabilite - \brief Page de configuration du module comptabilité +/** + \file htdocs/user/admin/index.php + \ingroup setup + \brief Page de configuration du module sécurité \version $Revision$ */ @@ -34,21 +34,26 @@ $langs->load("admin"); if (!$user->admin) accessforbidden(); + + if ($_POST["action"] == 'update' || $_POST["action"] == 'add') { if (! dolibarr_set_const($db, $_POST["constname"],$_POST["constvalue"],$typeconst[$_POST["consttype"]],0,isset($_POST["constnote"])?$_POST["constnote"]:'')) { - print $db->error(); + dolibarr_print_error($db); } else { Header("Location: index.php"); + exit; } } llxHeader(); +$var=false; + $form = new Form($db); $typeconst=array('yesno','texte','chaine'); @@ -56,9 +61,9 @@ print_titre($langs->trans("UserSetup")); print "
"; -print ''; +print '
'; print ''; -print ''; +print ''; print ''; print "\n"; @@ -67,7 +72,7 @@ print ''; print ''; print ''; -print "\n"; +print '\n"; print '
'.$langs->trans("OtherOptions").'  '.$langs->trans("Description").''.$langs->trans("Parameter").''.$langs->trans("Value").''.$langs->trans("Description").' 
USER_PASSWORD_GENERATED".USER_PASSWORD_GENERATED."
USER_PASSWORD_GENERATED'; $form->selectyesnonum('constvalue',USER_PASSWORD_GENERATED); @@ -86,20 +91,6 @@ print "
\n"; - +llxFooter('$Date$ - $Revision$'); - - - - - - - - - - - - - -llxFooter("Dernière modification $Date$ révision $Revision$"); ?>