]> _ Git - cubedesigners-v7.git/commitdiff
(no commit message)
authorvincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Wed, 10 Sep 2014 08:27:17 +0000 (08:27 +0000)
committervincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Wed, 10 Sep 2014 08:27:17 +0000 (08:27 +0000)
16 files changed:
framework/application/configs/application.ini
framework/application/controllers/MaintenanceController.php
framework/application/forms/CMS/Sub/Home/Slideshow/Slide.php
framework/application/forms/CMS/Sub/Realisations/Realisations.php
framework/application/forms/Categories.php
framework/application/forms/Domaines.php
framework/application/forms/Tags.php
framework/application/forms/Technologies.php
framework/application/models/Realisation.php
framework/application/views/helpers/HomeSlideshow.php
framework/application/views/scripts/common/content.phtml
framework/application/views/scripts/common/header.phtml
framework/application/views/scripts/templates/home.phtml
less/common.less
less/header.less
less/home.less

index a7bfd404117d44890e1d4b8ce9126bbcc488ac17..a39a753e99640285b56b21e55523108f5e1e1752 100644 (file)
@@ -19,7 +19,7 @@ timezone = 'Europe/Paris'
 session.lifetime = 31536000 ;1 year
 session.adapter = cache
 
-webhost = www.
+webhost = www.cubedesigners.com
 
 database.adapter = pdo_mysql
 database.params.host = localhost
@@ -28,11 +28,10 @@ database.params.password = Y0k3C5c51N
 database.params.dbname = cubev6
 
 former.database.adapter = pdo_mysql
-former.database.params.host =
-former.database.params.username =
-former.database.params.password =
-former.database.params.dbname =
-
+former.database.params.host = localhost
+former.database.params.username = cubedesigners
+former.database.params.password = *arica*5
+former.database.params.dbname = cubedesigners
 former.home = /home/cubedesigners/www
 
 seo.universalAnalytics = UA-4339912-1
index 1cd01f427c45c65701cf80ddce8b9f0376c8744b..9b0fadf2cfe434f894701abf6805dda8c4eaf179 100644 (file)
@@ -2,32 +2,67 @@
 
 class MaintenanceController extends CubeIT_Controller_MaintenanceController {
 
-    public function import() {
-        /* set_time_limit(300);
+       public function import() {
+               return;
+               $this->getDb()->truncate('realisations');
+               $former = Bootstrap::getInstance()->getOpt('former.home') . '/files/';
 
-          $utilisateurs = $this->getFormerDb()->select()->from('utilisateurs')
-          ->query()->fetchAll();
+               $clients = $this->getFormerDb()
+                                               ->select()->from('clients')
+                                               ->where('valid = 1')
+                                               ->query()->fetchAll();
 
-          $this->getDb()->truncate('user');
-          $binds = array();
-          foreach ($utilisateurs as $u) {
-          $role = $u->rights == 4 ? 'admin' : 'member';
-          if (stristr($u->email, '@cubedesigners.com')) {
-          $role = 'superadmin';
-          }
+               $realisations = $this->getFormerDb()
+                                               ->select()->from('project')
+                                               ->where('valid = ?', 1)
+                                               ->order('id ASC')
+                                               ->query()->fetchAll();
 
+               $categories = array(1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 6, 6 => 7);
 
-          $bind = array(
-          'id' => $u->utilisateur_id,
-          'username' => $u->email,
-          'password' => CubeIT_Auth_Adapter::hash($u->password),
-          'role' => $role,
-          'code' => $u->code);
+               foreach ($realisations as $r) {
+                       $n = new Cubedesigners_Model_Realisation();
 
-          $this->getDb()->insert('user', $bind);
-          } */
-    }
+                       $e = explode('.', $r->client_id);
+                       $n->setId($r->id);
+                       $n->setTitre(html_entity_decode($clients[$e[1]]->title));
+                       $n->setLegende(array('fr' => html_entity_decode($r->title_fr), 'en' => html_entity_decode($r->title_en)));
+                       $n->setAgence($r->agence);
+                       $n->setUrl(
+                                       array(
+                                               'fr' => array('label' => html_entity_decode($r->link_txt_fr), 'url' => html_entity_decode($r->link_fr)),
+                                               'en' => array('label' => html_entity_decode($r->link_txt_en), 'url' => html_entity_decode($r->link_en))
+                                       )
+                       );
+                       $n->setDescription(array('fr' => html_entity_decode($r->desc_fr), 'en' => html_entity_decode($r->desc_en)));
+                       $n->setVisuel(array($this->_copyFileToCMS($former . $r->icon_file)));
+                       $files = explode('$', $r->pres_files);
+                       $local = array();
+                       foreach ($files as $f) {
+                               $local[] = $this->_copyFileToCMS($former . $f);
+                       }
+                       $n->setVisuelDetail($local);
+                       $c = explode('.', $r->category_id);
+                       $n->setCategories($categories[$c[1]]);
+                       $n->setDate(new Zend_Date($r->date, Zend_Date::TIMESTAMP));
+                       $n->setOnline($r->visible);
+                       $n->save(true);
+               }
+       }
 
-}
+       public function categories() {
+               $models = array('Categorie', 'Domaine', 'Technologie', 'Tag');
+               foreach ($models as $m) {
+                       $factory = call_user_func(array('Cubedesigners_Model_' . $m, 'factory'));
+
+                       foreach ($factory->find() as $c) {
+                               if (CubeIT_Util_Json::isJson($c->getName())) {
+                                       continue;
+                               }
+                               $c->setName(array('fr' => $c->getName(), 'en' => ''));
+                               $c->save();
+                       }
+               }
+       }
 
-?>
+}
index 30a8ee231b5d9e090d3c1e1c1cc9b29799a58c7b..b0129facb4871489eb3d4f11d4d0545e59efa3db 100644 (file)
@@ -2,26 +2,36 @@
 
 class Cubedesigners_Form_CMS_Sub_Home_Slideshow_Slide extends CubeIT_Form_SubForm {
 
-    public function init() {
-        parent::init();
-
-        $image = new CubeIT_Form_Element_File_Image('image');
-        $image->setLabel('Image');
-        $image->setMaxItems(1);
-        $this->addElement($image);
-
-        $legend = new Zend_Form_Element_Text('legende');
-        $legend->setLabel('Legende');
-        $this->addElement($legend);
-
-        $time = new Zend_Form_Element_Text('time');
-        $time->setLabel("Temps d'affichage (en secondes)");
-        $this->addElement($time);
-
-        $link = new CubeIT_Form_Element_Link('lien');
-        $link->labelEnabled(false);
-        $this->addSubForm($link, 'lien');
-    }
+       public function init() {
+               parent::init();
+
+               $image = new CubeIT_Form_Element_File_Image('image');
+               $image->setLabel('Image');
+               $image->setMaxItems(1);
+               $this->addElement($image);
+
+               $fond = new CubeIT_Form_Element_File_Image('background');
+               $fond->setLabel('Image de fond');
+               $fond->setMaxItems(1);
+               $this->addElement($fond);
+
+               $mask = new CubeIT_Form_Element_File_Image('mask');
+               $mask->setLabel('Masque');
+               $mask->setMaxItems(1);
+               $this->addElement($mask);
+
+               $legend = new CubeIT_Form_Element_Markitup('legende');
+               $legend->setLabel('Legende');
+               $this->addElement($legend);
+
+               $time = new Zend_Form_Element_Text('time');
+               $time->setLabel("Temps d'affichage (en secondes)");
+               $this->addElement($time);
+
+               $link = new CubeIT_Form_Element_Link('lien');
+               $link->labelEnabled(false);
+               $this->addSubForm($link, 'lien');
+       }
 
 }
 
index 16d2fad91730e28988c13cf2105b4e315105e008..e0eb8bac19b6db025ef6a59bdf8956f905663cc5 100644 (file)
@@ -26,7 +26,7 @@ class Cubedesigners_Form_CMS_Sub_Realisations_Realisations extends CubeIT_Form_L
                $this->addElement($titre);
 
                $legende = new Zend_Form_Element_Text('legende');
-               $legende->setLabel('Legende');
+               $legende->setLabel('Titre');
                $this->addElementLocalized($legende, $isCompactTrad);
 
                $agence = new Zend_Form_Element_Text('agence');
@@ -37,9 +37,9 @@ class Cubedesigners_Form_CMS_Sub_Realisations_Realisations extends CubeIT_Form_L
                $description->setLabel('Description');
                $this->addElementLocalized($description, $isCompactTrad);
 
-               $url = new CubeIT_Form_Element_Url('url');
-               $url->setLabel('URL du site');
-               $this->addElementLocalized($url, $isCompactTrad);
+               $url = new CubeIT_Form_Element_Link();
+               $url->setLegend('URL du site');
+               $this->addSubFormLocalized($url, 'url', $isCompactTrad);
 
                $visuel = new CubeIT_Form_Element_File_Image('visuel');
                $visuel->setLabel('Vignette');
@@ -71,7 +71,9 @@ class Cubedesigners_Form_CMS_Sub_Realisations_Realisations extends CubeIT_Form_L
                                ->setEditTitle('Edition de la réalisation « $titre »')
                                ->setBaseTable('realisations')
                                ->setIdColumn('id')
-                               ->setTitleColumn('titre');
+                               ->setTitleColumn('legende')
+                               ->setAdditionnalColumns(array('titre', 'agence', 'date', 'categories', 'online'))
+                               ->setSearchColumns(array('titre', 'agence', 'date'));
        }
 
 }
index 44950a3f1bd1488d11e32c4c28170f111f874056..104c86cc04b3adf304dad8e2ec8314ffc66e02b0 100644 (file)
@@ -11,7 +11,7 @@ class Cubedesigners_Form_Categories extends CubeIT_Form_List_Model {
 
                $name = new Zend_Form_Element_Text('name');
                $name->setLabel(__('Nom'));
-               $this->addElement($name);
+               $this->addElementLocalized($name, false);
 
                $this->setListTitle(__('Categories'))
                                ->setNewTitle(__('Créer une catégorie'))
index 28383069fddcbaffbed2e27bf60904100763a91d..020bf3237368fad185aa04346abcb93264fe34d0 100644 (file)
@@ -11,7 +11,7 @@ class Cubedesigners_Form_Domaines extends CubeIT_Form_List_Model {
 
                $name = new Zend_Form_Element_Text('name');
                $name->setLabel(__('Nom'));
-               $this->addElement($name);
+               $this->addElementLocalized($name, false);
 
                $this->setListTitle(__("Domaines d'activité"))
                                ->setNewTitle(__('Créer un domaine'))
index 964728aac46b099f70002c534117deb79b3debfb..6673a56b28a9bd9dc5dce8e0833daad978a97f75 100644 (file)
@@ -11,7 +11,7 @@ class Cubedesigners_Form_Tags extends CubeIT_Form_List_Model {
 
                $name = new Zend_Form_Element_Text('name');
                $name->setLabel(__('Nom'));
-               $this->addElement($name);
+               $this->addElementLocalized($name, false);
 
                $this->setListTitle(__('Tags'))
                                ->setNewTitle(__('Créer un tag'))
index 3e79b646a5cad82053c7a69087661ed064f10a93..abd32e6a90c9bfdbcb94080bd998486bca228d1b 100644 (file)
@@ -11,7 +11,7 @@ class Cubedesigners_Form_Technologies extends CubeIT_Form_List_Model {
 
                $name = new Zend_Form_Element_Text('name');
                $name->setLabel(__('Nom'));
-               $this->addElement($name);
+               $this->addElementLocalized($name, false);
 
                $this->setListTitle(__('Technologies'))
                                ->setNewTitle(__('Créer une technologie'))
index 3e45c9ff4ddaa823980f6c880960579f939a4296..da562892c9aadf0480f1dcfb6f630b2b2b12efe7 100644 (file)
@@ -15,7 +15,8 @@ class Cubedesigners_Model_Realisation extends CubeIT_Model_Table {
        protected $technologies;
        protected $tags_secondaires;
        protected $online;
-       protected $annee;
+       protected $date;
+       protected $_types = array('date' => 'date');
 
        public static function getSchema($schema) {
                $realisations = parent::getSchema($schema);
index 771aff54bff671b52842fae2bcbac86ce9b662bc..71250bebd5e3f6e2f90ee30a56136ae7b7ff15f3 100644 (file)
@@ -1,48 +1,47 @@
-<?php\r
-\r
-class Cubedesigners_View_Helper_HomeSlideshow extends Zend_View_Helper_Abstract {\r
-\r
-    public function homeSlideshow($slides) {\r
-\r
-        $slides = $slides['slides'];\r
-        fb($slides);\r
-\r
-        $res = '<div class="slides">';\r
-\r
-        foreach ($slides as $id => $slide) {\r
-\r
-            $l = '';\r
-\r
-            if (!empty($slide["lien"]["page"])) {\r
-                $page = $this->view->navigation()->getContainer()->findOneById($this->view->localeDefault() . '/' . $slide["lien"]["page"]);\r
-                $l = $page->getHref();\r
-            }\r
-\r
-            if (!empty($slide["lien"]["url"]) && empty($l)) {\r
-                $l = $slide["lien"]["url"];\r
-            }\r
-\r
-\r
-            $image = $this->view->imageProcess()->imageProcessGetUrl($slide['image'], $slide['legende'], 980, 400);\r
-\r
-            if (!$slide['time']) {\r
-                $time = 6000;\r
-            } else {\r
-                $time = $slide['time'] * 1000;\r
-            }\r
-\r
-            $res.='<div class="slide" id="slide-' . $id . '" data-link="' . $l . '" data-image="' . $image . '" data-legend="' . $slide['legende'] . '" data-time="' . $time . '"></div>';\r
-        }\r
-\r
-\r
-        $res .= '</div>';\r
-        $res .= '<a href="#" class="next"></a>';\r
-        $res .= '<a href="#" class="prev"></a>';\r
-        $res .= '<div id="slide-legend"></div>';\r
-\r
-        return $res;\r
-    }\r
-\r
-}\r
-\r
-?>\r
+<?php
+
+class Cubedesigners_View_Helper_HomeSlideshow extends Zend_View_Helper_Abstract {
+
+       public function homeSlideshow($slides) {
+               $slides = $slides['slides'];
+
+               $res = '<section>';
+               $res.='<div id="home-slideshow">';
+               $res.='<div class="slides-holder">';
+               $res .= '<div class="slides">';
+
+               foreach ($slides as $id => $slide) {
+                       if (null !== $slide['mask']) {
+                               $image = $this->view->imageMasked($slide['image'], $slide['mask'], $slide['legend']);
+                               $d = CubeIT_View_Helper_Image::$lastDimensions;
+                       } else {
+                               $image = $this->view->imageCms($slide['image'], $slide['legend']);
+                       }
+                       $offset = $d[1] - 572;
+
+
+                       if (!$slide['time']) {
+                               $time = 300000;
+                       } else {
+                               $time = $slide['time'] * 1000;
+                       }
+                       $attributes['data-time'] = $time;
+                       $attributes['class'] = 'slide';
+                       $attributes['style'] = 'background-image:url(' . CubeIT_View_Helper_ImageCms::getPath($slide['background']) . ');';
+                       $res.=$this->view->htmlElement($this->view->htmlElement($image, 'div', array('class' => 'imgholder', 'style' => 'top:-' . $offset . 'px;')), 'div', $attributes);
+               }
+               $res .= '</div>';
+               $res.='<div class="controls">';
+               $res .= '<a href="#" class="next"></a>';
+               $res .= '<a href="#" class="prev"></a>';
+               $res.='</div>';
+               $res.='</div>';
+               $res.='</div>';
+               $res.='</div>';
+
+               return $res;
+       }
+
+}
+
+?>
index b7a57a966626e6938c27128268b536cfa62be717..77b95aedb4b5591f5dbd7225fefca290df7607be 100644 (file)
@@ -4,6 +4,9 @@ $content = $this->layout()->content . "\n";
 
 echo '<div id="wrapper">';
 echo $this->render('common/header.phtml');
+if ($this->beforeMain) {
+       echo $this->beforeMain;
+}
 echo '<main id="main" role="main">';
 echo $content;
 echo '</main>';
index 698b263fdeb5862806197da5d419ffaf9fe81e85..955b49a2a1008eaaee4d322236a0ba2b1979265b 100644 (file)
@@ -12,10 +12,10 @@ if (!is_null($homepage)) {
 
                <?php
                /* LOGO */
-               if (null !== 'home') {
-                       echo $this->link($this->image('/images/logo.svg', '', 318, 132), $home, array('class' => 'logo'));
-                       echo '<span class="sublogo"><h1>Cubedesigners</h1><h2>Agence de création sur mesure</h2></span>';
-               }
+
+               echo $this->link($this->image('/images/logo.svg', '', 318, 132), $home, array('class' => 'logo'));
+               echo '<span class="sublogo"><h1>Cubedesigners</h1><h2>Agence de création sur mesure</h2></span>';
+
 
                /* NAVIGATION */
                $mainMenu = $this->navigation()->findOneById($this->localeDefault() . '/' . CubeIT_Navigation::MAIN);
index 1eadbae719c608f9d69c150784c1d662113bc456..e8d15efa725ae4772a4b090c3c3fd871c553817b 100644 (file)
@@ -1,19 +1,6 @@
 <?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
+$this->headScript()->addScriptAndStyle('home');
+$this->beforeMain = $this->homeSlideshow($this->slideshow);
 echo $this->liste($this->agence, false, array('id' => 'agency'));
 echo $this->liste($this->expertises, false, array('id' => 'expertiseshome'));
index aa81cb61782f0e2de6446ffc2e9ac695004f7168..78f1942be370f0e9d610ca823336850bffe794cf 100644 (file)
@@ -55,14 +55,11 @@ a.but {
 
 
 #main{
-       margin: 0 auto;
-    overflow:hidden;
+    overflow-x:hidden;
+       overflow-y:visible;
 
        .main-holder {
-               min-width: 950px;
-               max-width: 1140px;
                width:100%;
-               margin: 0 auto;
                padding: 0px 20px 50px 20px;
        }
        ul{
index 48999c75c4871dee3169214973d7a3f7cf3ad5ff..93f44d90873817b8e92e23bfecd92188e099d062 100644 (file)
@@ -1,5 +1,5 @@
 #header {
-    height:130px;
+    height:168px;
 
     ul{
                text-transform: uppercase;
index d5c159f85d74e82f1c66959e93595ec9963576b4..6d834a1a92fceb00526695fb1caa5cea52b69380 100644 (file)
 
 /* Home Slideshow */
 #home-slideshow {
-    padding-bottom:50px;
-
+       height:572px;
+       overflow:visible;
     .slides-holder {
-        min-width: 980px;
-        max-width: 980px;
-        width:100%;
-        margin: 0 auto;
-        overflow:hidden;
-    }
-
-    .slides-holder .slides {
-        width:980px;
-        height:400px;
-    }
-
-    .slides-holder .slides .slide {
-        position:absolute;
-        display:none;
-    }
-
-    .slides-holder .slides .slide a {
-        margin:0;
-        padding: 0;
-    }
-
-    .slides-holder a {
-        margin: 20px 0 0 0;
-        width: 37px;
-        height: 38px;
-        float: right;
-        //padding: 0 0 25px;
-    }
-
-    .slides-holder a:hover {
-               // background-color: #84ae1e;
-    }
-
-    .slides-holder .prev {
-        background: url('../images/prev.png') no-repeat;
-        background-position: center top;
-        margin-right: 10px;
-    }
-
-    .slides-holder .prev:hover {
-        background: url('../images/prev_over.png') no-repeat;
-    }
-
-    .slides-holder .next {
-        background: url('../images/next.png') no-repeat;
-        background-position: center top;
-    }
-
-    .slides-holder .next:hover {
-        background: url('../images/next_over.png') no-repeat;
-    }
+               height:572px;
+               overflow:visible;
+
+               .slides {
+                       height:572px;
+                       position:relative;
+                       width:100%;
+                       overflow:visible;
+
+                       .slide {
+                               position:absolute;
+                               display:none;
+                               background-repeat: repeat-x;
+                               background-position: 0 100%;
+                               width:100%;
+                               height:572px;
+                               overflow:visible;
+                               .imgholder{
+                                       width:1600px;
+                                       height:572px;
+                                       position: relative;
+                                       margin:0 auto;
+                                       overflow:visible;
+
+                                       img,canvas{
+
+                                       }
+                               }
+                       }
+                       a {
+                               margin:0;
+                               padding: 0;
+                       }
+               }
+
+               .controls{
+                       position:absolute;
+                       right:10px;
+                       bottom:10px;
+                       a {
+                               margin: 20px 0 0 0;
+                               width: 37px;
+                               height: 38px;
+                               float: right;
+
+                               //padding: 0 0 25px;
+                               &:hover {
+                                       // background-color: #84ae1e;
+                               }
+
+                               &.prev {
+                                       background: url('../images/prev.png') no-repeat;
+                                       background-position: center top;
+                                       margin-right: 10px;
+                                       &:hover {
+                                               background: url('../images/prev_over.png') no-repeat;
+                                       }
+                               }
+
+                               &.next {
+                                       background: url('../images/next.png') no-repeat;
+                                       background-position: center top;
+                                       :hover {
+                                               background: url('../images/next_over.png') no-repeat;
+                                       }
+                               }
+                       }
+               }
+       }
 }
 
 
 
 #slide-legend {
-    padding: 25px 0 0 0;
-    margin-right: 30px;
-    font-size: 18px;
-    float:right;
+       padding: 25px 0 0 0;
+       margin-right: 30px;
+       font-size: 18px;
+       float:right;
 }