From bd74a142928627d47db77f8391f6d46f37d12113 Mon Sep 17 00:00:00 2001 From: beedauchon Date: Sat, 13 Sep 2003 13:39:12 +0000 Subject: [PATCH] ajout support css --- htdocs/admin/boxes.php | 4 +- htdocs/admin/external_rss.php | 8 +- htdocs/admin/facture.php | 10 +- htdocs/admin/fichinter.php | 2 +- htdocs/admin/index.php | 12 +- htdocs/admin/modules.php | 2 +- htdocs/admin/propale.php | 4 +- htdocs/admin/system/index.php | 18 +- htdocs/admin/system/phpinfo.php | 3 +- htdocs/comm/propal.php | 2 +- htdocs/compta/bank/bplc.php | 2 +- htdocs/compta/bank/budget.php | 2 +- htdocs/compta/bank/config.php | 4 +- htdocs/compta/bank/index.php | 12 +- htdocs/compta/bank/search.php | 4 +- htdocs/compta/bank/virement.php | 6 +- htdocs/compta/dons/fiche.php | 60 +++---- htdocs/compta/dons/index.php | 2 +- htdocs/compta/dons/stats.php | 6 +- htdocs/fourn/facture/fiche.php | 64 +++---- htdocs/index.php | 2 +- htdocs/product/fiche.php | 62 +++---- htdocs/product/stats/index.php | 10 +- htdocs/soc.php | 62 +++---- htdocs/theme/yellow/monochrome.css | 259 ----------------------------- htdocs/user/fiche.php | 68 ++++---- 26 files changed, 216 insertions(+), 474 deletions(-) delete mode 100755 htdocs/theme/yellow/monochrome.css diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 21b65ae2d42..8ba0ae8026e 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -62,7 +62,7 @@ if ($result) { $obj = $db->fetch_object( $i); - print ''.$obj->name.'' . $pos[$obj->position] . ''; + print ''.$obj->name.'' . $pos[$obj->position] . ''; print 'Supprimer'; @@ -96,7 +96,7 @@ if ($result) { $obj = $db->fetch_object( $i); - print ''.$obj->name.'' . $obj->file . ''; + print ''.$obj->name.'' . $obj->file . ''; if ($rowid == $obj->rowid && $action == 'edit') { diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php index 9b9ddffbe3e..82b6d10934b 100644 --- a/htdocs/admin/external_rss.php +++ b/htdocs/admin/external_rss.php @@ -65,7 +65,7 @@ if ($action == 'save') print_fiche_titre("Configuration du lien vers un site syndiqué", $mesg); -print "\n

Attention, pour la récupération des données au format RSS, les urls en https ne marchent pas pour l'instant.

+print "\n

Attention, pour la récupération des données au format RSS, les urls en https ne marchent pas pour l'instant.

Exemples:

-

+

\n"; @@ -83,7 +83,7 @@ print "\n

Attention, pour la r // ptet définir une variable pour NBMAX_RSS_EXTERNE ... modifier en fonction le fichier // ../pre.inc.php for($i = 0; $i < $nbexternalrss; $i++) { - print "

+ print " @@ -127,7 +127,7 @@ if (defined("MAIN_MODULE_EXTERNAL_RSS") && MAIN_MODULE_EXTERNAL_RSS) { $href = $item['link']; $title = $item['title']; - print ''.$title.'
'; + print '
'.$title.'

'; } } diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 1b3f9c51eac..db072d0179c 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -91,7 +91,7 @@ while (($file = readdir($handle))!==false) { if (is_dir($dir.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS') { - print ''; print ''; print ''; print "\n"; -print ''; print ''; print "\n"; -print ''; +print ''; -print ''; +print ''; if ($action == 'modtheme') { @@ -68,12 +68,12 @@ else print ''; } -print ''; +print ''; print ''; -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; print '
Syndication du site numéro " . ($i+1) . "
'; + print '
'; echo "$file"; print "\n"; @@ -145,7 +145,7 @@ while (($file = readdir($handle))!==false) $name = substr($file, 4, strlen($file) -16); $classname = substr($file, 0, strlen($file) -12); - print '
'; + print '
'; echo "$name"; print "\n"; require_once($dir.$file); @@ -190,7 +190,7 @@ print '
Nom 
'; print ''; print ''; print "\n"; -print ''; -print ''; +print ''; +print ''; print "
NomValeur
Répertoire'.FAC_OUTPUTDIR.'
URL'.FAC_OUTPUT_URL.'
Répertoire'.FAC_OUTPUTDIR.'
URL'.FAC_OUTPUT_URL.'
"; llxFooter("Dernière modification $Date$ révision $Revision$"); diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index 5c659f8e41c..83d57a026d9 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -73,7 +73,7 @@ while (($file = readdir($handle))!==false) $name = substr($file, 4, strlen($file) -16); $classname = substr($file, 0, strlen($file) -12); - print '
'; + print '
'; echo "$name"; print "\n"; require_once($dir.$file); diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php index 53da1237d85..7b7c8cb1d60 100644 --- a/htdocs/admin/index.php +++ b/htdocs/admin/index.php @@ -40,9 +40,9 @@ print '
NomValeurAction
Version' . DOL_VERSION . ' 
Version' . DOL_VERSION . ' 
theme
theme' . $conf->theme . 'Changer
Document root' . DOL_DOCUMENT_ROOT . ' 
Document root' . DOL_DOCUMENT_ROOT . ' 
Base de données
Type' . $conf->db->type . ' 
Serveur' . $conf->db->host . ' 
Nom' . $conf->db->name . ' 
Type' . $conf->db->type . ' 
Serveur' . $conf->db->host . ' 
Nom' . $conf->db->name . ' 
'; diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 1a6b63c6c2f..63753ad153e 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -196,7 +196,7 @@ foreach ($modules as $key => $value) $const_value = $modules[$key][2]; $desc = $modules[$key][3]; - print ''; + print ''; echo "$titre"; print "\n"; echo "$desc"; diff --git a/htdocs/admin/propale.php b/htdocs/admin/propale.php index d771dcae417..6d23a7fc01e 100644 --- a/htdocs/admin/propale.php +++ b/htdocs/admin/propale.php @@ -120,7 +120,7 @@ if ($handle) $modPropale = new $file; - print ''.$file."\n"; + print ''.$file."\n"; print $modPropale->info(); print ''; @@ -195,7 +195,7 @@ while (($file = readdir($handle))!==false) $name = substr($file, 12, strlen($file) - 24); $classname = substr($file, 0, strlen($file) -12); - print ''; + print ''; echo "$name"; print "\n"; require_once($dir.$file); diff --git a/htdocs/admin/system/index.php b/htdocs/admin/system/index.php index 509776aec7c..959ef427d34 100644 --- a/htdocs/admin/system/index.php +++ b/htdocs/admin/system/index.php @@ -29,18 +29,18 @@ print ''; print 'NomValeurAction'; print "\n"; -print 'Version' . DOL_VERSION . ' '; -print 'css' . $conf->css . ' '; -print 'theme' . $conf->theme . ' '; -print 'document root' . DOL_DOCUMENT_ROOT . ' '; +print "Version" . DOL_VERSION . ' '; +print "css" . $conf->css . ' '; +print "theme" . $conf->theme . ' '; +print "document root" . DOL_DOCUMENT_ROOT . ' '; print 'Database'; -print 'type' . $conf->db->type . ' '; -print 'host' . $conf->db->host . ' '; -print 'user' . $conf->db->user . '  '; -print 'pass' . $conf->db->pass . '  '; -print 'Database name' . $conf->db->name . ' '; +print "type" . $conf->db->type . ' '; +print "host" . $conf->db->host . ' '; +print "user" . $conf->db->user . '  '; +print "pass" . $conf->db->pass . '  '; +print "Database name" . $conf->db->name . ' '; print ''; diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php index f3bf373baca..05be5da383c 100644 --- a/htdocs/admin/system/phpinfo.php +++ b/htdocs/admin/system/phpinfo.php @@ -22,7 +22,7 @@ require("./pre.inc.php"); llxHeader(); - +print "
"; if ($what == 'conf') { phpinfo(INFO_CONFIGURATION); @@ -39,5 +39,6 @@ else { phpinfo(); } +print "
"; llxfooter(); ?> diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index ae1fd6ff096..f78a0708ae8 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -632,7 +632,7 @@ if ($propalid) { print ''; print ''; - print 'Modèle'; + print "Modèle"; $html = new Form($db); $modelpdf = new Propal_Model_pdf($db); diff --git a/htdocs/compta/bank/bplc.php b/htdocs/compta/bank/bplc.php index f219183d1c1..f991e1fd92d 100644 --- a/htdocs/compta/bank/bplc.php +++ b/htdocs/compta/bank/bplc.php @@ -65,7 +65,7 @@ if ($result) { while ($i < $num) { $objp = $db->fetch_object( $i); - print ""; + print ""; $type = substr($objp->ref_commande, strlen($objp->ref_commande) - 2 ); $id = substr($objp->ref_commande, 0 , strlen($objp->ref_commande) - 2 ); diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php index 87836611e89..41b2e647109 100644 --- a/htdocs/compta/bank/budget.php +++ b/htdocs/compta/bank/budget.php @@ -72,7 +72,7 @@ if ($bid == 0) } $db->free(); - print 'Total'; + print "".'Total'; print ''.price($total).' '; } else diff --git a/htdocs/compta/bank/config.php b/htdocs/compta/bank/config.php index 3a55ec843ab..d9fb066c3f8 100644 --- a/htdocs/compta/bank/config.php +++ b/htdocs/compta/bank/config.php @@ -46,7 +46,7 @@ if ($result) while ($i < $num) { $objp = $db->fetch_object( $i); - print "$objp->rowidrowid\">$objp->label$objp->bank $objp->number ".$yn[$objp->clos].""; + print "$objp->rowidrowid\">$objp->label$objp->bank $objp->number ".$yn[$objp->clos].""; $i++; @@ -56,7 +56,7 @@ if ($result) print ""; -print "

"; +print "

"; /* * Case 1 diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php index aa83e715025..9d75a76eaac 100644 --- a/htdocs/compta/bank/index.php +++ b/htdocs/compta/bank/index.php @@ -60,7 +60,7 @@ for ($i = 0 ; $i < sizeof($accounts) ; $i++) { $solde = $acc->solde(); - print ""; @@ -71,7 +71,7 @@ for ($i = 0 ; $i < sizeof($accounts) ; $i++) } } -print ''; +print "".''; print ''; /* * TVA @@ -84,7 +84,7 @@ if ($conf->compta->tva) $total = $total + $tva_solde; - print ''; + print "".''; } /* * Charges sociales @@ -95,12 +95,12 @@ $chs_a_payer = $chs->solde(); $total = $total - $chs_a_payer; -print ''; +print "".''; /* * */ -print ''; +print "".''; /* * @@ -118,7 +118,7 @@ for ($i = 0 ; $i < sizeof($accounts) ; $i++) { $solde = $acc->solde(); - print ""; diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index da08207a657..f7e3cf90bd9 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -45,7 +45,7 @@ print "\n"; ?> - +"; ?> ".'"; + print ''; print '"; - print "\n"; - print "\n"; - print "\n"; - print ''; - print ''; - print ''; - print '".''; + print "".''; + print "".''; + print "".''; - print ''; - print ''; - print ''; - print ''; - print ''; + print "".''; + print "".''; + print "".''; + print "".''; + print "".''; print "\n"; print "
"; + print "
"; print ''.$acc->label.''; print "$acc->bank$acc->number
Total'.price($total).'euros
Total'.price($total).'euros
Dettes
TVA'.price($tva_solde).' 
TVA'.price($tva_solde).' 
URSSAF'.price($chs_a_payer).' 
URSSAF'.price($chs_a_payer).' 
Total'.price($total).'euros
Total'.price($total).'euros
"; + print "
"; print ''.$acc->label.''; print "$acc->bank$acc->number
@@ -157,7 +157,7 @@ if ($result) { } $db->free(); } else { - print $db->error() ."

" . $sql; + print $db->error() .'

' . $sql .'"; print ''; print ''; -print ""; -print ""; +print ""; print ""; -print ''; +print "".''; print "
DeVersDateLibelleMontant
"; +print "
DeVersDateLibelleMontant
"; print "
"; diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index 63e15c38854..72a0e056895 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -128,13 +128,13 @@ if ($action == 'create') { print ""; - print "
Date du don"; + print "
Date du don'; print_date_select(); - print "Commentaires :
'; print "
Mode de paiement\n"; + print "
Mode de paiement\n"; $paiement = new Paiement($db); @@ -142,7 +142,7 @@ if ($action == 'create') { print "
Projet
Projet
"; print "
Don public
Don public
"; print "
Prénom
Nom
Societe
Adresse'; + print "
Prénom
Nom
Societe
Adresse'; print '
CP Ville
Pays
Email
Montant euros
CP Ville
Pays
Email
Montant euros
\n"; @@ -203,7 +203,7 @@ if ($rowid > 0 && $action == 'edit') print "

"; print ''; - print ""; @@ -212,7 +212,7 @@ if ($rowid > 0 && $action == 'edit') if ($don->statut == 1) { - print "\n"; @@ -225,27 +225,27 @@ if ($rowid > 0 && $action == 'edit') print "\n"; } - print ''; + print "".''; - print "\n"; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; + print "".''; + print "".''; + print "".''; + print "".''; + print "".''; + print "".''; + print "".''; + print "".''; print "
Date du don"; + print "
Date du don"; print strftime("%d %B %Y",$don->date); print "
Mode de paiement"; + print "
Mode de paiement"; $paiement = new Paiement($db); $paiement->select("modepaiement","crédit", $don->modepaiementid); print "
Projet'.$don->projet.'
Projet'.$don->projet.'
Don public"; + print "
Don public"; print $yn[$don->public]; print "
Prénom'.$don->prenom.' 
Nom'.$don->nom.' 
Société'.$don->societe.' 
Adresse'.nl2br($don->adresse).' 
CP Ville'.$don->cp.' '.$don->ville.' 
Pays'.$don->pays.' 
Email'.$don->email.' 
Montant'.price($don->amount).' euros
Prénom'.$don->prenom.' 
Nom'.$don->nom.' 
Société'.$don->societe.' 
Adresse'.nl2br($don->adresse).' 
CP Ville'.$don->cp.' '.$don->ville.' 
Pays'.$don->pays.' 
Email'.$don->email.' 
Montant'.price($don->amount).' euros
\n"; - print "

"; + print "

"; /* * Case 1 @@ -318,9 +318,9 @@ if ($rowid > 0 && $action == 'edit') print ''; print ''; print '
'; - print ''; - print ''; - print ''; + print "".''; + print "".''; + print "".''; print '
Commentaires
Commentaires

'; } diff --git a/htdocs/compta/dons/index.php b/htdocs/compta/dons/index.php index 3bda7968242..3a357470a11 100644 --- a/htdocs/compta/dons/index.php +++ b/htdocs/compta/dons/index.php @@ -60,7 +60,7 @@ for ($i = 0 ; $i < 4 ; $i++) $total += $somme[$i]; print ""; } -print 'Total'.price($total).''; +print "".'Total'.price($total).''; print ""; diff --git a/htdocs/compta/dons/stats.php b/htdocs/compta/dons/stats.php index 43f54937fda..7a7b90b2bb0 100644 --- a/htdocs/compta/dons/stats.php +++ b/htdocs/compta/dons/stats.php @@ -43,10 +43,10 @@ if ($result) print ""; - print ''; + print ""; print ''; - print ''; - print ''; + print "".''; + print "".''; print ""; print "
Nombre de dons'.$i.'
Total'.price($total).'
Moyenne'.price($total / $i).'
Total'.price($total).'
Moyenne'.price($total / $i).'
"; diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 29c17d30be1..f147c3e1500 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -144,7 +144,7 @@ if ($action == 'create') print '
'; print ''; print ''; - print ''; + print "".''; print ''; print ""; - print ''; + print "".''; print ''; - print ''; + print "".''; - print '".''; - print ""; + print ""; print "
Société :
Société :Commentaires :
Numéro :
Numéro :
Libellé :
Libellé :
Date :'; + print "
Date :'; $html->select_date(); print '
Auteur :".$user->fullname."
Auteur :".$user->fullname."

"; print ''; - print ''; + print "".''; - print ''; + print "".''; print ''; print ''; print ''; - print ''; + print "".''; print ''; print ''; print ''; - print ''; + print "".''; print ''; print ''; print ''; - print ''; + print "".''; print ''; print ''; print ''; - print ''; + print "".''; print ""; print "
 LibelléP.U.QtyTx TVA
 LibelléP.U.QtyTx TVA
Ligne 1 :
Ligne 1 :'; $html->select_tva("tauxtva1"); print '
Ligne 2 :
Ligne 2 :'; $html->select_tva("tauxtva2"); print '
Ligne 3 :
Ligne 3 :'; $html->select_tva("tauxtva3"); print '
Ligne 4 :
Ligne 4 :'; $html->select_tva("tauxtva4"); print '
"; @@ -262,13 +262,13 @@ else print ''; print ''; - print ""; + print ""; print ''; print ''; - print '".''; print ''; - print '".''; - print ''; + print "".''; print ''; - print ""; - print ""; - print ""; + print ""; + print ""; print ""; print "
Société :
Société :'.stripslashes($obj->socnom); print 'Commentaires :
Numéro :'; + print "
Numéro :'; print ''; @@ -276,20 +276,20 @@ else print stripslashes($obj->note); print '
Libellé :'; + print "
Libellé :'; print '
Montant HT :
Montant HT :'.price($fac->total_ht).'
Date :"; + print "
Date :"; print_date_select($obj->df); print "
Auteur :".' '."
Auteur :".' '."
"; @@ -304,7 +304,7 @@ else print 'Total TTC '; for ($i = 0 ; $i < sizeof($fac->lignes) ; $i++) { - print ''.$fac->lignes[$i][0].""; + print "".''.$fac->lignes[$i][0].""; print ''.price($fac->lignes[$i][1]).""; print ''.$fac->lignes[$i][3].""; print ''.price($fac->lignes[$i][4]).""; @@ -318,7 +318,7 @@ else /* Nouvelle ligne */ print "
rowid&action=add_ligne\" method=\"post\">"; - print ''; + print ""; print ''; print ''; print ''; @@ -346,24 +346,24 @@ else */ print ""; - print '".''; for ($i = 0 ; $i < sizeof($fac->lignes) ; $i++) { - print '"; + print "".'"; print '"; print '"; print '"; @@ -455,7 +455,7 @@ else * */ - print "

'; + print "
'; /* * Facture */ print ''; - print ""; + print ""; print "\n"; print ""; - print "\n"; - print ""; - print ''; + print "\n"; + print ""; + print "".'td>Auteur'; - print '"; + print "".'"; print '"; - print '"; + print "".'"; if (strlen($obj->note)) { - print '".''; } @@ -407,11 +407,11 @@ else $total = $total + $objp->amount; $i++; } - print "\n"; + print "\n"; $resteapayer = $fac->total_ttc - $total; - print ""; + print ""; print '\n"; print "
Sociétésocidp\">$obj->socnom
Sociétésocidp\">$obj->socnomsocidp\">Autres factures
Date".strftime("%A %d %B %Y",$obj->df)."
Libelle$obj->libelle
Auteur'.$fac->author.' 
Date".strftime("%A %d %B %Y",$obj->df)."
Libelle$obj->libelle
'.$fac->author.' 
 Total HT'.price($fac->total_ht)."
 Total HT'.price($fac->total_ht)."TVA'.price($fac->total_tva)."
 Total TTC'.price($fac->total_ttc)."
 Total TTC'.price($fac->total_ttc)."
Commentaires'; + print "
Commentaires'; print nl2br(stripslashes($obj->note)); print '
Total :".price($total)."$_MONNAIE
Total :".price($total)."$_MONNAIE
Reste a payer :
Reste a payer :'.price($resteapayer)."$_MONNAIE
"; @@ -435,7 +435,7 @@ else print '		Total TTC
'.$fac->lignes[$i][0]."
'.$fac->lignes[$i][0]."'.price($fac->lignes[$i][1])."'.$fac->lignes[$i][3]."'.price($fac->lignes[$i][4])."
"; + print "

"; if ($obj->statut == 0 && $user->societe_id == 0) { diff --git a/htdocs/index.php b/htdocs/index.php index 2494013c10a..8d891c70a85 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -25,7 +25,7 @@ llxHeader(); print_fiche_titre( "Dolibarr ".DOL_VERSION,'A propos'); -print 'Connecté en tant que : ' . $user->prenom . ' ' . $user->nom .' ['.$user->code.']'; +print '
Connecté en tant que : ' . $user->prenom . ' ' . $user->nom .' ['.$user->code.']
'; print "
"; /* * Boites diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index d99989de7b4..4a53766fa81 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -149,21 +149,21 @@ if ($action == 'create') print ''."\n"; print '
Nouveau '.$types[$type].'

'."\n"; - print '
'; - print ""; + print '
'; + print ""; print ''; - print ''; - print ''; - print '".''; + print "".''; + print "".''; - print "".'"; if ($type == 1) { - print '".''; } - print ''; + print "".''; print '
Référence
Libellé
Prix de vente
Taux TVA'; + print "
Libellé
Prix de vente
Taux TVA'; $html = new Form($db); print $html->select_tva("tva_tx"); print '
Description"; + print "
Description'; print '
Durée'; + print "
Durée'; print 'jour '; print 'semaine '; print 'mois '; @@ -171,7 +171,7 @@ if ($action == 'create') print '
 
 
'; print '
'; } @@ -185,7 +185,7 @@ else if ( $result ) { print ''; - print ''; + print ""; print ''; print ''; print ''; @@ -196,7 +196,7 @@ else print_fiche_titre('Fiche '.$types[$product->type].' : '.$product->ref, $mesg); print '
Réf :  
'; - print ""; + print ""; print ''; print ''; print ""; print ''; - print ''; + print ''; print ''; - print ''; - print ""; + print "".''; + print ""; if ($product->type == 1) { - print '".'
Référence'.$product->ref.''; if ($product->envente) @@ -210,19 +210,19 @@ else print '
Libellé$product->labelStatistiques
Prix de vente'.price($product->price).'
Prix de vente'.price($product->price).''; print "Propositions commerciales : ".$product->count_propale(); print "
Proposé à ".$product->count_propale_client()." clients"; print "
Factures : ".$product->count_facture(); print '
Taux TVA'.$product->tva_tx.' %
Description".nl2br($product->description)."
Taux TVA'.$product->tva_tx.' %
Description".nl2br($product->description)."
Durée'.$product->duration_value.' '; + print "
Durée'.$product->duration_value.' '; if ($product->duration_value > 1) { $plu = "s"; @@ -255,11 +255,11 @@ else print "\n"; print ''; - print ''; + print '
'; - print ''; + print "".''; - print '".''; print '
Prix de vente
Prix de vente
 '; + print "
 '; print '
'; print ''; @@ -274,16 +274,16 @@ else print "
\n"; print ''; - print ''; - print ''; + print '
Référence
'; + print "".''; print ''; - print ''; - print '".''; + print "".''; - print '".''; - print '".'"; if ($product->type == 1) { - print '".''; } - print '".''; print '
Référence
Libellé
Prix de vente'.price($product->price).'
Taux TVA'; + print "
Prix de vente'.price($product->price).'
Taux TVA'; $html = new Form($db); print $html->select_tva("tva_tx", $product->tva_tx); print '
Statut'; + print "
Statut'; print '
Description'; + print "
Description'; print '
Durée'; + print "
Durée'; switch ($product->duration_unit) { case "d": @@ -340,7 +340,7 @@ else print '
 '; + print "
 '; print '
'; print '
'; @@ -404,7 +404,7 @@ if ($id && $action == '' && $product->envente) print ''; if($user->rights->propale->creer) { - print '".''; if($user->rights->propale->creer) { @@ -412,7 +412,7 @@ if ($id && $action == '' && $product->envente) print_titre("Ajouter aux autres propositions") . ''; } print ''; - print '".''; @@ -474,12 +474,12 @@ if ($id && $action == '' && $product->envente) if($user->rights->facture->creer) { - print '".''; - print '".''; - print ''; + print "".''; print ''; - print ''; + print "".''; print ''; - print ''; + print "".''; print ''; - print ''; + print "".''; print ''; - print ''; + print "".''; print ''; - print '".''; print ''; - print ''; + print "".''; print ''; print '
'; + print "
'; print_titre("Ajouter à ma proposition") . '
'; + print "
'; $sql = "SELECT s.nom, s.idp, p.rowid as propalid, p.ref,".$db->pdate("p.datep")." as dp"; $sql .= " FROM llx_societe as s, llx_propal as p"; $sql .=" WHERE p.fk_soc = s.idp AND p.fk_statut = 0 AND p.fk_user_author = ".$user->id; @@ -458,13 +458,13 @@ if ($id && $action == '' && $product->envente) print '
'; print ''; print ''; - print "".'"; + print ''; print '
Autres Propositions"; + print "
Autres Propositions'; $htmls->select_array("propalid", $otherprop); print ''; print ''; print ''; print ''; - print "
'; } print '
'; + print "
'; print_titre("Ajouter à ma facture"); print ''; print_titre("Ajouter aux autres factures"); print '
'; + print "
'; $sql = "SELECT s.nom, s.idp, f.rowid as factureid, f.facnumber,".$db->pdate("f.datef")." as df"; $sql .= " FROM llx_societe as s, llx_facture as f"; $sql .=" WHERE f.fk_soc = s.idp AND f.fk_statut = 0 AND f.fk_user_author = ".$user->id; diff --git a/htdocs/product/stats/index.php b/htdocs/product/stats/index.php index 4424737876a..5507dd3c804 100644 --- a/htdocs/product/stats/index.php +++ b/htdocs/product/stats/index.php @@ -49,11 +49,11 @@ $db->free(); print_fiche_titre('Statistiques produits et services', $mesg); -print ''; -print ""; +print '
'; +print ""; print ''; print ''; -print ""; +print ""; print ''; print ''; @@ -72,10 +72,10 @@ if ($db->query($sql)) } $db->free(); -print ""; +print ""; print ''; print ''; -print ""; +print ""; print ''; print ''; diff --git a/htdocs/soc.php b/htdocs/soc.php index 76634dd6a73..5dd3f824b9b 100644 --- a/htdocs/soc.php +++ b/htdocs/soc.php @@ -89,26 +89,26 @@ if ($action == 'create') print ''; print '
Nb de produit dans le catalogue'.$nbproduct.'
Nb de produit dans le catalogue qui ne sont pas en vente'.$nbhv.'
Nb de service dans le catalogue'.$nbproduct.'
Nb de service dans le catalogue qui ne sont pas en vente'.$nbhv.'
'; - print ''; - print ''; - print ''; + print ''; + print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; - print ''; + print ''; - print ''; + print ''; print '
Nom
Adresse
CP '; + print '
Nom
Adresse
CP '; print 'Ville 
Tel
Fax
Webhttp://
Tel
Fax
Webhttp://
Siren
Siren
Client
Client'; - print '
Fournisseur
Fournisseur'; - print '
'; print ''; } @@ -127,31 +127,31 @@ elseif ($action == 'edit') print ''; print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; - print ''; + print ''; - print ''; - print ''; + print ''; print '
Nom
Adresse
CP '; + print '
CP '; print 'Ville 
Tel
Fax
Webhttp://
Tel
Fax
Webhttp://
Siren
Siren
Client
Client'; - print '
Fournisseur
Fournisseur'; print '
'; print ''; } @@ -165,32 +165,32 @@ elseif ($action == 'edit') $soc->fetch($socid); print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; - print ''; + print ''; if ($soc->client) { - print ''; + print ''; } else { - print ''; + print ''; } if ($soc->fournisseur) { - print ''; + print ''; } else { - print ''; + print ''; } print '
Nom'.$soc->nom.'
Adresse'.nl2br($soc->adresse).' 
CP'.$soc->cp.' '.$soc->ville.'
Nom'.$soc->nom.'
Adresse'.nl2br($soc->adresse).' 
CP'.$soc->cp.' '.$soc->ville.'
Tel'.$soc->tel.'
Fax'.$soc->fax.'
Webhttp://'.$soc->url.'
Tel'.$soc->tel.'
Fax'.$soc->fax.'
Webhttp://'.$soc->url.'
Siren'.$soc->siren.' 
Siren'.$soc->siren.' 
Clientoui Fiche
Clientoui Fiche
Clientnon
Clientnon
Fournisseuroui Fiche
Fournisseuroui Fiche
Fournisseurnon
Fournisseurnon
'; diff --git a/htdocs/theme/yellow/monochrome.css b/htdocs/theme/yellow/monochrome.css deleted file mode 100755 index d015446c027..00000000000 --- a/htdocs/theme/yellow/monochrome.css +++ /dev/null @@ -1,259 +0,0 @@ -/* Copyright (C) 2002-2003 Rodolphe Quiedeville - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ - * $Source$ - * - */ -body -{ - background: #333333; - font-family: Helvetica, Verdana; font-size: 12px; -} -/* - * Menu superieur - */ -table.topbarre { - cell-spacing: 0; - } -/* - * Tables - */ -table#wiborder { - border-collapse:collapse; - } - -table#wiborder td { - border: outset 1pt; - border-collapse:collapse; - padding: 3pt; - } - -a { - text-decoration: none; - font-weight: bold; - color: #eeeeee; - } - -a:hover { text-decoration: underline; color: #eeeeee; } - -td.menu { - border-right: 1px solid #888888; - border-bottom: 1px solid #777777; - } - -td.menusel { - border-top: 1px solid #999999; - border-right: 1px solid #aaaaaa; - border-bottom: 1px solid #aaaaaa; - border-left: 1px solid #999999; - } - -td.border { - border-top: 1px solid #555555; - border-right: 1px solid #888888; - border-bottom: 1px solid #777777; - border-left: 1px solid #666666; - } - -div.menus { - background: #444444; - color: #eeeeee; - border-top: 1px dashed #555555; - border-right: 1px dashed #888888; - border-bottom: 1px dashed #777777; - border-left: 1px dashed #666666; - } - - -.menu -{ - background: #444444; - font-family: Helvetica, Verdana; font-size: 1.0em; font-weight: bold; - color: #dddddd; - text-decoration: none } - -.menusel -{ - background: #666666; - font-family: Helvetica, Verdana; font-size: 1.0em; font-weight: bold; - color: #eeeeee; - text-decoration: none } - -.submenu -{ - background: #444444; - font-family: Helvetica, Verdana; font-size: 1.0em; - color: #bbbbbb; - text-decoration: none } - -a.normal{ font-weight: normal } -a.impayee { font-weight: bold } - -/* - * Barre de gauche - */ - -a.leftmenu { - font-family: Helvetica, Verdana; - font-size: 1.0em; - font-weight: bold; - color: #cccccc; - } - -td.barre { - border-right: 1px solid #777777; - border-bottom: 1px solid #888888; - background: #444444; - font-family: Helvetica, Verdana; - font-size: 1.0em; - color: #aaaaaa; - text-decoration: none } - -td.barre_select { - background: #666666; - color: #eeeeee - } - -div.titre { - font-family: Helvetica, Verdana; - font-size: 1.0em; - font-weight: bold; - color: #dddddd; - text-decoration: none } -/* - * - */ -.liste { - background: #666666; - color: #dddddd; - border-top: 1px dashed #555555; - border-right: 1px dashed #888888; - border-bottom: 1px dashed #777777; - border-left: 1px dashed #666666; - } - - -tr.liste_titre { - background: #666666; - font-family: Helvetica, Verdana; - font-size: 1.0em; - font-weight: bold; - color: #dddddd; - } - -tr.pair { - background: #777777; - font-family: Helvetica, Verdana; - font-size: 1.0em; - color: #eeeeee; - border-top: 1px dashed #555555; - border-right: 1px dashed #888888; - border-bottom: 1px dashed #777777; - border-left: 1px dashed #666666; - } - -tr.impair { - background: #666666; - font-family: Helvetica, Verdana; - font-size: 1.0em; - color: #eeeeee; - border-top: 1px dashed #555555; - border-right: 1px dashed #888888; - border-bottom: 1px dashed #777777; - border-left: 1px dashed #666666; - } -/* - * - */ - -tr.box_titre { - font-family: Helvetica, Verdana; - font-size: 1.0em; - font-weight: bold; - color: #dddddd; - } - -tr.box_pair { - background: #666666; - font-family: Helvetica, Verdana; - font-size: 0.9em; - color: #eeeeee; - } - -tr.box_impair { - background: #777777; - font-family: Helvetica, Verdana; - font-size: 0.9em; - color: #eeeeee; - } - -tr.fiche { - font-family: Helvetica, Verdana; - font-size: 0.6em; - } - -/* - * - */ - -input.flat -{ - border: 0 - } - -td.valeur -{ - font-weight: bold; - } - -td.delete { - background: red; - font-weight: bold; - } - -td.valid { - background: pink; - font-weight: bold; - } - -td.small { - font-size: 0.8em; - } - -tr.nonpayed { - font-size: 0.9em; font-weight: bold; - } - - -p#powered-by-dolibarr { - position: fixed; - margin: 0; - padding: 0; - bottom: 2px; - left: 0px; - z-index: 2; - color: #eeeeee; -} - -p#powered-by-dolibarr a { - border: 1px solid black; - text-decoration: none; - color: #eeeeee; - font-size: 0.9em; - padding-right: 5px; - padding-left: 5px; -} \ No newline at end of file diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 1ee2fb83433..2ada79bedbc 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -117,34 +117,34 @@ if ($action == 'create') print ''; - print ''; + print "".''; print ''; - print ''; + print "".''; print ''; - print ''; + print "".''; print ''; - print ''; + print "".''; print ''; - print ''; + print "".''; print ''; - print ''; + print "".''; print ''; - print ''; + print "".''; print ''; - print '".'"; - print ''; + print "".''; print ''; print '
Prénom
Prénom
Nom
Nom
Login
Login
Password
Password
Email
Email
Admin ?
Admin ?'; $form->selectyesnonum('admin',0); print '
Login Webcal
Login Webcal
Note'; + print "
Note'; print "
'; } @@ -168,8 +168,8 @@ else print ''; print ''; - print ''; - print '".''; + print "".'".'
Supprimer cet utilisateur
Etes-vous sur de vouloir supprimer cet utilisateur ?'; + print "
Supprimer cet utilisateur
Etes-vous sur de vouloir supprimer cet utilisateur ?'; $htmls = new Form($db); $htmls->selectyesno("confirm","no"); @@ -189,12 +189,12 @@ else print ''; - print ''; + print "".''; print ''; print ''; print ''; - print '".''; - print '
Nom
Nom'.$fuser->nom.'Prénom'.$fuser->prenom.'
'; + print "
'; print ''; $sql = "SELECT r.id, r.libelle, r.module FROM llx_rights_def as r ORDER BY r.id ASC"; @@ -246,7 +246,7 @@ else } print '
'; print '
ok
'; + print "
ok
'; } else { @@ -258,11 +258,11 @@ else print ''; - print ''; + print "".''; print ''; print ''; - print ''; + print "".''; print ''; print '
Nom
Nom'.$fuser->nom.'Droits
Prénom
Prénom'.$fuser->prenom.''; /* @@ -292,19 +292,19 @@ else print '
'; print '
Login
Login'.$fuser->login.'
Email
Email'.$fuser->email.'
Webcal Login
Webcal Login'.$fuser->webcal_login.' 
Administrateur
Administrateur'.$yn[$fuser->admin].'
Id Société
Id Société'.$fuser->societe_id.' 
'; + print "
'; if ($fuser->contact_id) { print 'Fiche contact'; @@ -316,16 +316,16 @@ else print ' 
Note
Note'.nl2br($fuser->note).' 
'; - print '
'; + print '
'.""; if ($user->admin) { - print ''; + print ''; } else { @@ -361,7 +361,7 @@ else print ''; } - print '
[Editer][Editer]-

'; + print '

'; /* ************************************************************************** */ /* */ @@ -376,32 +376,32 @@ else print ''; print ''; - print ''; + print "".''; print ''; - print ''; + print "".''; print ''; - print ''; + print "".''; print ''; - print ''; + print "".''; print ''; - print ''; + print "".''; print ''; - print ''; + print "".''; print ''; - print '".'"; - print ''; + print "".''; print ''; print '
Nom
Nom
Prénom
Prénom
Login
Login
Email
Email
Admin ?
Admin ?'; $form->selectyesnonum('admin',$fuser->admin); print '
Login Webcal
Login Webcal
Description'; + print "
Description'; print "
'; }