From c5f7959cb333ff74fc85078b6da7ecbca1693b3c Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 8 Sep 2014 13:05:35 +0000
Subject: [PATCH]

---
 .../application/forms/CMS/Sub/Home/Agence.php | 23 +++---
 .../forms/CMS/Sub/Home/Expertises.php         |  7 +-
 framework/application/views/helpers/Liste.php | 19 +++++
 .../views/scripts/common/content.phtml        | 23 +++---
 .../views/scripts/templates/expertises.phtml  |  2 +
 .../views/scripts/templates/home.phtml        | 59 +++++----------
 less/common.less                              | 30 +++-----
 less/expertises.less                          |  9 +++
 less/home.less                                | 75 -------------------
 less/list.less                                | 64 ++++++++++++++++
 less/twocols.less                             | 39 ++++++++++
 11 files changed, 194 insertions(+), 156 deletions(-)
 create mode 100644 framework/application/views/helpers/Liste.php
 create mode 100644 less/expertises.less
 create mode 100644 less/list.less

diff --git a/framework/application/forms/CMS/Sub/Home/Agence.php b/framework/application/forms/CMS/Sub/Home/Agence.php
index 29ae597..d6c9ccb 100644
--- a/framework/application/forms/CMS/Sub/Home/Agence.php
+++ b/framework/application/forms/CMS/Sub/Home/Agence.php
@@ -2,17 +2,22 @@
 
 class Cubedesigners_Form_CMS_Sub_Home_Agence extends CubeIT_Form_SubForm {
 
-    public function init() {
-        parent::init();
+	public function init() {
+		parent::init();
 
-        $titre = new Zend_Form_Element_Text('titre');
-        $titre->setLabel('Titre');
-        $this->addElement($titre);
+		$titre = new Zend_Form_Element_Text('titre');
+		$titre->setLabel('Titre');
+		$this->addElement($titre);
 
-        $blocs = new Cubedesigners_Form_CMS_Sub_Home_Agence_Blocs('blocs');
-        $blocs->setLegend('Sous-blocs');
-        $this->addSubForm($blocs, 'blocs');
-    }
+		$blocs = new Cubedesigners_Form_CMS_Sub_Home_Agence_Blocs('blocs');
+		$blocs->setLegend('Blocs');
+		$this->addSubForm($blocs, 'blocs');
+
+		$lien = new CubeIT_Form_Element_Link();
+		$lien->urlEnabled(false)->fileEnabled(false);
+		$lien->setLegend('Bouton');
+		$this->addSubForm($lien, 'button');
+	}
 
 }
 
diff --git a/framework/application/forms/CMS/Sub/Home/Expertises.php b/framework/application/forms/CMS/Sub/Home/Expertises.php
index 2f6f174..fea8749 100644
--- a/framework/application/forms/CMS/Sub/Home/Expertises.php
+++ b/framework/application/forms/CMS/Sub/Home/Expertises.php
@@ -12,8 +12,11 @@ class Cubedesigners_Form_CMS_Sub_Home_Expertises extends CubeIT_Form_SubForm {
 		$blocs = new Cubedesigners_Form_CMS_Sub_Home_Expertises_Blocs('blocs');
 		$blocs->setLegend('Expertises');
 		$this->addSubForm($blocs, 'blocs');
+
+		$lien = new CubeIT_Form_Element_Link();
+		$lien->urlEnabled(false)->fileEnabled(false);
+		$lien->setLegend('Bouton');
+		$this->addSubForm($lien, 'button');
 	}
 
 }
-
-?>
diff --git a/framework/application/views/helpers/Liste.php b/framework/application/views/helpers/Liste.php
new file mode 100644
index 0000000..79501eb
--- /dev/null
+++ b/framework/application/views/helpers/Liste.php
@@ -0,0 +1,19 @@
+<?php
+
+class Cubedesigners_View_Helper_Liste extends Zend_View_Helper_Abstract {
+
+	public function liste($items, $attrs = array()) {
+
+		$defaultAttrs = array('class' => array('list'));
+		$attrs = array_merge($defaultAttrs, $attrs);
+
+		$this->view->headLink()->appendStylesheet('/less/list.less');
+		$res = '<div class="bloc-holder">';
+		$res.='<h2>' . ucfirst($items['titre']) . '</h2>';
+		$res.=$this->view->homeBlocs($items);
+		$res.='</div>';
+
+		return $this->view->htmlElement($res, 'section', $attrs);
+	}
+
+}
diff --git a/framework/application/views/scripts/common/content.phtml b/framework/application/views/scripts/common/content.phtml
index ec478b1..b7a57a9 100644
--- a/framework/application/views/scripts/common/content.phtml
+++ b/framework/application/views/scripts/common/content.phtml
@@ -1,12 +1,11 @@
-<?php
-
-$content = $this->layout()->content . "\n";
-
-echo '<div id="wrapper">';
-echo $this->render('common/header.phtml');
-echo '<div id="main">';
-echo $content;
-echo '</div>';
-echo $this->render('common/footer.phtml');
-echo '</div>';
-?>
\ No newline at end of file
+<?php
+
+$content = $this->layout()->content . "\n";
+
+echo '<div id="wrapper">';
+echo $this->render('common/header.phtml');
+echo '<main id="main" role="main">';
+echo $content;
+echo '</main>';
+echo $this->render('common/footer.phtml');
+echo '</div>';
diff --git a/framework/application/views/scripts/templates/expertises.phtml b/framework/application/views/scripts/templates/expertises.phtml
index c930930..792e81d 100644
--- a/framework/application/views/scripts/templates/expertises.phtml
+++ b/framework/application/views/scripts/templates/expertises.phtml
@@ -2,3 +2,5 @@
 
 $this->headScript()->addScriptAndStyle('expertises');
 echo $this->twocols();
+echo $this->htmlElement(nl2br($this->citation), 'blockquote', array('class' => 'citation'));
+echo $this->liste($this->expertises, array('id' => 'expertises'));
diff --git a/framework/application/views/scripts/templates/home.phtml b/framework/application/views/scripts/templates/home.phtml
index 49eabdc..01c4b13 100644
--- a/framework/application/views/scripts/templates/home.phtml
+++ b/framework/application/views/scripts/templates/home.phtml
@@ -1,40 +1,19 @@
-<?php
-$this->headScript()->addScriptAndStyle('home');
-fb($this->slideshow);
-?>
-
-<div class="home-title"><?php echo $this->markupDotclear($this->titre); ?></div>
-
-<section>
-    <div id="home-slideshow">
-        <div class="slides-holder">
-            <?php
-            echo $this->homeSlideshow($this->slideshow);
-            ?>
-        </div>
-    </div>
-</section>
-
-<section>
-    <div id="home-agency">
-        <div class="bloc-holder">
-
-            <h2><?php echo ucfirst($this->agence['titre']); ?></h2>
-
-            <?php echo $this->homeBlocs($this->agence, 'agence'); ?>
-
-        </div>
-    </div>
-</section>
-
-<section>
-    <div id="home-expertise">
-        <div class="bloc-holder">
-
-            <h2><?php echo ucfirst($this->expertises['titre']); ?></h2>
-
-            <?php echo $this->homeBlocs($this->expertises, 'expertises'); ?>
-
-        </div>
-    </div>
-</section>
\ No newline at end of file
+<?php
+$this->headScript()->addScriptAndStyle('home');
+fb($this->slideshow);
+?>
+
+<div class="home-title"><?php echo $this->markupDotclear($this->titre); ?></div>
+
+<section>
+    <div id="home-slideshow">
+        <div class="slides-holder">
+			<?php
+			echo $this->homeSlideshow($this->slideshow);
+			?>
+        </div>
+    </div>
+</section>
+<?php
+echo $this->liste($this->agence, array('id' => 'agency'));
+echo $this->liste($this->expertises, array('id' => 'expertiseshome'));
diff --git a/less/common.less b/less/common.less
index 5710fda..c55bdcd 100644
--- a/less/common.less
+++ b/less/common.less
@@ -31,6 +31,18 @@ a:active {
 	color:#3885e0;
 }
 
+#main{
+	ul{
+		list-style:none;
+		li{
+			&:before{
+				content:"- ";
+			}
+		}
+	}
+}
+
+
 #main {
     margin: 0 auto;
     //min-width: 1024px;
@@ -51,21 +63,3 @@ a:active {
 
 }
 
-.title {
-    min-width: 980px;
-    max-width: 980px;
-    margin: 0 auto;
-    padding: 50px 0 50px 0;
-}
-
-.title h1 {
-    text-align: left;
-    font-weight: 300;
-    font-size: 56px;
-}
-
-.title h2 {
-    text-align: left;
-    font-weight: 300;
-    font-size: 22px;
-}
\ No newline at end of file
diff --git a/less/expertises.less b/less/expertises.less
new file mode 100644
index 0000000..bd9c0c4
--- /dev/null
+++ b/less/expertises.less
@@ -0,0 +1,9 @@
+blockquote.citation{
+	font-size: 32px;
+	font-style: italic;
+	color:#3885e0;
+	line-height: 37px;
+	text-align: center;
+	width:980px;
+	margin:-20px auto 50px;
+}
\ No newline at end of file
diff --git a/less/home.less b/less/home.less
index 1a22ec0..d5c159f 100644
--- a/less/home.less
+++ b/less/home.less
@@ -82,81 +82,6 @@
     float:right;
 }
 
-/* Home Agency and Expertises */
-#home-agency {
-    background-color:#3885e0;
-    color:#fff;
-}
-
-#home-expertise {
-    background-color:#fff;
-    color:#1b1b1b;
-}
-
-#home-agency .bloc-holder,
-#home-expertise .bloc-holder {
-    min-width: 980px;
-    max-width: 980px;
-    width:100%;
-    margin: 0 auto;
-    padding: 50px 0;
-    overflow:hidden;
-}
-
-#home-agency .bloc-holder h2,
-#home-expertise .bloc-holder h2  {
-    font-size:56px;
-}
-
-#home-agency .bloc-holder h3,
-#home-expertise .bloc-holder h3 {
-    font-size:32px;
-    padding: 0 0 20px 0;
-}
-
-#home-agency .bloc-holder a,
-#home-expertise .bloc-holder a {
-    color:white;
-    clear:both;
-    background-color: #2874ce;
-    border-radius: 2px;
-    padding: 5px 20px;
-}
-
-#home-agency .bloc-holder a:hover,
-#home-expertise .bloc-holder a:hover {
-    background-color: #84ae1e;
-}
-
-#home-agency .bloc-holder .blocs,
-#home-expertise .bloc-holder .blocs {
-    padding: 40px 0;
-    overflow:hidden;
-}
-
-#home-agency .bloc-holder .blocs .spacer,
-#home-expertise .bloc-holder .blocs .spacer {
-    clear:left;
-    padding:25px 0;
-}
-
-#home-agency .bloc-holder .sousbloc,
-#home-expertise .bloc-holder .sousbloc {
-    float:left;
-    width:50%;
-}
-
-#home-agency .bloc-holder .sousbloc .texte,
-#home-expertise .bloc-holder .sousbloc .texte {
-    width: 60%;
-    float:left;
-}
-
-#home-agency .bloc-holder .sousbloc img,
-#home-expertise .bloc-holder .sousbloc img {
-    float:left;
-    padding: 0 25px 0 0;
-}
 
 /* max-width pour faibles résolutions */
 @media screen and (max-width: 1009px) {
diff --git a/less/list.less b/less/list.less
new file mode 100644
index 0000000..1b8fc38
--- /dev/null
+++ b/less/list.less
@@ -0,0 +1,64 @@
+section.list{
+
+	&#agency,&#expertises{
+		background-color:#3885e0;
+		color:#fff;
+	}
+
+	&#expertisehome {
+		background-color:#fff;
+		color:#1b1b1b;
+	}
+
+
+	.bloc-holder {
+		min-width: 980px;
+		max-width: 980px;
+		width:100%;
+		margin: 0 auto;
+		padding: 50px 0;
+		overflow:hidden;
+		h2  {
+			font-size:56px;
+		}
+		h3 {
+			font-size:32px;
+			padding: 0 0 20px 0;
+		}
+		a {
+			color:white;
+			clear:both;
+			background-color: #2874ce;
+			border-radius: 2px;
+			padding: 5px 20px;
+			:hover {
+				background-color: #84ae1e;
+			}
+		}
+
+		.blocs {
+			padding: 40px 0;
+			overflow:hidden;
+			.spacer {
+				clear:left;
+				padding:25px 0;
+			}
+		}
+
+		.sousbloc {
+			float:left;
+			width:50%;
+
+			.texte {
+				width: 60%;
+				float:left;
+			}
+
+			img {
+				float:left;
+				padding: 0 25px 0 0;
+			}
+
+		}
+	}
+}
\ No newline at end of file
diff --git a/less/twocols.less b/less/twocols.less
index 23b8e67..320fe1c 100644
--- a/less/twocols.less
+++ b/less/twocols.less
@@ -1,4 +1,41 @@
 .twocols{
+
+	.title {
+		min-width: 980px;
+		max-width: 980px;
+		margin: 0 auto;
+		padding: 40px 0 0 0;
+		h1 {
+			text-align: left;
+			font-weight: 300;
+			font-size: 56px;
+			margin:0 0 10px 0;
+		}
+		h2 {
+			text-align: left;
+			font-weight: 300;
+			font-size: 22px;
+			padding:0 0 20px 0;
+		}
+	}
+
+
+	.dotclear{
+		p{
+			margin:30px 0 30px 0;
+		}
+
+		ul{
+			margin:-30px 0 30px 0;
+			list-style: none;
+			li{
+				&:before{
+					content:"- ";
+				}
+			}
+		}
+	}
+
 	width: 980px;
 	margin: 0 auto;
 	.cols {
@@ -16,4 +53,6 @@
 			}
 		}
 	}
+
+
 }
\ No newline at end of file
-- 
2.39.5