From dbad0fbdaa5855cea4dee20fcda6eac8a06877a8 Mon Sep 17 00:00:00 2001
From: Philippe Grand <philippe.grand@atoo-net.com>
Date: Sat, 1 May 2010 10:52:47 +0000
Subject: [PATCH] according to new tree directory

---
 htdocs/{ => bookmarks}/admin/bookmark.php     |  2 +-
 htdocs/includes/modules/modBookmark.class.php | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename htdocs/{ => bookmarks}/admin/bookmark.php (98%)

diff --git a/htdocs/admin/bookmark.php b/htdocs/bookmarks/admin/bookmark.php
similarity index 98%
rename from htdocs/admin/bookmark.php
rename to htdocs/bookmarks/admin/bookmark.php
index 84ee0e67bd7..70e653b4860 100644
--- a/htdocs/admin/bookmark.php
+++ b/htdocs/bookmarks/admin/bookmark.php
@@ -23,7 +23,7 @@
  *		\version    $Id$
  */
 
-require("../main.inc.php");
+require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php");
 
 $langs->load("admin");
diff --git a/htdocs/includes/modules/modBookmark.class.php b/htdocs/includes/modules/modBookmark.class.php
index 29db2387c69..2e2d635f193 100644
--- a/htdocs/includes/modules/modBookmark.class.php
+++ b/htdocs/includes/modules/modBookmark.class.php
@@ -69,7 +69,7 @@ class modBookmark extends DolibarrModules
 		$this->requiredby = array();
 
 		// Config pages
-		$this->config_page_url = array('bookmark.php');
+		$this->config_page_url = array('bookmark.php@bookmarks');
 
 		// Constantes
 		$this->const = array();
@@ -86,15 +86,15 @@ class modBookmark extends DolibarrModules
 		$r++;
 		$this->rights[$r][0] = 331; // id de la permission
 		$this->rights[$r][1] = 'Lire les bookmarks'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (d�pr�ci� � ce jour)
-		$this->rights[$r][3] = 1; // La permission est-elle une permission par d�faut
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
+		$this->rights[$r][3] = 1; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'lire';
 
 		$r++;
 		$this->rights[$r][0] = 332; // id de la permission
 		$this->rights[$r][1] = 'Creer/modifier les bookmarks'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (d�pr�ci� � ce jour)
-		$this->rights[$r][3] = 1; // La permission est-elle une permission par d�faut
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
+		$this->rights[$r][3] = 1; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'creer';
 
 		$r++;