From b3be675e36384b901b1cc689fc2a22498fcc3cc9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 6 Mar 2005 00:15:34 +0000 Subject: [PATCH] Look: Ajout des pictos sur les modules --- htdocs/admin/modules.php | 11 ++++++----- .../includes/modules/mailings/cerise.modules.php | 4 +++- htdocs/includes/modules/mailings/poire.modules.php | 5 ++++- htdocs/includes/modules/mailings/pomme.modules.php | 2 ++ htdocs/includes/modules/modAdherent.class.php | 14 ++++++++------ htdocs/includes/modules/modCommande.class.php | 1 + htdocs/includes/modules/modCommercial.class.php | 1 + htdocs/includes/modules/modContrat.class.php | 1 + htdocs/includes/modules/modExternalRss.class.php | 1 + htdocs/includes/modules/modFacture.class.php | 1 + htdocs/includes/modules/modFournisseur.class.php | 1 + htdocs/includes/modules/modProduit.class.php | 1 + htdocs/includes/modules/modPropale.class.php | 1 + htdocs/includes/modules/modService.class.php | 1 + htdocs/includes/modules/modSociete.class.php | 3 ++- htdocs/includes/modules/modStock.class.php | 1 + 16 files changed, 35 insertions(+), 14 deletions(-) diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index fa6b4c7c841..56380b96fb3 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -144,7 +144,7 @@ print "
\n"; print "\n"; print "\n"; print " \n"; -print " \n"; +print " \n"; print " \n"; print " \n"; print " \n"; @@ -215,7 +215,7 @@ foreach ($orders as $key => $value) $const_value = $objMod->const_config; if ($oldfamily && $family!=$oldfamily && $atleastoneforfamily) { - print "\n \n\n"; + print "\n \n\n"; $atleastoneforfamily=0; } @@ -237,9 +237,10 @@ foreach ($orders as $key => $value) print ' '; } print "\n"; - print " \n \n \n
".$langs->trans("Family")."".$langs->trans("Module")."".$langs->trans("Module")."".$langs->trans("Description")."".$langs->trans("Version")."".$langs->trans("Activated")."
"; - print $objMod->getName(); - print ""; + print ' '; + print $objMod->picto?img_object('',$objMod->picto):img_object('','generic'); + print ''.$objMod->getName(); + print ""; print $objMod->getDesc(); print ""; print $objMod->getVersion(); diff --git a/htdocs/includes/modules/mailings/cerise.modules.php b/htdocs/includes/modules/mailings/cerise.modules.php index 5b636ca6b55..294a7b330fa 100644 --- a/htdocs/includes/modules/mailings/cerise.modules.php +++ b/htdocs/includes/modules/mailings/cerise.modules.php @@ -52,8 +52,10 @@ include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php' class mailing_cerise extends MailingTargets { var $name="ContactProspects"; // Identifiant du module mailing - var $desc='Tous les contacts associés aux prospects'; // Libellé utilisé si aucune traduction pour MailingModuleDescXXX ou XXX=name trouvée + var $desc='Tous les contacts de toutes les sociétés prospects'; // Libellé utilisé si aucune traduction pour MailingModuleDescXXX ou XXX=name trouvée var $require_module=array("commercial"); // Module mailing actif si modules require_module actifs + var $require_admin=0; // Module mailing actif pour user admin ou non + var $picto='contact'; var $db; var $statssql=array(); diff --git a/htdocs/includes/modules/mailings/poire.modules.php b/htdocs/includes/modules/mailings/poire.modules.php index 97dfa4ce1ec..9449d99c984 100644 --- a/htdocs/includes/modules/mailings/poire.modules.php +++ b/htdocs/includes/modules/mailings/poire.modules.php @@ -1,5 +1,6 @@ + * Copyright (C) 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 @@ -51,8 +52,10 @@ include_once DOL_DOCUMENT_ROOT.'/includes/modules/mailings/modules_mailings.php' class mailing_poire extends MailingTargets { var $name='ContactCustomers'; // Identifiant du module mailing - var $desc='Tous les contacts associés aux clients'; // Libellé utilisé si aucune traduction pour MailingModuleDescXXX ou XXX=name trouvée + var $desc='Tous les contacts de toutes les sociétés clientes'; // Libellé utilisé si aucune traduction pour MailingModuleDescXXX ou XXX=name trouvée var $require_module=array("commercial"); // Module mailing actif si modules require_module actifs + var $require_admin=0; // Module mailing actif pour user admin ou non + var $picto='contact'; var $db; var $statssql=array(); diff --git a/htdocs/includes/modules/mailings/pomme.modules.php b/htdocs/includes/modules/mailings/pomme.modules.php index 0e06946d869..30e248ee673 100644 --- a/htdocs/includes/modules/mailings/pomme.modules.php +++ b/htdocs/includes/modules/mailings/pomme.modules.php @@ -53,6 +53,8 @@ class mailing_pomme extends MailingTargets var $name='DolibarrUsers'; // Identifiant du module mailing var $desc='Tous les utilisateurs de Dolibarr'; // Libellé utilisé si aucune traduction pour MailingModuleDescXXX ou XXX=name trouvée var $require_module=array(); // Module mailing actif si modules require_module actifs + var $require_admin=1; // Module mailing actif pour user admin ou non + var $picto='user'; var $db; var $statssql=array(); diff --git a/htdocs/includes/modules/modAdherent.class.php b/htdocs/includes/modules/modAdherent.class.php index c207f4c125e..94c45475b84 100644 --- a/htdocs/includes/modules/modAdherent.class.php +++ b/htdocs/includes/modules/modAdherent.class.php @@ -1,9 +1,9 @@ - * Copyright (C) 2003 Jean-Louis Bergamo - * Copyright (C) 2004 Laurent Destailleur - * Copyright (C) 2004 Sebastien Di Cintio - * Copyright (C) 2004 Benoit Mortier + * Copyright (C) 2003 Jean-Louis Bergamo + * Copyright (C) 2004-2005 Laurent Destailleur + * Copyright (C) 2004 Sebastien Di Cintio + * Copyright (C) 2004 Benoit Mortier * * 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 @@ -24,7 +24,8 @@ * */ -/** \defgroup adherent Module adherents +/** + \defgroup adherent Module adherents \brief Module pour gérer les adhérents d'une association */ @@ -59,7 +60,8 @@ class modAdherent extends DolibarrModules $this->const_name = "MAIN_MODULE_ADHERENT"; $this->const_config = MAIN_MODULE_ADHERENT; $this->special = 1; - + $this->picto='user'; + // Dir $this->dirs = array(); diff --git a/htdocs/includes/modules/modCommande.class.php b/htdocs/includes/modules/modCommande.class.php index cae7f0b9ca4..ea0113f5286 100644 --- a/htdocs/includes/modules/modCommande.class.php +++ b/htdocs/includes/modules/modCommande.class.php @@ -59,6 +59,7 @@ class modCommande extends DolibarrModules $this->const_name = "MAIN_MODULE_COMMANDE"; $this->const_config = MAIN_MODULE_COMMANDE; $this->special = 0; + $this->picto='order'; // Dir $this->dirs = array(); diff --git a/htdocs/includes/modules/modCommercial.class.php b/htdocs/includes/modules/modCommercial.class.php index 02d40015e2c..9202222b2af 100644 --- a/htdocs/includes/modules/modCommercial.class.php +++ b/htdocs/includes/modules/modCommercial.class.php @@ -58,6 +58,7 @@ class modCommercial extends DolibarrModules $this->const_name = "MAIN_MODULE_COMMERCIAL"; $this->const_config = MAIN_MODULE_COMMERCIAL; $this->special = 0; + $this->picto='commercial'; // Dir $this->dirs = array(); diff --git a/htdocs/includes/modules/modContrat.class.php b/htdocs/includes/modules/modContrat.class.php index 08387ff580f..9c2b4a233ff 100644 --- a/htdocs/includes/modules/modContrat.class.php +++ b/htdocs/includes/modules/modContrat.class.php @@ -55,6 +55,7 @@ class modContrat extends DolibarrModules $this->const_name = "MAIN_MODULE_CONTRAT"; $this->const_config = MAIN_MODULE_CONTRAT; $this->special = 0; + $this->picto='contract'; // Dir $this->dirs = array(); diff --git a/htdocs/includes/modules/modExternalRss.class.php b/htdocs/includes/modules/modExternalRss.class.php index 80315a83c98..51b9a9f13a1 100644 --- a/htdocs/includes/modules/modExternalRss.class.php +++ b/htdocs/includes/modules/modExternalRss.class.php @@ -56,6 +56,7 @@ class modExternalRss extends DolibarrModules $this->const_name = "MAIN_MODULE_EXTERNALRSS"; $this->const_config = MAIN_MODULE_EXTERNALRSS; $this->special = 0; + $this->picto='rss'; // Dir $this->dirs = array(); diff --git a/htdocs/includes/modules/modFacture.class.php b/htdocs/includes/modules/modFacture.class.php index 3af4777b136..287c0abf57c 100644 --- a/htdocs/includes/modules/modFacture.class.php +++ b/htdocs/includes/modules/modFacture.class.php @@ -59,6 +59,7 @@ class modFacture extends DolibarrModules $this->const_name = "MAIN_MODULE_FACTURE"; $this->const_config = MAIN_MODULE_FACTURE; $this->special = 0; + $this->picto='bill'; // Dir $this->dirs = array(); diff --git a/htdocs/includes/modules/modFournisseur.class.php b/htdocs/includes/modules/modFournisseur.class.php index 40b20abb998..3c266b1079d 100644 --- a/htdocs/includes/modules/modFournisseur.class.php +++ b/htdocs/includes/modules/modFournisseur.class.php @@ -57,6 +57,7 @@ class modFournisseur extends DolibarrModules $this->const_name = "MAIN_MODULE_FOURNISSEUR"; $this->const_config = MAIN_MODULE_FOURNISSEUR; $this->special = 0; + $this->picto='company'; // Dir $this->dirs = array(); diff --git a/htdocs/includes/modules/modProduit.class.php b/htdocs/includes/modules/modProduit.class.php index f7904624595..8083b7c49d1 100644 --- a/htdocs/includes/modules/modProduit.class.php +++ b/htdocs/includes/modules/modProduit.class.php @@ -58,6 +58,7 @@ class modProduit extends DolibarrModules $this->const_name = "MAIN_MODULE_PRODUIT"; $this->const_config = MAIN_MODULE_PRODUIT; $this->special = 0; + $this->picto='product'; // Dir $this->dirs = array(); diff --git a/htdocs/includes/modules/modPropale.class.php b/htdocs/includes/modules/modPropale.class.php index 9f0c820a844..fea1a26b5dc 100644 --- a/htdocs/includes/modules/modPropale.class.php +++ b/htdocs/includes/modules/modPropale.class.php @@ -58,6 +58,7 @@ class modPropale extends DolibarrModules $this->const_name = "MAIN_MODULE_PROPALE"; $this->const_config = MAIN_MODULE_PROPALE; $this->special = 0; + $this->picto='propal'; // Dir $this->dirs = array(); diff --git a/htdocs/includes/modules/modService.class.php b/htdocs/includes/modules/modService.class.php index 7f88c75d272..808bc9d2db5 100644 --- a/htdocs/includes/modules/modService.class.php +++ b/htdocs/includes/modules/modService.class.php @@ -57,6 +57,7 @@ class modService extends DolibarrModules $this->version = 'dolibarr'; // 'experimental' or 'dolibarr' or version $this->const_name = "MAIN_MODULE_SERVICE"; $this->const_config = MAIN_MODULE_SERVICE; + $this->picto='service'; // Dépendances $this->depends = array("modProduit"); diff --git a/htdocs/includes/modules/modSociete.class.php b/htdocs/includes/modules/modSociete.class.php index 7fe422a58f4..64d4dfb3e63 100644 --- a/htdocs/includes/modules/modSociete.class.php +++ b/htdocs/includes/modules/modSociete.class.php @@ -59,7 +59,8 @@ class modSociete extends DolibarrModules $this->const_config = MAIN_MODULE_SOCIETE; $this->special = 0; $this->config_page_url = "societe.php"; - + $this->picto='company'; + // Dir $this->dirs = array(); diff --git a/htdocs/includes/modules/modStock.class.php b/htdocs/includes/modules/modStock.class.php index 33a5081d835..a48386fc7d3 100644 --- a/htdocs/includes/modules/modStock.class.php +++ b/htdocs/includes/modules/modStock.class.php @@ -56,6 +56,7 @@ class modStock extends DolibarrModules $this->const_name = "MAIN_MODULE_STOCK"; $this->const_config = MAIN_MODULE_STOCK; $this->special = 0; + $this->picto='stock'; // Dir $this->dirs = array();