(no commit message)

diff --git a/framework/application/forms/CMS/Sub/Home/Agence.php b/framework/application/forms/CMS/Sub/Home/Agence.php
index 29ae597a1444b3183ea646d091ff3296bf2e256c..d6c9ccb5a69de0a0708a99ef16a277f46c12eade 100644 (file)
--- 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 2f6f174f4d164fe0f6c2db5158b576550c09ecb9..fea8749fd8a4f7c244c6a4ca4c6e6ffd4e989a3c 100644 (file)
--- 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 (file)
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 ec478b1f05a78c24480067c1a5dc77595af0e711..b7a57a966626e6938c27128268b536cfa62be717 100644 (file)
--- a/framework/application/views/scripts/common/content.phtml
+++ b/framework/application/views/scripts/common/content.phtml
@@ -1,12 +1,11 @@
-<?php\r
-\r
-$content = $this->layout()->content . "\n";\r
-\r
-echo '<div id="wrapper">';\r
-echo $this->render('common/header.phtml');\r
-echo '<div id="main">';\r
-echo $content;\r
-echo '</div>';\r
-echo $this->render('common/footer.phtml');\r
-echo '</div>';\r
-?>
\ 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 c930930d75d9a5fe27551699ca8fdf5143f05cfd..792e81dd17cb1a7278eea1b81e1f6756937509c5 100644 (file)
--- 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 49eabdc31a2ff98cda9c55b46666bd70db9d79a9..01c4b137de46db6a35e3edd5814d264b8fa93c60 100644 (file)
--- a/framework/application/views/scripts/templates/home.phtml
+++ b/framework/application/views/scripts/templates/home.phtml
@@ -1,40 +1,19 @@
-<?php\r
-$this->headScript()->addScriptAndStyle('home');\r
-fb($this->slideshow);\r
-?>\r
-\r
-<div class="home-title"><?php echo $this->markupDotclear($this->titre); ?></div>\r
-\r
-<section>\r
-    <div id="home-slideshow">\r
-        <div class="slides-holder">\r
-            <?php\r
-            echo $this->homeSlideshow($this->slideshow);\r
-            ?>\r
-        </div>\r
-    </div>\r
-</section>\r
-\r
-<section>\r
-    <div id="home-agency">\r
-        <div class="bloc-holder">\r
-\r
-            <h2><?php echo ucfirst($this->agence['titre']); ?></h2>\r
-\r
-            <?php echo $this->homeBlocs($this->agence, 'agence'); ?>\r
-\r
-        </div>\r
-    </div>\r
-</section>\r
-\r
-<section>\r
-    <div id="home-expertise">\r
-        <div class="bloc-holder">\r
-\r
-            <h2><?php echo ucfirst($this->expertises['titre']); ?></h2>\r
-\r
-            <?php echo $this->homeBlocs($this->expertises, 'expertises'); ?>\r
-\r
-        </div>\r
-    </div>\r
-</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 5710fda412615f3cce649c2d5f5eb38cdc3e1232..c55bdcd2696a0015e8f6c00b00dbb5e5bcb5f050 100644 (file)
--- 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 (file)
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 1a22ec02c59772f08a103c70db35ebdd699dfe9c..d5c159f85d74e82f1c66959e93595ec9963576b4 100644 (file)
--- 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 (file)
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 23b8e678b331f1a7446148c367b4e79d2001c17a..320fe1ca93a177c02bb2072faf40050cf8f0d301 100644 (file)
--- 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