From 831f3b23c393b631a9804999350fd16934ad3bab Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 5 Sep 2005 19:03:02 +0000 Subject: [PATCH] Ajout picto bookmark --- htdocs/comm/fiche.php | 2 +- htdocs/comm/remise.php | 2 +- htdocs/comm/remx.php | 2 +- htdocs/compta/fiche.php | 2 +- htdocs/compta/recap-client.php | 2 +- htdocs/includes/modules/modBookmark.class.php | 21 +++++++++--------- htdocs/pre.inc.php | 6 +++-- htdocs/theme/dev/img/bookmark.png | Bin 690 -> 0 bytes htdocs/theme/dolibarr/img/bookmark.png | Bin 252 -> 0 bytes htdocs/theme/eldy/img/bookmark.png | Bin 252 -> 0 bytes htdocs/theme/freelug/img/bookmark.png | Bin 252 -> 0 bytes htdocs/theme/yellow/img/bookmark.png | Bin 252 -> 0 bytes 12 files changed, 19 insertions(+), 18 deletions(-) delete mode 100644 htdocs/theme/dev/img/bookmark.png delete mode 100644 htdocs/theme/dolibarr/img/bookmark.png delete mode 100644 htdocs/theme/eldy/img/bookmark.png delete mode 100755 htdocs/theme/freelug/img/bookmark.png delete mode 100644 htdocs/theme/yellow/img/bookmark.png diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index b15bbfdb2b1..60d706ed3e0 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -197,7 +197,7 @@ if ($_socid > 0) if ($user->societe_id == 0) { $head[$h][0] = DOL_URL_ROOT."/bookmarks/fiche.php?action=add&socid=".$objsoc->id."&urlsource=".$_SERVER["PHP_SELF"]."?socid=".$objsoc->id; - $head[$h][1] = img_picto($langs->trans("BookmarkThisPage"),'bookmark'); + $head[$h][1] = img_object($langs->trans("BookmarkThisPage"),'bookmark'); $head[$h][2] = 'image'; $h++; } diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index 0b1401ae652..e4c3f8930c8 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -136,7 +136,7 @@ if ($_socid > 0) if ($user->societe_id == 0) { $head[$h][0] = DOL_URL_ROOT."/comm/index.php?socidp=$objsoc->id&action=add_bookmark"; - $head[$h][1] = 'Bookmark'; + $head[$h][1] = img_object($langs->trans("BookmarkThisPage"),'bookmark'); $head[$h][2] = 'image'; } diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index 0f67977c7dd..8d35c6975dd 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -133,7 +133,7 @@ if ($_socid > 0) if ($user->societe_id == 0) { $head[$h][0] = DOL_URL_ROOT."/comm/index.php?socidp=$objsoc->id&action=add_bookmark"; - $head[$h][1] = 'Bookmark'; + $head[$h][1] = img_object($langs->trans("BookmarkThisPage"),'bookmark'); $head[$h][2] = 'image'; } diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php index 51e0c94e7eb..ec72004e5a6 100644 --- a/htdocs/compta/fiche.php +++ b/htdocs/compta/fiche.php @@ -187,7 +187,7 @@ if ($socid > 0) if ($user->societe_id == 0) { $head[$h][0] = DOL_URL_ROOT."/index.php?socidp=$societe->id&action=add_bookmark"; - $head[$h][1] = 'Bookmark'; + $head[$h][1] = img_object($langs->trans("BookmarkThisPage"),'bookmark'); $head[$h][2] = 'image'; } diff --git a/htdocs/compta/recap-client.php b/htdocs/compta/recap-client.php index 3cbb5d49bb7..e6e2e7c7a46 100644 --- a/htdocs/compta/recap-client.php +++ b/htdocs/compta/recap-client.php @@ -116,7 +116,7 @@ if ($socid > 0) if ($user->societe_id == 0) { $head[$h][0] = DOL_URL_ROOT."/index.php?socidp=$societe->id&action=add_bookmark"; - $head[$h][1] = 'Bookmark'; + $head[$h][1] = img_object($langs->trans("BookmarkThisPage"),'bookmark'); $head[$h][2] = 'image'; } diff --git a/htdocs/includes/modules/modBookmark.class.php b/htdocs/includes/modules/modBookmark.class.php index f68023ec58a..4721063e156 100644 --- a/htdocs/includes/modules/modBookmark.class.php +++ b/htdocs/includes/modules/modBookmark.class.php @@ -17,25 +17,24 @@ * * $Id$ * $Source$ - * */ /** - \defgroup bookmark4u Module Bookmark4u - \brief Module pour gérer l'addon Bookmark4u + \defgroup bookmark Module Bookmark + \brief Module pour gérer l'addon Bookmark */ /** - \file htdocs/includes/modules/modBookmark4u.class.php - \ingroup bookmark4u - \brief Fichier de description et activation du module Bookmark4u + \file htdocs/includes/modules/modBookmark.class.php + \ingroup bookmark + \brief Fichier de description et activation du module Bookmark */ include_once "DolibarrModules.class.php"; /** - \class modBookmark4u - \brief Classe de description et activation du module Bookmark4u + \class modBookmark + \brief Classe de description et activation du module Bookmark */ class modBookmark extends DolibarrModules @@ -52,14 +51,14 @@ class modBookmark extends DolibarrModules $this->family = "technic"; $this->name = "Bookmark"; - $this->description = "Gestion des Bookmark"; + $this->description = "Gestion des Bookmarks"; $this->revision = explode(" ","$Revision$"); $this->version = $this->revision[1]."(DEV)"; $this->const_name = "MAIN_MODULE_BOOKMARK"; $this->const_config = MAIN_MODULE_BOOKMARK; $this->special = 1; - //$this->picto=''; + $this->picto='bookmark'; // Dir $this->dirs = array(); @@ -69,7 +68,7 @@ class modBookmark extends DolibarrModules $this->requiredby = array(); // Config pages - //$this->config_page_url = "clicktodial.php"; + //$this->config_page_url = ""; // Constantes $this->const = array(); diff --git a/htdocs/pre.inc.php b/htdocs/pre.inc.php index a2451d490b9..32803e3bb6f 100644 --- a/htdocs/pre.inc.php +++ b/htdocs/pre.inc.php @@ -169,8 +169,10 @@ function llxHeader($head = "") { $menu->add(DOL_URL_ROOT."/postnuke/articles/index.php", "Editorial"); } - if (MAIN_MODULE_BOOKMARK == '1') - $menu->add(DOL_URL_ROOT."/bookmarks/liste.php", $langs->trans("Bookmarks")); + if ($conf->bookmark->enabled) + { + $menu->add(DOL_URL_ROOT."/bookmarks/liste.php", $langs->trans("Bookmarks")); + } if ($user->rights->user->user->lire || $user->admin) { diff --git a/htdocs/theme/dev/img/bookmark.png b/htdocs/theme/dev/img/bookmark.png deleted file mode 100644 index 5e761587198608815a4625f26923e4c2c59d5ed1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 690 zcmV;j0!{siP)5r00004XF*Lt006JZ zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!L`g(JRCwBA zV88=DRWZzeU(PTepBjJwV#Fo!p^`y>iJ$%c@81jzzux>*l$^-$0h>C20Aj*r!2kaY z1+2RA0&IF(0)PK76yQ<^5I{H$U|?g4XLHbF;Br!C_{Yi=k4qUq0AV%YZ5cxXv#PWL zBj;lVM()Q99O?=RPntv<{{7o6fUXuGfEfREG0gw_k3r!t(64_v*&P0H^D}_h+!2-x z%pxzrivGNmV|YH}0K?zE3=H32d}Lr?=lJmP{-+B-uRQ<=AjZF)4D*8l(j07*qoM6N<$f~cq`1poj5 diff --git a/htdocs/theme/dolibarr/img/bookmark.png b/htdocs/theme/dolibarr/img/bookmark.png deleted file mode 100644 index bb859eed38485d4f152da5ab3eb244259d5861ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^oIuRM0VEjsmUU$UDg6@Hh!W?b)Wnj^{5*w_%-mFl zoYFi!1tTMctkTRJAj81GNWsw3%FxWp#8g4sz|g>8^^5OHK&|X0p1!W^m)OMwtxc7u zDs}^fI14-?iy0V%N?0v(btiIVPik{pF~z5Kfu$)F{I*Fa*WDx1~&J| zA9hTddVy|nVxpPT{>Sf_`Oh}xk=TR8-^KIW``bGkA0E8?ef>EDgAE1-HT(a!zm=V_ pRI|o4c2;9!;a&yd6BGW2Gs?(_8Yu6&W(qW$!PC{xWt~$(696NCP1pbc diff --git a/htdocs/theme/eldy/img/bookmark.png b/htdocs/theme/eldy/img/bookmark.png deleted file mode 100644 index bb859eed38485d4f152da5ab3eb244259d5861ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^oIuRM0VEjsmUU$UDg6@Hh!W?b)Wnj^{5*w_%-mFl zoYFi!1tTMctkTRJAj81GNWsw3%FxWp#8g4sz|g>8^^5OHK&|X0p1!W^m)OMwtxc7u zDs}^fI14-?iy0V%N?0v(btiIVPik{pF~z5Kfu$)F{I*Fa*WDx1~&J| zA9hTddVy|nVxpPT{>Sf_`Oh}xk=TR8-^KIW``bGkA0E8?ef>EDgAE1-HT(a!zm=V_ pRI|o4c2;9!;a&yd6BGW2Gs?(_8Yu6&W(qW$!PC{xWt~$(696NCP1pbc diff --git a/htdocs/theme/freelug/img/bookmark.png b/htdocs/theme/freelug/img/bookmark.png deleted file mode 100755 index bb859eed38485d4f152da5ab3eb244259d5861ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^oIuRM0VEjsmUU$UDg6@Hh!W?b)Wnj^{5*w_%-mFl zoYFi!1tTMctkTRJAj81GNWsw3%FxWp#8g4sz|g>8^^5OHK&|X0p1!W^m)OMwtxc7u zDs}^fI14-?iy0V%N?0v(btiIVPik{pF~z5Kfu$)F{I*Fa*WDx1~&J| zA9hTddVy|nVxpPT{>Sf_`Oh}xk=TR8-^KIW``bGkA0E8?ef>EDgAE1-HT(a!zm=V_ pRI|o4c2;9!;a&yd6BGW2Gs?(_8Yu6&W(qW$!PC{xWt~$(696NCP1pbc diff --git a/htdocs/theme/yellow/img/bookmark.png b/htdocs/theme/yellow/img/bookmark.png deleted file mode 100644 index bb859eed38485d4f152da5ab3eb244259d5861ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^oIuRM0VEjsmUU$UDg6@Hh!W?b)Wnj^{5*w_%-mFl zoYFi!1tTMctkTRJAj81GNWsw3%FxWp#8g4sz|g>8^^5OHK&|X0p1!W^m)OMwtxc7u zDs}^fI14-?iy0V%N?0v(btiIVPik{pF~z5Kfu$)F{I*Fa*WDx1~&J| zA9hTddVy|nVxpPT{>Sf_`Oh}xk=TR8-^KIW``bGkA0E8?ef>EDgAE1-HT(a!zm=V_ pRI|o4c2;9!;a&yd6BGW2Gs?(_8Yu6&W(qW$!PC{xWt~$(696NCP1pbc