From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 10 Sep 2014 08:27:17 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=7210286bf6cd591d7b37fe3f32427a81b39abd91;p=cubedesigners-v7.git

---

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index a7bfd40..a39a753 100644
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -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
diff --git a/framework/application/controllers/MaintenanceController.php b/framework/application/controllers/MaintenanceController.php
index 1cd01f4..9b0fadf 100644
--- a/framework/application/controllers/MaintenanceController.php
+++ b/framework/application/controllers/MaintenanceController.php
@@ -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();
+			}
+		}
+	}
 
-?>
+}
diff --git a/framework/application/forms/CMS/Sub/Home/Slideshow/Slide.php b/framework/application/forms/CMS/Sub/Home/Slideshow/Slide.php
index 30a8ee2..b0129fa 100644
--- a/framework/application/forms/CMS/Sub/Home/Slideshow/Slide.php
+++ b/framework/application/forms/CMS/Sub/Home/Slideshow/Slide.php
@@ -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');
+	}
 
 }
 
diff --git a/framework/application/forms/CMS/Sub/Realisations/Realisations.php b/framework/application/forms/CMS/Sub/Realisations/Realisations.php
index 16d2fad..e0eb8ba 100644
--- a/framework/application/forms/CMS/Sub/Realisations/Realisations.php
+++ b/framework/application/forms/CMS/Sub/Realisations/Realisations.php
@@ -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'));
 	}
 
 }
diff --git a/framework/application/forms/Categories.php b/framework/application/forms/Categories.php
index 44950a3..104c86c 100644
--- a/framework/application/forms/Categories.php
+++ b/framework/application/forms/Categories.php
@@ -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'))
diff --git a/framework/application/forms/Domaines.php b/framework/application/forms/Domaines.php
index 2838306..020bf32 100644
--- a/framework/application/forms/Domaines.php
+++ b/framework/application/forms/Domaines.php
@@ -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'))
diff --git a/framework/application/forms/Tags.php b/framework/application/forms/Tags.php
index 964728a..6673a56 100644
--- a/framework/application/forms/Tags.php
+++ b/framework/application/forms/Tags.php
@@ -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'))
diff --git a/framework/application/forms/Technologies.php b/framework/application/forms/Technologies.php
index 3e79b64..abd32e6 100644
--- a/framework/application/forms/Technologies.php
+++ b/framework/application/forms/Technologies.php
@@ -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'))
diff --git a/framework/application/models/Realisation.php b/framework/application/models/Realisation.php
index 3e45c9f..da56289 100644
--- a/framework/application/models/Realisation.php
+++ b/framework/application/models/Realisation.php
@@ -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);
diff --git a/framework/application/views/helpers/HomeSlideshow.php b/framework/application/views/helpers/HomeSlideshow.php
index 771aff5..71250be 100644
--- a/framework/application/views/helpers/HomeSlideshow.php
+++ b/framework/application/views/helpers/HomeSlideshow.php
@@ -1,48 +1,47 @@
-<?php
-
-class Cubedesigners_View_Helper_HomeSlideshow extends Zend_View_Helper_Abstract {
-
-    public function homeSlideshow($slides) {
-
-        $slides = $slides['slides'];
-        fb($slides);
-
-        $res = '<div class="slides">';
-
-        foreach ($slides as $id => $slide) {
-
-            $l = '';
-
-            if (!empty($slide["lien"]["page"])) {
-                $page = $this->view->navigation()->getContainer()->findOneById($this->view->localeDefault() . '/' . $slide["lien"]["page"]);
-                $l = $page->getHref();
-            }
-
-            if (!empty($slide["lien"]["url"]) && empty($l)) {
-                $l = $slide["lien"]["url"];
-            }
-
-
-            $image = $this->view->imageProcess()->imageProcessGetUrl($slide['image'], $slide['legende'], 980, 400);
-
-            if (!$slide['time']) {
-                $time = 6000;
-            } else {
-                $time = $slide['time'] * 1000;
-            }
-
-            $res.='<div class="slide" id="slide-' . $id . '" data-link="' . $l . '" data-image="' . $image . '" data-legend="' . $slide['legende'] . '" data-time="' . $time . '"></div>';
-        }
-
-
-        $res .= '</div>';
-        $res .= '<a href="#" class="next"></a>';
-        $res .= '<a href="#" class="prev"></a>';
-        $res .= '<div id="slide-legend"></div>';
-
-        return $res;
-    }
-
-}
-
-?>
+<?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;
+	}
+
+}
+
+?>
diff --git a/framework/application/views/scripts/common/content.phtml b/framework/application/views/scripts/common/content.phtml
index b7a57a9..77b95ae 100644
--- a/framework/application/views/scripts/common/content.phtml
+++ b/framework/application/views/scripts/common/content.phtml
@@ -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>';
diff --git a/framework/application/views/scripts/common/header.phtml b/framework/application/views/scripts/common/header.phtml
index 698b263..955b49a 100644
--- a/framework/application/views/scripts/common/header.phtml
+++ b/framework/application/views/scripts/common/header.phtml
@@ -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);
diff --git a/framework/application/views/scripts/templates/home.phtml b/framework/application/views/scripts/templates/home.phtml
index 1eadbae..e8d15ef 100644
--- a/framework/application/views/scripts/templates/home.phtml
+++ b/framework/application/views/scripts/templates/home.phtml
@@ -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'));
diff --git a/less/common.less b/less/common.less
index aa81cb6..78f1942 100644
--- a/less/common.less
+++ b/less/common.less
@@ -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{
diff --git a/less/header.less b/less/header.less
index 48999c7..93f44d9 100644
--- a/less/header.less
+++ b/less/header.less
@@ -1,5 +1,5 @@
 #header {
-    height:130px;
+    height:168px;
 
     ul{
 		text-transform: uppercase;
diff --git a/less/home.less b/less/home.less
index d5c159f..6d834a1 100644
--- a/less/home.less
+++ b/less/home.less
@@ -16,70 +16,87 @@
 
 /* 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;
 }