From 72d90ed91e82db902464f2d26c58ef08dca935b0 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 12 Aug 2013 12:20:24 +0000
Subject: [PATCH]

---
 css/admin.css                                       |  6 +++++-
 framework/application/configs/settings.ini          |  3 +++
 .../application/views/scripts/common/footer.phtml   |  6 +++---
 .../application/views/scripts/common/header.phtml   | 13 +++++--------
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/css/admin.css b/css/admin.css
index cd3fb45..5c286de 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -8,7 +8,11 @@
 	font-size:10px;
 }
 
-#adminBar .content{
+#adminBar .content,.cubeit-content{
 	width:982px;
 	margin:0 auto;
+}
+
+.cubeit-content{
+	margin: 0 auto 20px;
 }
\ No newline at end of file
diff --git a/framework/application/configs/settings.ini b/framework/application/configs/settings.ini
index bf3746a..0abaaed 100644
--- a/framework/application/configs/settings.ini
+++ b/framework/application/configs/settings.ini
@@ -1 +1,4 @@
 [production]
+longTitle.fr = "Centre de Cancérologie du Grand Montpellier"
+description.fr = "Centre de Cancérologie du Grand Montpellier"
+
diff --git a/framework/application/views/scripts/common/footer.phtml b/framework/application/views/scripts/common/footer.phtml
index e31fd5a..50be9b8 100644
--- a/framework/application/views/scripts/common/footer.phtml
+++ b/framework/application/views/scripts/common/footer.phtml
@@ -30,9 +30,9 @@
 			<div class="info-area timing">
 				<div class="note"><p>Le centre vous accueille du lundi au <br> vendredi, de 8h à 19h.<br> Permanence téléphonique le samedi,<br> de 9h à 12h.</p></div>
 				<ul class="clients">
-					<li><a href="#"><img src="images/client1.png" width="135" height="29" alt="Montpellier"></a></li>
-					<li><a href="#"><img src="images/client2.png" width="89" height="97" alt="3C"></a></li>
-					<li><a href="#"><img src="images/client3.png" width="58" height="55" alt="onco"></a></li>
+					<li><a href="#"><img src="/images/client1.png" width="135" height="29" alt="Montpellier"></a></li>
+					<li><a href="#"><img src="/images/client2.png" width="89" height="97" alt="3C"></a></li>
+					<li><a href="#"><img src="/images/client3.png" width="58" height="55" alt="onco"></a></li>
 				</ul>
 			</div>
 		</div>
diff --git a/framework/application/views/scripts/common/header.phtml b/framework/application/views/scripts/common/header.phtml
index 2ed39f6..3f64567 100644
--- a/framework/application/views/scripts/common/header.phtml
+++ b/framework/application/views/scripts/common/header.phtml
@@ -1,15 +1,12 @@
 <header id="header">
 	<div class="holder">
-		<strong class="logo"><a href="#">Centre de Cancérologie du Grand Montpellier</a></strong>
+		<strong class="logo"><a href="/">Centre de Cancérologie du Grand Montpellier</a></strong>
 		<div class="panel">
 			<nav class="add-nav">
-				<ul>
-					<li><a href="#">Témoignages</a></li>
-					<li><a href="#">Questions fréquentes</a></li>
-					<li><a href="#">Liens utiles</a></li>
-					<li><a href="#">Intranet</a></li>
-					<li class="add"><a href="#">Accès médecin externe</a></li>
-				</ul>
+				<?php
+				$header = $this->navigation()->getContainer()->findOneById(CubeIT_Navigation::HEADER);
+				echo $this->navigation()->menu($header, array('maxDepth' => 1));
+				?>
 			</nav>
 			<nav id="nav">
 				<ul>
-- 
2.39.5