From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 1 Oct 2013 15:27:46 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=b0ecfa914965a39c707a59045fa9417164a4fece;p=ccgm.git

---

diff --git a/.ovhconfig b/.ovhconfig
index e976c42..77f6bef 100644
--- a/.ovhconfig
+++ b/.ovhconfig
@@ -1,4 +1,2 @@
-app.engine=php
-app.engine.version=5.5
-http.firewall=none
-environment=development
\ No newline at end of file
+app.engine=phpcgi
+app.engine.version=AUTO
\ No newline at end of file
diff --git a/framework/application/views/scripts/common/content.phtml b/framework/application/views/scripts/common/content.phtml
index 0b653ae..5175c87 100644
--- a/framework/application/views/scripts/common/content.phtml
+++ b/framework/application/views/scripts/common/content.phtml
@@ -6,9 +6,18 @@ $content = $this->layout()->content . "\n";
 if (isset($this->currentPage) && $this->currentPage->getTemplate() == 'home') {
 	$c = $content;
 } else {
+	$classmain = '';
+
 	$leftbar = $this->leftbar();
+
+	if (!$this->showsidebar || !$leftbar) {
+		$classmain = ' class="noleftbar"';
+	}
+
+
+
 	$c = $this->topimage();
-	$c.='<div id="main">';
+	$c.='<div id="main"' . $classmain . '>';
 	$c.=$this->bcrumbs();
 	if ($this->showsidebar) {
 		$c.='<div class="twocolumns">';
diff --git a/framework/application/views/scripts/templates/equipe.phtml b/framework/application/views/scripts/templates/equipe.phtml
new file mode 100644
index 0000000..a4abe2d
--- /dev/null
+++ b/framework/application/views/scripts/templates/equipe.phtml
@@ -0,0 +1,2 @@
+<?php
+
diff --git a/images/arrow-accordion-top.svg b/images/arrow-accordion-top.svg
index 3a951e7..01f9e8d 100644
--- a/images/arrow-accordion-top.svg
+++ b/images/arrow-accordion-top.svg
@@ -2,7 +2,7 @@
 <!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
 <svg version="1.0" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="17px" height="21px" viewBox="0 0 17 21" enable-background="new 0 0 17 21" xml:space="preserve">
+	 width="32px" height="21px" viewBox="0 0 32 21" enable-background="new 0 0 32 21" xml:space="preserve">
 <g>
 	<ellipse fill="#696969" cx="8.5" cy="1.105" rx="1.09" ry="1.105"/>
 	<ellipse fill="#696969" cx="6.03" cy="3.609" rx="1.09" ry="1.105"/>
diff --git a/images/ocsante.png b/images/ocsante.png
new file mode 100644
index 0000000..b19bf41
Binary files /dev/null and b/images/ocsante.png differ
diff --git a/less/common.less b/less/common.less
index 2dbe7b6..a5078ce 100644
--- a/less/common.less
+++ b/less/common.less
@@ -83,11 +83,11 @@ q:after{content:"";}
 	font-size:14px;
 	line-height:14px;
 	text-align:center;
-	width:98px;
+	width:104px;
 	padding:54px 0 0;
 	background-size: 50px 50px;
 	background-position: 50% 0;
-	margin:0 0 0 11px;
+	margin:0 0 0 5px;
 	text-decoration: none;
 }
 #nav li a[data-name="centre"]{
@@ -313,12 +313,22 @@ q:after{content:"";}
 	padding: 0 0 0 37px;
 	line-height:26px;
 	width: 228px;
+	
+}
+
+#footer .timing{
+	position:relative;
+	padding: 0 0 96px 0;
 }
 #footer .timing .note p{margin:0;}
 #footer .timing .logos{
 	margin:0;
 	padding:0;
 	list-style:none;
+	white-space:nowrap;
+	position:absolute;
+	right:0px;
+	bottom:0px;
 }
 #footer .timing .logos li:first-child{margin:22px 0 0;}
 #footer .timing .logos li{
@@ -363,4 +373,5 @@ q:after{content:"";}
 			background-image: url("../images/arrow-accordion-top.svg");
 		}
 	}
-}
\ No newline at end of file
+}
+
diff --git a/less/rightbar.less b/less/rightbar.less
index 085ba7f..3b5d21c 100644
--- a/less/rightbar.less
+++ b/less/rightbar.less
@@ -31,4 +31,10 @@
 	width:443px;
 	display: inline-block;
 	margin:0 51px 0 0;
+}
+
+.noleftbar #content>div#c{
+	width:662px;
+	display: inline-block;
+	margin:0 51px 0 0;
 }
\ No newline at end of file