From d4ab29b71fa02bac6e31de6ab7e6ffd50ce89dd5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 14 Jul 2010 10:39:22 +0000
Subject: [PATCH] Fix: Use new tree

---
 htdocs/cashdesk/affIndex.php        |  2 +-
 htdocs/cashdesk/{ => css}/style.css | 29 +++++++++++++++--------------
 htdocs/cashdesk/index.php           |  2 +-
 3 files changed, 17 insertions(+), 16 deletions(-)
 rename htdocs/cashdesk/{ => css}/style.css (90%)

diff --git a/htdocs/cashdesk/affIndex.php b/htdocs/cashdesk/affIndex.php
index 77e20b63fb3..9d20fb8ecb3 100644
--- a/htdocs/cashdesk/affIndex.php
+++ b/htdocs/cashdesk/affIndex.php
@@ -46,7 +46,7 @@ print '<meta name="Generator" content="Kwrite, Gimp, Inkscape" />'."\n";
 print '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />'."\n";
 
 print '<meta http-equiv="Content-Style-Type" content="text/css" />'."\n";
-print '<link href="style.css" rel="stylesheet" type="text/css" media="screen" />'."\n";
+print '<link href="'.DOL_URL_ROOT.'/cashdesk/css/style.css" rel="stylesheet" type="text/css" media="screen" />'."\n";
 
 print '<!-- Import des fichiers necessaires a JsCalendar -->'."\n";
 print '<style type="text/css">'."\n";
diff --git a/htdocs/cashdesk/style.css b/htdocs/cashdesk/css/style.css
similarity index 90%
rename from htdocs/cashdesk/style.css
rename to htdocs/cashdesk/css/style.css
index c92937713f0..821e6caa9fa 100644
--- a/htdocs/cashdesk/style.css
+++ b/htdocs/cashdesk/css/style.css
@@ -38,18 +38,18 @@ p {
 }
 
 .conteneur_img_gauche {
-	background: url("img/bg_conteneur_gauche.png") top left repeat-y;
+	background: url("../img/bg_conteneur_gauche.png") top left repeat-y;
 }
 
 .conteneur_img_droite {
-	background: url("img/bg_conteneur_droite.png") top right repeat-y;
+	background: url("../img/bg_conteneur_droite.png") top right repeat-y;
 }
 
-/* ------------------- En-t�te ------------------- */
+/* ------------------- Header ------------------- */
 .entete {
 	height: 15px;
 	margin: 0;
-	background: url('img/bg_entete.png') no-repeat left top;
+	background: url('../img/bg_entete.png') no-repeat left top;
 }
 
 .entete span {
@@ -65,7 +65,7 @@ p {
 	font-size: 14px;
 	width: 735px;
 	height: 84px;
-	background: url('img/bg_menu.png') no-repeat left top;
+	background: url('../img/bg_menu.png') no-repeat left top;
 }
 
 .menu_bloc {
@@ -81,7 +81,6 @@ p {
 
 .menu li {
 	float: left;
-	font-weight: bold;
 }
 
 .menu_choix1,.menu_choix2 {
@@ -97,15 +96,15 @@ p {
 	width: 100px;
 	padding-left: 54px;
 	height: 48px;
-	background: url('img/new.png') top left no-repeat;
+	background: url('../img/new.png') top left no-repeat;
 }
 
 .menu_choix1 a {
-	background: url('img/new.png') top left no-repeat;
+	background: url('../img/new.png') top left no-repeat;
 }
 
 .menu_choix2 a {
-	background: url('img/gescom.png') top left no-repeat;
+	background: url('../img/gescom.png') top left no-repeat;
 }
 
 .menu_choix1 a:hover,.menu_choix2 a:hover {
@@ -113,9 +112,10 @@ p {
 }
 
 .menu_choix0 {
-	font-size: 0.9em;
+	font-size: 10px;
 	text-align: right;
 	font-style: italic;
+	font-weight: normal;
 	width: 340px;
 	display: block;
 	color: #333;
@@ -124,6 +124,7 @@ p {
 }
 
 .menu_choix0 a {
+	font-weight: normal;
 	text-decoration: none;
 }
 
@@ -166,7 +167,7 @@ p.titre {
 	font-size: 1.1em;
 	text-decoration: none;
 	padding-right: 25px;
-	background: url('img/basket_delete.png') top right no-repeat;
+	background: url('../img/basket_delete.png') top right no-repeat;
 }
 
 .cadre_article p a:hover {
@@ -204,7 +205,7 @@ p.titre {
 	margin: 0 auto;
 	padding-left: 60px;
 	margin-bottom: 20px;
-	background: url('img/login.png') bottom left no-repeat;
+	background: url('../img/login.png') bottom left no-repeat;
 }
 
 .formulaire_login table tr {
@@ -391,7 +392,7 @@ p.titre {
 .pied {
 	clear: both;
 	height: 15px;
-	background: url('img/bg_pied.png') no-repeat bottom left;
+	background: url('../img/bg_pied.png') no-repeat bottom left;
 }
 
 /* ------------------- Param�tres communs (messages d'erreur, informations, etc...) ------------------- */
@@ -447,7 +448,7 @@ p.titre {
 	padding: 0;
 }
 
-/* Affichage de la liste des r�sultats */
+/* Affichage de la liste des resultats */
 .dhtml_bloc {
 	margin: 0;
 	padding: 3px;
diff --git a/htdocs/cashdesk/index.php b/htdocs/cashdesk/index.php
index 440823566f1..67f0bf8485c 100644
--- a/htdocs/cashdesk/index.php
+++ b/htdocs/cashdesk/index.php
@@ -70,7 +70,7 @@ $formproduct=new FormProduct($db);
 <meta http-equiv="Content-Language" content="fr" />
 
 <meta http-equiv="Content-Style-Type" content="text/css" />
-<link href="style.css" rel="stylesheet" type="text/css" media="screen" />
+<link href="<?php echo DOL_URL_ROOT.'/cashdesk/css/style.css'; ?>" rel="stylesheet" type="text/css" media="screen" />
 </head>
 
 <body>