From 6f42fb1617f3ca52e617a51dde5c075bfdc9d51e Mon Sep 17 00:00:00 2001
From: "bruno@cubedesigners.com"
 <bruno@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 31 Jan 2014 12:36:57 +0000
Subject: [PATCH]

---
 .../CMS/Sub/Casestudies/Content/Bloc.php      | 12 +++++++++-
 .../application/forms/Element/ContentType.php |  1 +
 .../views/helpers/CasestudiesDetail.php       | 24 ++++++++++++-------
 less/casestudies_detail.less                  | 12 +++++++---
 4 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/framework/application/forms/CMS/Sub/Casestudies/Content/Bloc.php b/framework/application/forms/CMS/Sub/Casestudies/Content/Bloc.php
index a8d9fba..0a91d29 100644
--- a/framework/application/forms/CMS/Sub/Casestudies/Content/Bloc.php
+++ b/framework/application/forms/CMS/Sub/Casestudies/Content/Bloc.php
@@ -10,9 +10,19 @@ class Cubedesigners_Form_CMS_Sub_Casestudies_Content_Bloc extends CubeIT_Form_Su
         $this->addElement($select);
 
         $margin = new Zend_Form_Element_Text('margin');
-        $margin->setLabel("Décalage du vertical bloc (en pixels)");
+        $margin->setLabel("Décalage vertical du bloc (en pixels)");
         $this->addElement($margin);
 
+        $zindex = new Zend_Form_Element_Select('zindex');
+        $options = array('default' => 'Par défaut');
+        for ($i = 1; $i <= 10; $i++) {
+            //array_push($options, $i);
+            $options[$i] = $i;
+        }
+        $zindex->setMultiOptions($options);
+        $zindex->setLabel('z-index du bloc');
+        $this->addElement($zindex);
+
         $titre = new Zend_Form_Element_Text('titre');
         $titre->setLabel('Titre');
         $this->addElement($titre);
diff --git a/framework/application/forms/Element/ContentType.php b/framework/application/forms/Element/ContentType.php
index 5fc9c81..9925b3c 100644
--- a/framework/application/forms/Element/ContentType.php
+++ b/framework/application/forms/Element/ContentType.php
@@ -5,6 +5,7 @@ class Cubedesigners_Form_Element_ContentType extends Zend_Form_Element_Select {
     //public $helper = 'formContentType';
 
     public function init() {
+        parent::init();
         $this->setMultiOptions(array('text' => 'Texte', 'visuel' => 'Visuel', 'video' => 'Vidéo'));
     }
 
diff --git a/framework/application/views/helpers/CasestudiesDetail.php b/framework/application/views/helpers/CasestudiesDetail.php
index 89dd28f..39598e0 100644
--- a/framework/application/views/helpers/CasestudiesDetail.php
+++ b/framework/application/views/helpers/CasestudiesDetail.php
@@ -30,15 +30,21 @@ class Cubedesigners_View_Helper_CasestudiesDetail extends Zend_View_Helper_Abstr
 
         foreach ($blocs as $bloc) {
 
-            $margin = '';
+            // fb($bloc);
 
+            $margin = '';
             if ($bloc["margin"] != '') {
                 $margin = 'margin-top:' . $bloc["margin"] . 'px;';
             }
 
+            $zindex = '';
+            if ($bloc["zindex"] != 'default') {
+                $zindex = 'z-index:' . $bloc["zindex"] . ';';
+            }
+
             if ($bloc["selectedtype"] == "text") {
 
-                $res .= '<div class="detail-text" style="' . $margin . '" >';
+                $res .= '<div class="detail-text" style="' . $margin . '' . $zindex . '" >';
                 $res .= '<div class="titre">' . $bloc["titre"] . '</div>';
                 $res .= '<div class="texte">' . $bloc["texte"] . '</div>';
                 $res .= '</div>';
@@ -52,7 +58,7 @@ class Cubedesigners_View_Helper_CasestudiesDetail extends Zend_View_Helper_Abstr
 
 
 
-                $res .= '<div class="detail-visuel" style="background-image:url(\'' . $visuel . '\');height:' . $height . 'px;' . $margin . '"></div>';
+                $res .= '<div class="detail-visuel" style="background-image:url(\'' . $visuel . '\');height:' . $height . 'px;' . $margin . '' . $zindex . '"></div>';
             }
 
 
@@ -63,6 +69,9 @@ class Cubedesigners_View_Helper_CasestudiesDetail extends Zend_View_Helper_Abstr
 
             if ($bloc["selectedtype"] == "video") {
 
+                $res .= '<div class="detail-video" style="' . $margin . '' . $zindex . '" >';
+                $video = $this->view->videoWeb($bloc["video"], 980);
+
                 if ($addVideoBackground) {
                     $background = $this->view->imageProcess()->imageProcessGetUrl($bloc["video_background"], '', 1200, null);
                     $width = -1;
@@ -70,15 +79,12 @@ class Cubedesigners_View_Helper_CasestudiesDetail extends Zend_View_Helper_Abstr
                     CubeIT_Image::getDimensions($background, $width, $height);
                     $res.= '<div class="detail-video-background" style="width:100%;background-position:50%;background-image:url(\'' . $background . '\');height:' . $height . 'px;">';
                 }
-
-                $res .= '<div class="detail-video" style="' . $margin . '" >';
-                $video = $this->view->videoWeb($bloc["video"], 980);
-                $res .= '<div>' . $video . '</div>';
-                $res .= '</div>';
-
                 if ($addVideoBackground) {
                     $res.= "</div>";
                 }
+
+                $res .= '<div style="z-index:10;position:relative">' . $video . '</div>';
+                $res .= '</div>';
             }
         }
         $res .= '</div>';
diff --git a/less/casestudies_detail.less b/less/casestudies_detail.less
index 75d5cde..4dbe6ed 100644
--- a/less/casestudies_detail.less
+++ b/less/casestudies_detail.less
@@ -76,7 +76,13 @@
 }
 
 #casestudies-detail-content .detail-video-background {
-    display: table;
+    /*display: table;*/
+    position: absolute;
+    top: -325px;
+    //left: 110px;
+    width:1280px;
+    height:1280px;
+    z-index: 2;
 }
 
 
@@ -85,8 +91,8 @@
     position: relative;
     z-index: 5;
     text-align: center;
-    vertical-align: middle;
-    display: table-cell;
+   /* vertical-align: middle;
+    display: table-cell; */
 }
 
 #casestudies-detail-content .detail-visuel {
-- 
2.39.5