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] = '
';
+ $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] = '';
+ $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] = '';
+ $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] = '';
+ $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 5e761587198..00000000000
Binary files a/htdocs/theme/dev/img/bookmark.png and /dev/null differ
diff --git a/htdocs/theme/dolibarr/img/bookmark.png b/htdocs/theme/dolibarr/img/bookmark.png
deleted file mode 100644
index bb859eed384..00000000000
Binary files a/htdocs/theme/dolibarr/img/bookmark.png and /dev/null differ
diff --git a/htdocs/theme/eldy/img/bookmark.png b/htdocs/theme/eldy/img/bookmark.png
deleted file mode 100644
index bb859eed384..00000000000
Binary files a/htdocs/theme/eldy/img/bookmark.png and /dev/null differ
diff --git a/htdocs/theme/freelug/img/bookmark.png b/htdocs/theme/freelug/img/bookmark.png
deleted file mode 100755
index bb859eed384..00000000000
Binary files a/htdocs/theme/freelug/img/bookmark.png and /dev/null differ
diff --git a/htdocs/theme/yellow/img/bookmark.png b/htdocs/theme/yellow/img/bookmark.png
deleted file mode 100644
index bb859eed384..00000000000
Binary files a/htdocs/theme/yellow/img/bookmark.png and /dev/null differ