From 0e46ef8b7c3a2277aff5709bde0a91f8a2c4a580 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 14 Oct 2013 13:13:46 +0000
Subject: [PATCH]

---
 framework/application/Bootstrap.php           |  3 +-
 .../application/forms/CMS/Sub/Sidebar.php     |  5 +++
 .../application/views/helpers/Rightbar.php    |  9 ++--
 images/centre.svg                             | 22 +++++-----
 images/parcours.svg                           |  8 ++--
 images/pathologies.svg                        | 18 ++++----
 less/common.less                              | 23 ++++++++--
 less/rightbar.less                            | 44 +++++++++++--------
 less/sidebar.less                             |  1 +
 9 files changed, 82 insertions(+), 51 deletions(-)

diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php
index 4c8923f..bd0c4af 100644
--- a/framework/application/Bootstrap.php
+++ b/framework/application/Bootstrap.php
@@ -10,8 +10,9 @@ class Bootstrap extends CubeIT_Bootstrap {
 	}
 
 	protected function _initScripts() {
-		parent::_initScripts();
 		$view = $this->getView();
+		$this->view->headScript()->addTooltip();
+		parent::_initScripts();
 		$view->headMeta()->setViewport(1024);
 		$view->headScript()->addWebFont(array('google' => array('families' => array('Ubuntu:500italic,300,300italic,500,400italic'))));
 	}
diff --git a/framework/application/forms/CMS/Sub/Sidebar.php b/framework/application/forms/CMS/Sub/Sidebar.php
index d43f344..8399358 100644
--- a/framework/application/forms/CMS/Sub/Sidebar.php
+++ b/framework/application/forms/CMS/Sub/Sidebar.php
@@ -14,6 +14,11 @@ class CCGM_Form_CMS_Sub_Sidebar extends CubeIT_Form_SubForm {
 		$contenu->setLabel('Bloc de texte');
 		$contenu->setAttrib('rows', 6);
 		$this->addElement($contenu);
+
+		$contenu = new CCGM_Form_Element_Markitup_Essential('text2');
+		$contenu->setLabel('Bloc de texte #2');
+		$contenu->setAttrib('rows', 6);
+		$this->addElement($contenu);
 	}
 
 }
diff --git a/framework/application/views/helpers/Rightbar.php b/framework/application/views/helpers/Rightbar.php
index 3746145..0239cf9 100644
--- a/framework/application/views/helpers/Rightbar.php
+++ b/framework/application/views/helpers/Rightbar.php
@@ -8,17 +8,20 @@ class CCGM_View_Helper_Rightbar extends Zend_View_Helper_Abstract {
 		}
 
 		$s = $this->view->sidebar;
-		if (trim($s['text']) == '' && !count($s['image'])) {
+		if (trim($s['text']) == '' && trim($s['text2']) == '' && !count($s['image'])) {
 			return;
 		}
-		
+
 		$this->view->headScript()->addScriptAndStyle('rightbar');
 
-		$res='<aside id="rightbar">';
+		$res = '<aside id="rightbar">';
 		$res.=$this->view->imageProcess($s['image'], '', 262, null, array(), 'R');
 		$res.='<section>';
 		$res.=$this->view->markupDotclear($s['text']);
 		$res.='</section>';
+		if (trim($s['text2']) != '') {
+			$res.='<section>' . $this->view->markupDotclear($s['text2']) . '</section>';
+		}
 		$res.='</aside>';
 		return $res;
 	}
diff --git a/images/centre.svg b/images/centre.svg
index 696e487..a587aa1 100644
--- a/images/centre.svg
+++ b/images/centre.svg
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.2, 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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="50px" height="50px" viewBox="-12.5 -12 50 50" enable-background="new -12.5 -12 50 50" xml:space="preserve">
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.4995" y1="-12" x2="12.4995" y2="38.0005">
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="50px" height="50px" viewBox="-25 -25 50 50" enable-background="new -25 -25 50 50" xml:space="preserve">
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-8.4" y1="51.1" x2="-8.4" y2="1.1" gradientTransform="matrix(1 0 0 -1 8.4 26.1)">
 	<stop  offset="0" style="stop-color:#FA9438"/>
 	<stop  offset="1" style="stop-color:#F87724"/>
 </linearGradient>
-<circle fill="url(#SVGID_1_)" cx="12.5" cy="13" r="25"/>
+<circle fill="url(#SVGID_1_)" cx="0" cy="0" r="25"/>
 <g>
 	<g>
-		<path fill="#FFFFFF" d="M12.5,6.303V0H1.563v23.637H0V26h25v-2.363V6.303H12.5z M9.375,23.637H4.688v-2.363h4.688L9.375,23.637
-			L9.375,23.637z M10.938,17.333H3.125v-1.576h7.813V17.333z M10.938,14.182H3.125v-1.576h7.813V14.182z M10.938,11.03H3.125V9.455
-			h7.813V11.03z M10.938,7.879H3.125V6.303h7.813V7.879z M10.938,4.727H3.125V3.151h7.813V4.727z M18.75,22.85h-3.125V18.91h3.125
-			V22.85z M18.75,18.121h-3.125v-3.939h3.125V18.121z M18.75,13.394h-3.125V9.455h3.125V13.394z M23.438,22.85h-3.125V18.91h3.125
-			V22.85z M23.438,18.121h-3.125v-3.939h3.125V18.121z M23.438,13.394h-3.125V9.455h3.125V13.394z"/>
+		<path fill="#FFFFFF" d="M0-6.697V-13h-10.937v23.637H-12.5V13h25v-2.363V-6.697H0z M-3.125,10.637h-4.687V8.274h4.688
+			L-3.125,10.637L-3.125,10.637z M-1.562,4.333h-7.813V2.757h7.813V4.333z M-1.562,1.182h-7.813v-1.576h7.813V1.182z M-1.562-1.97
+			h-7.813v-1.575h7.813V-1.97z M-1.562-5.121h-7.813v-1.576h7.813V-5.121z M-1.562-8.273h-7.813v-1.576h7.813V-8.273z M6.25,9.85
+			H3.125V5.91H6.25V9.85z M6.25,5.121H3.125V1.182H6.25V5.121z M6.25,0.394H3.125v-3.939H6.25V0.394z M10.938,9.85H7.813V5.91h3.125
+			V9.85z M10.938,5.121H7.813V1.182h3.125V5.121z M10.938,0.394H7.813v-3.939h3.125V0.394z"/>
 	</g>
 </g>
 </svg>
diff --git a/images/parcours.svg b/images/parcours.svg
index b058512..41a1db1 100644
--- a/images/parcours.svg
+++ b/images/parcours.svg
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.2, 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="Size_guide" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Size_guide" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="50px" height="50px" viewBox="-4.778 -12 50 50" enable-background="new -4.778 -12 50 50" xml:space="preserve">
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="20.2222" y1="-12" x2="20.2222" y2="38.0005">
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11.822" y1="38.1" x2="11.822" y2="-11.9" gradientTransform="matrix(1 0 0 -1 8.4 26.1)">
 	<stop  offset="0" style="stop-color:#87578D"/>
 	<stop  offset="1" style="stop-color:#704675"/>
 </linearGradient>
diff --git a/images/pathologies.svg b/images/pathologies.svg
index fa2921c..40ce7c5 100644
--- a/images/pathologies.svg
+++ b/images/pathologies.svg
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- 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" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="50px"
-	 height="50px" viewBox="-13.5 -14.5 50 50" enable-background="new -13.5 -14.5 50 50" xml:space="preserve">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="50px" height="50px" viewBox="0 0 50 50" enable-background="new 0 0 50 50" xml:space="preserve">
 <g id="Layer_2">
-	<circle fill="#E5218F" cx="11.5" cy="10.5" r="25"/>
+	<circle fill="#E5218F" cx="25" cy="25" r="25"/>
 </g>
 <g id="Layer_1">
 	<g>
-		<path fill="#FFFFFF" d="M22.965,18.262V7.888c0-1.09-0.854-1.972-1.902-1.972h-2.975c0-3.262-2.99-5.916-6.665-5.916
-			C7.749,0,4.76,2.654,4.76,5.916H1.904C0.851,5.916,0,6.797,0,7.888v10.691h0.035v0.19c0,1.23,0.971,2.229,2.167,2.229h18.631
-			C22.031,21,23,20.001,23,18.771v-0.51H22.965z M11.423,1.972c2.624,0,4.761,1.769,4.761,3.943H6.665
-			C6.665,3.741,8.798,1.972,11.423,1.972z M6.469,11.163h3.58V7.455h2.861v3.736h3.579v2.936H12.91v3.707h-2.861v-3.707h-3.58
-			V11.163z"/>
+		<path fill="#FFFFFF" d="M36.465,32.762V22.388c0-1.09-0.854-1.972-1.902-1.972h-2.975c0-3.262-2.99-5.916-6.665-5.916
+			c-3.674,0-6.663,2.654-6.663,5.916h-2.856c-1.053,0-1.904,0.881-1.904,1.972v10.691h0.035v0.19c0,1.23,0.971,2.229,2.167,2.229
+			h18.631c1.198,0.002,2.167-0.997,2.167-2.227v-0.51L36.465,32.762L36.465,32.762z M24.923,16.472c2.624,0,4.761,1.769,4.761,3.943
+			h-9.519C20.165,18.241,22.298,16.472,24.923,16.472z M19.969,25.663h3.58v-3.708h2.861v3.736h3.579v2.936H26.41v3.707h-2.861
+			v-3.707h-3.58V25.663z"/>
 	</g>
 </g>
 </svg>
diff --git a/less/common.less b/less/common.less
index e679eae..be7e301 100644
--- a/less/common.less
+++ b/less/common.less
@@ -20,7 +20,7 @@ q{quotes: none;}
 q:before,
 q:after{content:"";}
 
-.dotclear a{
+.dotclear a,.dotclear abbr{
 	color:#0EA6DB;
 }
 
@@ -96,21 +96,22 @@ q:after{content:"";}
 	padding:54px 0 0;
 	background-size: 50px 50px;
 	background-position: 50% 0;
+	transform: translateZ(1px);
 	margin:0 0 0 5px;
 	text-decoration: none;
 }
 #nav li a[data-name="centre"]{
-	background-image: url(../images/centre.svg);
+	background-image: url(../images/centre.svg?css);
 	background-position: 50% 0;
 	background-repeat: no-repeat;
 }
 #nav li a[data-name="parcours"]{
-	background-image: url(../images/parcours.svg);
+	background-image: url(../images/parcours.svg?css);
 	background-position: 50% 0;
 	background-repeat: no-repeat;
 }
 #nav li a[data-name="pathologies"]{
-	background-image: url(../images/pathologies.svg);
+	background-image: url(../images/pathologies.svg?css);
 	background-position: 50% 0;
 	background-repeat: no-repeat;
 }
@@ -401,5 +402,19 @@ q:after{content:"";}
 }
 
 
+#tooltip {
+	background-color: #eeeded;
+	color: #5e5e5e;
+	font-size: 16px;
+	padding: 20px;
+	font-style:italic;
+	box-shadow:0 0 5px 2px rgba(0,0,0,0.3);
+	max-width:250px;
+
+	&:after{
+		border-top-color:#eeeded;
+	}
+}
+
 
 
diff --git a/less/rightbar.less b/less/rightbar.less
index 3b5d21c..c78d10c 100644
--- a/less/rightbar.less
+++ b/less/rightbar.less
@@ -2,29 +2,35 @@
 	width:262px;
 	display:inline-block;
 	margin:0 0 50px 0;
-}
 
-#rightbar>img{
-	display: block;
-	margin: 0 0 17px 0;
-}
+	>img{
+		display: block;
+		margin: 0 0 17px 0;
+	}
 
-#rightbar>img,
-#rightbar>section{
-	border-radius: 5px;
-	border:1px solid #c7c5c5;
-	width:262px;
-	box-sizing: border-box;
-}
+	>img,>section{
+		border-radius: 5px;
+		border:1px solid #c7c5c5;
+		width:262px;
+		box-sizing: border-box;
+	}
 
-#rightbar>section{
-	font-weight: 300;
-	font-size: 13px;
-	padding:0 20px;
-}
+	>section{
+		font-weight: 300;
+		font-size: 13px;
+		padding:0 15px;
+		margin: 0 0 17px 0;
+
+		strong{
+			font-weight: 500;
+		}
+	}
 
-#rightbar>section strong{
-	font-weight: 500;
+	.dotclear{
+		.floating-left{
+			margin: 23px 11px 1em 0;
+		}
+	}
 }
 
 #content>div#c{
diff --git a/less/sidebar.less b/less/sidebar.less
index 319fdda..173618e 100644
--- a/less/sidebar.less
+++ b/less/sidebar.less
@@ -41,6 +41,7 @@
 		>li:hover,>li.active{
 			background-image:url(../images/arrow-nav-1.svg);
 			background-position:9px 7px;
+			background-color: #57c1e6;
 		}
 		>li{
 			>a{
-- 
2.39.5