(no commit message)

diff --git a/css/admin.css b/css/admin.css
index cd3fb4531788f8059e7f916dea1eded966467535..5c286de8bfac280548772bd788d9cc605a1512c7 100644 (file)
--- a/css/admin.css
+++ b/css/admin.css
@@ -8,7 +8,11 @@
        font-size:10px;\r
 }\r
 \r
-#adminBar .content{\r
+#adminBar .content,.cubeit-content{\r
        width:982px;\r
        margin:0 auto;\r
+}\r
+\r
+.cubeit-content{\r
+       margin: 0 auto 20px;\r
 }
\ No newline at end of file

diff --git a/framework/application/configs/settings.ini b/framework/application/configs/settings.ini
index bf3746ac2e1fc27f5114ce568d3ca0c7ad047847..0abaaedcd0abed0131a44118efb683083d5471bf 100644 (file)
--- 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 e31fd5a087b4a695a6693b623e329dc1fa65df71..50be9b81f462613327243738cff1935bf1b83fc4 100644 (file)
--- 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">\r
                                <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>\r
                                <ul class="clients">\r
-                                       <li><a href="#"><img src="images/client1.png" width="135" height="29" alt="Montpellier"></a></li>\r
-                                       <li><a href="#"><img src="images/client2.png" width="89" height="97" alt="3C"></a></li>\r
-                                       <li><a href="#"><img src="images/client3.png" width="58" height="55" alt="onco"></a></li>\r
+                                       <li><a href="#"><img src="/images/client1.png" width="135" height="29" alt="Montpellier"></a></li>\r
+                                       <li><a href="#"><img src="/images/client2.png" width="89" height="97" alt="3C"></a></li>\r
+                                       <li><a href="#"><img src="/images/client3.png" width="58" height="55" alt="onco"></a></li>\r
                                </ul>\r
                        </div>\r
                </div>\r

diff --git a/framework/application/views/scripts/common/header.phtml b/framework/application/views/scripts/common/header.phtml
index 2ed39f6c8c11303f9acec4eccb604b7ead358518..3f64567800c19150a158d341d2bed4464517e32d 100644 (file)
--- a/framework/application/views/scripts/common/header.phtml
+++ b/framework/application/views/scripts/common/header.phtml
@@ -1,15 +1,12 @@
 <header id="header">\r
        <div class="holder">\r
-               <strong class="logo"><a href="#">Centre de Cancérologie du Grand Montpellier</a></strong>\r
+               <strong class="logo"><a href="/">Centre de Cancérologie du Grand Montpellier</a></strong>\r
                <div class="panel">\r
                        <nav class="add-nav">\r
-                               <ul>\r
-                                       <li><a href="#">Témoignages</a></li>\r
-                                       <li><a href="#">Questions fréquentes</a></li>\r
-                                       <li><a href="#">Liens utiles</a></li>\r
-                                       <li><a href="#">Intranet</a></li>\r
-                                       <li class="add"><a href="#">Accès médecin externe</a></li>\r
-                               </ul>\r
+                               <?php\r
+                               $header = $this->navigation()->getContainer()->findOneById(CubeIT_Navigation::HEADER);\r
+                               echo $this->navigation()->menu($header, array('maxDepth' => 1));\r
+                               ?>\r
                        </nav>\r
                        <nav id="nav">\r
                                <ul>\r