Add possiblity to insert webvideo in Portfolio detail

diff --git a/.htaccess b/.htaccess
index ae0ab6c34bdaa70c01a18f141e84360005238af5..3e732072e22dfed8fec22e529f5c3b752877b1f0 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -14,6 +14,7 @@
        Options +FollowSymlinks
        RewriteEngine on
        RewriteBase /
+       #
        # Redirection to www. subdomain
        RewriteCond %{HTTP_HOST} =cubedesigners.fr
        RewriteRule ^(.*)$ http://www.cubedesigners.fr/$1 [R=301,L]

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index e65f934ccf42e6a6d26126a0568996fbc9f91d68..da808d796e19540b9a8aaa622df14c3bee2d7104 100644 (file)
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -1,5 +1,6 @@
 [production]
 dev = false
+firephp = true
 
 minify.js = true
 minify.css = true
@@ -8,7 +9,7 @@ bin.mysqldump = /usr/bin/mysqldump
 bin.mysql = /usr/bin/mysql
 bin.zip = /usr/bin/zip
 bin.unzip = /usr/bin/unzip
-bin.imagemagick=convert
+bin.imagemagick = convert
 bin.cp = /bin/cp
 bin.rm = /bin/rm
 
@@ -30,14 +31,14 @@ database.params.dbname = cubev6
 seo.universalAnalytics = UA-4339912-1
 seo.google = google93c0129ef18a399d.html
 seo.bing = 8986457D1D126C38A815027C839372DC
-seo.pinterest=fa7873389173bc29df6ef3ea8789bca2
+seo.pinterest = fa7873389173bc29df6ef3ea8789bca2
 
-navigation.containers[]=0;
+navigation.containers[] = 0;
 ;navigation.containers[]=-1;
-navigation.containers[]=-2;
-navigation.containers[]=-3;
+navigation.containers[] = -2;
+navigation.containers[] = -3;
 
-googleapi=AIzaSyDKYIWGbAgnV0N9SVx0jb9lt1qqD4dSFmQ
+googleapi = AIzaSyDKYIWGbAgnV0N9SVx0jb9lt1qqD4dSFmQ
 
 locales.fr = www.cubedesigners.fr
 locales.en = www.cubedesigners.com

diff --git a/framework/application/forms/CMS/Casestudies.php b/framework/application/forms/CMS/Casestudies.php
index 5df14e1e14347fab4389006d8ddf24a9c97efe07..725ab56a6f0f38a5ad5479d5c7d290250a6f9751 100644 (file)
--- a/framework/application/forms/CMS/Casestudies.php
+++ b/framework/application/forms/CMS/Casestudies.php
@@ -2,22 +2,20 @@
 \r
 class Cubedesigners_Form_CMS_Casestudies extends Cubedesigners_Form_CMS {\r
 \r
-    public function init() {\r
-        parent::init();\r
+       public function init() {\r
+               parent::init();\r
 \r
-        $titre = new CubeIT_Form_Element_Markitup('titre');\r
-        $titre->setLabel('Titre');\r
-        $this->addElement($titre);\r
+               $titre = new CubeIT_Form_Element_Markitup('titre');\r
+               $titre->setLabel('Titre');\r
+               $this->addElement($titre);\r
 \r
-        $stuurl = new Zend_Form_Element_Text('seourl_stu');\r
-        $stuurl->setLabel("Modèle d'URL des études de cas");\r
-        $this->addElement($stuurl);\r
+               $stuurl = new CubeIT_Form_Element_Url('seourl_stu');\r
+               $stuurl->setLabel("Modèle d'URL des études de cas");\r
+               $this->addElement($stuurl);\r
 \r
-        $studies = new Cubedesigners_Form_CMS_Element_Casestudies('studies');\r
-        $studies->setLabel('Gestion des études de cas');\r
-        $this->addElement($studies);\r
-    }\r
+               $studies = new Cubedesigners_Form_CMS_Element_Casestudies('studies');\r
+               $studies->setLabel('Gestion des études de cas');\r
+               $this->addElement($studies);\r
+       }\r
 \r
 }\r
-\r
-?>
\ No newline at end of file

diff --git a/framework/application/forms/CMS/Realisations.php b/framework/application/forms/CMS/Realisations.php
index 2be959d8df902e6234398cddcaf9add3fec05e8f..841fb534b4ebf68ccd91a3fef2a4503302e93e26 100644 (file)
--- a/framework/application/forms/CMS/Realisations.php
+++ b/framework/application/forms/CMS/Realisations.php
@@ -9,7 +9,7 @@ class Cubedesigners_Form_CMS_Realisations extends Cubedesigners_Form_CMS {
                $titre->setLabel('Titre');
                $this->addElement($titre);
 
-               $reaurl = new Zend_Form_Element_Text('seourl_rea');
+               $reaurl = new CubeIT_Form_Element_Url('seourl_rea');
                $reaurl->setLabel("Modèle d'URL des réalisations");
                $this->addElement($reaurl);
 

diff --git a/framework/application/views/helpers/Realisation.php b/framework/application/views/helpers/Realisation.php
index 84b59697c200bbce37fee4e5127cffa4b9619e93..54a53bb7db13899a9caf35dfcb9e63f105c0e4e6 100644 (file)
--- a/framework/application/views/helpers/Realisation.php
+++ b/framework/application/views/helpers/Realisation.php
@@ -8,32 +8,38 @@ class Cubedesigners_View_Helper_Realisation extends CubeIT_View_Helper_Abstract
                $r = CubeIT_Util_Cms::unserialize($r);
 
                $res = '';
-               $res.='<article class="realisation">';
+               $res .= '<article class="realisation">';
                $res .= '<div class="content">';
                $res .= '<h1>' . $r->titre . '</h1>';
                $res .= '<h2>' . Cubedesigners_Util::getCategoryById($r->categories) . '</h2>';
-        $res .= $this->view->link(__('Fermer'), $this->currentPage->getParent()->getHref(), array('class' => 'close', 'id' => 'closeButton'));
-        $res.='</div>';
+               $res .= $this->view->link(__('Fermer'), $this->currentPage->getParent()->getHref(), array('class' => 'close', 'id' => 'closeButton'));
+               $res .= '</div>';
 
                $slides = array();
                foreach ($r->visuel_detail as $s) {
-                       if (CubeIT_Files::getExtension($s) == 'flv') {
+                       $ext = CubeIT_Files::getExtension($s);
+
+                       if ($ext == 'flv') {
                                $slides[] = $this->view->videoCubetube($s, 'auto', 'auto', array('background' => 'ffffff'), array('height' => 439));
+                       } elseif ($ext == 'webvideo') {
+                               $url = file_get_contents(PUBLIC_PATH . CubeIT_View_Helper_ImageCms::getPath($s));
+                               fb($url);
+                               $slides[] = $this->view->videoWeb($url, 'auto', 'auto', array(), array('height' => 439));
                        } else {
                                $slides[] = $s;
                        }
                }
 
-               $res.=$this->imageSlideshowScroll($slides, 439, array(), array('shortcuts' => false));
-               $res.='<div class="content">';
+               $res .= $this->imageSlideshowScroll($slides, 439, array(), array('shortcuts' => false));
+               $res .= '<div class="content">';
 
                if (!empty($r->url->url)) {
-                       $res.=$this->_button($r->url);
+                       $res .= $this->_button($r->url);
                }
 
-               $res.=$this->markupDotclear($r->description);
-               $res.='</div>';
-               $res.='</article>';
+               $res .= $this->markupDotclear($r->description);
+               $res .= '</div>';
+               $res .= '</article>';
 
                return $res;
        }