(no commit message)

diff --git a/framework/application/forms/CMS/Sub/Casestudies/Content/Bloc.php b/framework/application/forms/CMS/Sub/Casestudies/Content/Bloc.php
index a8d9fba4077f844472a3a7c450ec716dc5d37de2..0a91d2997f8f250b46699f287f57db70c315df00 100644 (file)
--- 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 5fc9c810a09dbee301252125e08e87f89cd9c206..9925b3c01d58f970b3d909a5e306b281dab308f1 100644 (file)
--- 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';\r
 \r
     public function init() {\r
+        parent::init();\r
         $this->setMultiOptions(array('text' => 'Texte', 'visuel' => 'Visuel', 'video' => 'Vidéo'));\r
     }\r
 \r

diff --git a/framework/application/views/helpers/CasestudiesDetail.php b/framework/application/views/helpers/CasestudiesDetail.php
index 89dd28f521e41f9b40e596330eb3a3e1c17aa5f9..39598e0bad24c93312f2abf1a48c0efa488b991b 100644 (file)
--- 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
 \r
         foreach ($blocs as $bloc) {\r
 \r
-            $margin = '';\r
+            // fb($bloc);\r
 \r
+            $margin = '';\r
             if ($bloc["margin"] != '') {\r
                 $margin = 'margin-top:' . $bloc["margin"] . 'px;';\r
             }\r
 \r
+            $zindex = '';\r
+            if ($bloc["zindex"] != 'default') {\r
+                $zindex = 'z-index:' . $bloc["zindex"] . ';';\r
+            }\r
+\r
             if ($bloc["selectedtype"] == "text") {\r
 \r
-                $res .= '<div class="detail-text" style="' . $margin . '" >';\r
+                $res .= '<div class="detail-text" style="' . $margin . '' . $zindex . '" >';\r
                 $res .= '<div class="titre">' . $bloc["titre"] . '</div>';\r
                 $res .= '<div class="texte">' . $bloc["texte"] . '</div>';\r
                 $res .= '</div>';\r
@@ -52,7 +58,7 @@ class Cubedesigners_View_Helper_CasestudiesDetail extends Zend_View_Helper_Abstr
 \r
 \r
 \r
-                $res .= '<div class="detail-visuel" style="background-image:url(\'' . $visuel . '\');height:' . $height . 'px;' . $margin . '"></div>';\r
+                $res .= '<div class="detail-visuel" style="background-image:url(\'' . $visuel . '\');height:' . $height . 'px;' . $margin . '' . $zindex . '"></div>';\r
             }\r
 \r
 \r
@@ -63,6 +69,9 @@ class Cubedesigners_View_Helper_CasestudiesDetail extends Zend_View_Helper_Abstr
 \r
             if ($bloc["selectedtype"] == "video") {\r
 \r
+                $res .= '<div class="detail-video" style="' . $margin . '' . $zindex . '" >';\r
+                $video = $this->view->videoWeb($bloc["video"], 980);\r
+\r
                 if ($addVideoBackground) {\r
                     $background = $this->view->imageProcess()->imageProcessGetUrl($bloc["video_background"], '', 1200, null);\r
                     $width = -1;\r
@@ -70,15 +79,12 @@ class Cubedesigners_View_Helper_CasestudiesDetail extends Zend_View_Helper_Abstr
                     CubeIT_Image::getDimensions($background, $width, $height);\r
                     $res.= '<div class="detail-video-background" style="width:100%;background-position:50%;background-image:url(\'' . $background . '\');height:' . $height . 'px;">';\r
                 }\r
-\r
-                $res .= '<div class="detail-video" style="' . $margin . '" >';\r
-                $video = $this->view->videoWeb($bloc["video"], 980);\r
-                $res .= '<div>' . $video . '</div>';\r
-                $res .= '</div>';\r
-\r
                 if ($addVideoBackground) {\r
                     $res.= "</div>";\r
                 }\r
+\r
+                $res .= '<div style="z-index:10;position:relative">' . $video . '</div>';\r
+                $res .= '</div>';\r
             }\r
         }\r
         $res .= '</div>';\r

diff --git a/less/casestudies_detail.less b/less/casestudies_detail.less
index 75d5cde49a79e47395d5f369fed1bdc6931b1c17..4dbe6ed771af28ec4bc7c755479f31d522f8785e 100644 (file)
--- a/less/casestudies_detail.less
+++ b/less/casestudies_detail.less
@@ -76,7 +76,13 @@
 }\r
 \r
 #casestudies-detail-content .detail-video-background {\r
-    display: table;\r
+    /*display: table;*/\r
+    position: absolute;\r
+    top: -325px;\r
+    //left: 110px;\r
+    width:1280px;\r
+    height:1280px;\r
+    z-index: 2;\r
 }\r
 \r
 \r
@@ -85,8 +91,8 @@
     position: relative;\r
     z-index: 5;\r
     text-align: center;\r
-    vertical-align: middle;\r
-    display: table-cell;\r
+   /* vertical-align: middle;\r
+    display: table-cell; */\r
 }\r
 \r
 #casestudies-detail-content .detail-visuel {\r