From 6c5d5b4d69d495629e390cce0191801c73a08514 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 12 Aug 2006 15:32:56 +0000 Subject: [PATCH] Look: Ajout picto "setup" sur toutes les pages de configuration Qual: Suppression de fichiers obsoletes Ajout d'une page introduction a la configuration Dolibarr. --- htdocs/about.php | 41 +++-- htdocs/admin/adherent.php | 2 +- htdocs/admin/avoir.php | 249 -------------------------- htdocs/admin/barcode.php | 2 +- htdocs/admin/boutique-special-all.php | 79 -------- 5 files changed, 24 insertions(+), 349 deletions(-) delete mode 100644 htdocs/admin/avoir.php delete mode 100644 htdocs/admin/boutique-special-all.php diff --git a/htdocs/about.php b/htdocs/about.php index 82101c18a3a..0f8037f5f34 100644 --- a/htdocs/about.php +++ b/htdocs/about.php @@ -1,7 +1,7 @@ * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2004-2005 Laurent Destailleur + * Copyright (C) 2004-2006 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 @@ -19,7 +19,6 @@ * * $Id$ * $Source$ - * */ /** @@ -34,11 +33,14 @@ require("./pre.inc.php"); llxHeader(); -print_titre("Dolibarr"); +print_fiche_titre("Dolibarr",'','setup'); print "
\n"; -print $langs->trans("DolibarrLicense").': GNU/GPL
'; +print $langs->trans("DolibarrLicense").':'; +print '
    '; +print '
  • GNU/GPL
    • '; +print '
'; print "
\n"; @@ -63,13 +65,14 @@ print $langs->trans("Informations").':'; print ''; diff --git a/htdocs/admin/adherent.php b/htdocs/admin/adherent.php index 67561d35948..d6bb7732ac9 100644 --- a/htdocs/admin/adherent.php +++ b/htdocs/admin/adherent.php @@ -107,7 +107,7 @@ llxHeader(); * Interface de configuration de certaines variables de la partie adherent */ -print_titre($langs->trans("MembersSetup")); +print_fiche_titre($langs->trans("MembersSetup"),'','setup'); print "
"; diff --git a/htdocs/admin/avoir.php b/htdocs/admin/avoir.php deleted file mode 100644 index 98dfe2e5898..00000000000 --- a/htdocs/admin/avoir.php +++ /dev/null @@ -1,249 +0,0 @@ - - * Copyright (C) 2004-2006 Laurent Destailleur - * Copyright (C) 2005-2006 Regis Houssin - * - * 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$ - */ - -/** - \file htdocs/admin/avoir.php - \ingroup avoir - \brief Page d'administration/configuration du module Avoir - \version $Revision$ -*/ - -require("./pre.inc.php"); - -$langs->load("admin"); -$langs->load("companies"); -$langs->load("bills"); -$langs->load("other"); - -if (!$user->admin) - accessforbidden(); - - -/* - * Actions - */ - -if ($_GET["action"] == 'set') -{ - $type='creditnote'; - $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom) VALUES ('".$_GET["value"]."','".$type."')"; - if ($db->query($sql)) - { - - } -} - -if ($_GET["action"] == 'del') -{ - $type='creditnote'; - $sql = "DELETE FROM ".MAIN_DB_PREFIX."document_model"; - $sql .= " WHERE nom = '".$_GET["value"]."' AND type = '".$type."'"; - if ($db->query($sql)) - { - - } -} - -if ($_GET["action"] == 'setdoc') -{ - $db->begin(); - - if (dolibarr_set_const($db, "AVOIR_ADDON_PDF",$_GET["value"])) - { - // La constante qui a été lue en avant du nouveau set - // on passe donc par une variable pour avoir un affichage cohérent - $conf->global->AVOIR_ADDON_PDF = $_GET["value"]; - } - - // On active le modele - $type='creditnote'; - $sql_del = "delete from ".MAIN_DB_PREFIX."document_model"; - $sql_del .= " WHERE nom = '".$_GET["value"]."' AND type = '".$type."'"; - $result1=$db->query($sql_del); - $sql = "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom,type) VALUES ('".$_GET["value"]."','".$type."')"; - $result2=$db->query($sql); - if ($result1 && $result2) - { - $db->commit(); - } - else - { - $db->rollback(); - } -} - - - -/* - * Affiche page - */ - -llxHeader("",""); - -$dir = DOL_DOCUMENT_ROOT .'/avoir/modules/'; -$html=new Form($db); - -$h = 0; - -$head[$h][0] = DOL_URL_ROOT."/admin/facture.php"; -$head[$h][1] = $langs->trans("Invoices"); -$h++; - -$head[$h][0] = DOL_URL_ROOT."/admin/avoir.php"; -$head[$h][1] = $langs->trans("CreditNotes"); -$hselected=$h; -$h++; - -dolibarr_fiche_head($head, $hselected, $langs->trans("ModuleSetup")); - - -/* - * Modeles de documents - */ - -print_titre($langs->trans("DiscountsPDFModules")); - -// Defini tableau def de modele invoice -$def = array(); -$sql = "SELECT nom"; -$sql.= " FROM ".MAIN_DB_PREFIX."document_model"; -$sql.= " WHERE type = 'creditnote'"; -$resql=$db->query($sql); -if ($resql) -{ - $i = 0; - $num_rows=$db->num_rows($resql); - while ($i < $num_rows) - { - $array = $db->fetch_array($resql); - array_push($def, $array[0]); - $i++; - } -} -else -{ - dolibarr_print_error($db); -} - -$dir = DOL_DOCUMENT_ROOT .'/avoir/modules/pdf/'; - -print "\n"; -print "\n"; -print " \n"; -print " \n"; -print '\n"; -print '\n"; -print ''; -print "\n"; - -clearstatcache(); - -$handle=opendir($dir); - -$var=true; -while (($file = readdir($handle))!==false) -{ - if (substr($file, strlen($file) -12) == '.modules.php' && substr($file,0,10) == 'pdf_avoir_') - { - $name = substr($file, 10, strlen($file) - 24); - $classname = substr($file, 0, strlen($file) -12); - - $var=!$var; - print "\n \n '; - - // Activé - if (in_array($name, $def)) - { - print ""; - } - else - { - print ""; - } - - // Defaut - print "'; - - // Info - $htmltooltip = ''.$langs->trans("Type").': '.($obj->type?$obj->type:$langs->trans("Unknown")); - $htmltooltip.='
'.$langs->trans("Width").': '.$obj->page_largeur; - $htmltooltip.='
'.$langs->trans("Height").': '.$obj->page_hauteur; - $htmltooltip.='
'.$langs->trans("FeaturesSupported").':'; - $htmltooltip.='
'.$langs->trans("Logo").': '.yn($obj->option_logo); - print ''; - - print ''; - } -} -closedir($handle); - -print '
".$langs->trans("Name")."".$langs->trans("Description")."'.$langs->trans("Activated")."'.$langs->trans("Default")."'.$langs->trans("Info").'
"; - print "$name"; - print "\n"; - require_once($dir.$file); - $obj = new $classname($db); - print $obj->description; - print '\n"; - if ($conf->global->FACTURE_AVOIR_ADDON_PDF != "$name") - { - print ''; - print img_tick($langs->trans("Disable")); - print ''; - } - else - { - print img_tick($langs->trans("Enabled")); - } - print "\n"; - print ''.$langs->trans("Activate").''; - print ""; - if ($conf->global->FACTURE_AVOIR_ADDON_PDF == "$name") - { - print img_tick($langs->trans("Default")); - } - else - { - print ''.$langs->trans("Default").''; - } - print 'tooltip_properties($htmltooltip).'>'.img_help(0).'
'; - -/* - * Repertoire - */ -print '
'; -print_titre($langs->trans("PathToDocuments")); - -print "\n"; -print "\n"; -print " \n"; -print " \n"; -print "\n"; -print "\n \n \n\n"; -print "
".$langs->trans("Name")."".$langs->trans("Value")."
".$langs->trans("PathDirectory")."".$conf->facture->dir_output."
\n"; - - -$db->close(); - - -llxFooter('$Date$ - $Revision$'); -?> diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index 3e452e63881..6939949fbc1 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -58,7 +58,7 @@ if ($_GET["action"] == 'settype' && $user->admin) llxHeader('',$langs->trans("BarcodeSetup"),'BarcodeConfiguration'); -print_titre($langs->trans("BarcodeSetup")); +print_fiche_titre($langs->trans("BarcodeSetup"),'','setup'); /* * CHOIX ENCODAGE diff --git a/htdocs/admin/boutique-special-all.php b/htdocs/admin/boutique-special-all.php deleted file mode 100644 index 32a3eaa9984..00000000000 --- a/htdocs/admin/boutique-special-all.php +++ /dev/null @@ -1,79 +0,0 @@ - - * - * 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$ - * - */ - -/*! \file htdocs/admin/boutique-special-all.php - \ingroup boutique - \brief Page d'administration/configuration du module Boutique - \version $Revision$ -*/ - -require("./pre.inc.php"); -require("../boutique/livre/livre.class.php"); -require("../boutique/editeur/editeur.class.php"); -require("../boutique/auteur/auteur.class.php"); -require("../product/promotion/promotion.class.php"); - -$langs->load("admin"); - -if (!$user->admin) - accessforbidden(); - - -llxHeader(); - - -print_barre_liste("Mise a jour de tous les livres", $page, "boutique-special-all.php"); - -$sql = "SELECT l.rowid FROM ".MAIN_DB_PREFIX."livre as l"; - -if ( $db->query($sql) ) -{ - $num = $db->num_rows(); - $i = 0; - - while ($i < $num) { - $objp = $db->fetch_object(); - - $livre = new Livre($db); - if ($livre->fetch($objp->rowid)) - { - - $prom = new Promotion($db); - $prom->create($user,$livre->oscid, 5); - - } - else - { - print "Error can't fetch"; - } - $i++; - } -} -else -{ - print $db->error(); -} - - - -llxFooter(); -?>