lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Look: Modif esthtiques mineures

Browse Source
This commit is contained in:
Laurent Destailleur 2005-06-11 11:42:18 +00:00
parent dc3d14a17f
commit 1a2857ff2e
5 changed files with 70 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/societe/lien.php
View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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 '<table class="border" width="100%">';
print '<tr><td width="20%">'.$langs->trans('Name').'</td><td>'.$soc->nom.'</td><td>'.$langs->trans('Prefix').'</td><td>'.$soc->prefix_comm.'</td></tr>';
print "<tr><td valign=\"top\">".$langs->trans('Address')."</td><td colspan=\"3\">".nl2br($soc->adresse)."<br>".$soc->cp." ".$soc->ville." ".$soc->pays."</td></tr>";
print "<tr><td valign=\"top\">".$langs->trans('Address')."</td><td colspan=\"3\">".nl2br($soc->adresse)."</td></tr>";
print "<tr><td>".$langs->trans('Zip')."</td><td>".$soc->cp."</td>";
print "<td>".$langs->trans('Town')."</td><td>".$soc->ville."</td></tr>";
print "<tr><td>".$langs->trans('Country')."</td><td colspan=\"3\">".$soc->pays."</td></tr>";
print '<tr><td>'.$langs->trans('Phone').'</td><td>'.dolibarr_print_phone($soc->tel).'</td>';
print '<td>'.$langs->trans('Fax').'</td><td>'.dolibarr_print_phone($soc->fax).'</td></tr>';

83
htdocs/societe/notify/fiche.php
View File

@ -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 '<table class="border"width="100%">';
print '<tr><td width="20%">'.$langs->trans("Name").'</td><td colspan="3">'.$soc->nom.'</td></tr>';
print '<tr><td valign="top">'.$langs->trans("Address").'</td><td colspan="3">'.nl2br($soc->adresse).'&nbsp;</td></tr>';
print '<tr><td width="30%">'.$langs->trans("NbOfActiveNotifications").'</td><td colspan="3">0 (TODO Nombre non mis a jour)</td></tr>';
print '</table><br>';
print '<tr><td>'.$langs->trans('Zip').'</td><td>'.$soc->cp."</td>";
print '<td>'.$langs->trans('Town').'</td><td>'.$soc->ville."</td></tr>";
print '</table><br></div>';
print '</div>';
print "\n";
// Ligne de titres
print '<table width="100%" class="noborder">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Contact"),"fiche.php","c.name","","&socid=$socid",'',$sortfield);
@ -180,34 +177,6 @@ if ( $soc->fetch($soc->id) )
print '<td>&nbsp;</td>';
print '</tr>';
$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 '<tr '.$bc[$var].'><td>'.$obj->firstname . " ".$obj->name.'</td>';
print '<td>'.$obj->titre.'</td>';
print'<td align="center"><a href="fiche.php?socid='.$socid.'&action=delete&actid='.$obj->rowid.'">'.img_delete().'</a>';
$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 '<form action="fiche.php?socid='.$socid.'" method="post">';
print '<input type="hidden" name="action" value="add">';
print '<tr '.$bc[$var].'><td>';
@ -241,14 +211,45 @@ if ( $soc->fetch($soc->id) )
$html->select_array("actionid",$actions);
print '</td>';
print '<td align="center"><input type="submit" value="'.$langs->trans("Add").'"></td>';
print '</tr></form></table>';
print '</tr>';
print '</form>';
// 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 '<tr '.$bc[$var].'><td>'.$obj->firstname . " ".$obj->name.'</td>';
print '<td>'.$obj->titre.'</td>';
print'<td align="center"><a href="fiche.php?socid='.$socid.'&action=delete&actid='.$obj->rowid.'">'.img_delete().'</a>';
print '</tr>';
$i++;
}
$db->free($resql);
}
else
{
dolibarr_print_error($db);
}
print '</table>';
}
/*
*
*/
$db->close();
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
llxFooter('$Date$ - $Revision$');
?>

5
htdocs/theme/dolibarr/dolibarr.css
View File

@ -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;

7
htdocs/theme/eldy/eldy.css
View File

@ -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 {

37
htdocs/user/admin/index.php
View File

@ -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 "<br>";
print '<table class="noborder" cellpadding="3" cellspacing="0" width=\"100%\">';
print '<table class="noborder" width=\"100%\">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("OtherOptions").'</td><td>&nbsp;</td><td>&nbsp;</td><td>'.$langs->trans("Description").'</td>';
print '<td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td><td>'.$langs->trans("Description").'</td>';
print '<td>&nbsp;</td>';
print "</tr>\n";
@ -67,7 +72,7 @@ print '<input type="hidden" name="action" value="update">';
print '<input type="hidden" name="constname" value="USER_PASSWORD_GENERATED">';
print '<input type="hidden" name="consttype" value="yesno">';
print "<tr $bc[$var] class=value><td>USER_PASSWORD_GENERATED</td><td>".USER_PASSWORD_GENERATED."</td>\n";
print '<tr '.$bc[$var]."><td>USER_PASSWORD_GENERATED</td>\n";
print '<td>';
$form->selectyesnonum('constvalue',USER_PASSWORD_GENERATED);
@ -86,20 +91,6 @@ print "</table>\n";
llxFooter('$Date$ - $Revision$');
llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</em>");
?>