From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 26 Nov 2014 11:54:29 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=ff874b41d4bd384ea33b33012a1ffebd926deebd;p=cubedesigners-v7.git

---

diff --git a/.htaccess b/.htaccess
index 3f58494..4570e63 100644
--- a/.htaccess
+++ b/.htaccess
@@ -16,7 +16,7 @@
 	RewriteBase /
 	# Redirection to www. subdomain
 	RewriteCond %{HTTP_HOST} !=www.cubedesigners.fr
-	RewriteCond %{HTTP_HOST} !=www.cubedesigners.com
+	#RewriteCond %{HTTP_HOST} !=www.cubedesigners.com
 	RewriteRule ^(.*)$ http://www.cubedesigners.fr/$1 [R=301,L]
 	# Redirect auth header to env
 	RewriteRule ^.*$ - [E=REMOTE_USER:%{HTTP:Authorization}]
diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php
index a0ba199..2b9d60a 100644
--- a/framework/application/Bootstrap.php
+++ b/framework/application/Bootstrap.php
@@ -128,6 +128,73 @@ class Bootstrap extends CubeIT_Bootstrap {
 		return $templates;
 	}
 
+	/**
+	 *
+	 * @param Zend_Controller_Request_Http $req
+	 * @return boolean|string
+	 */
+	public function handleRedirections($req) {
+		$res = parent::handleRedirections($req);
+		if ($res !== false) {
+			return $res;
+		}
+
+		$path = trim($req->getPathInfo(), '/ ');
+		$e = explode('/', $path);
+		$locale = array_shift($e);
+
+		$res = '/';
+		if ($locale == 'en') {
+			return 'http://en.cubedesigners.com/en/' . $path;
+		}
+
+		if ($locale == 'references_web') {
+			$res.='Portfolio';
+			return $res;
+		}
+
+		if ($locale != 'fr') {
+			return false;
+		}
+
+		if (count($e) == 1) {
+			$u = $e[0];
+			if ($u == '1-Sites-internet') {
+				$res.='Projets-Web';
+			} elseif ($u == '2-Design-graphique') {
+				$res.='Graphisme';
+			} elseif ($u == '3-Design-industriel') {
+				$res.='Design-industriel';
+			} elseif ($u == '4-Multimedia-Jeux') {
+				$res.='Multimedia';
+			} elseif ($u == '5-Films-Animation') {
+				$res.='Multimedia';
+			} elseif ($u == '6-Applications-mobiles') {
+				$res.='Projets-Web';
+			} elseif ($u == '7-En-attente') {
+				$res.='Graphisme';
+			}
+			return $res;
+		}
+
+		if (count($e) == 3) {
+			if ($e[0] == 'Sites-internet') {
+				$e[0] = 'Site-Web';
+			} elseif ($e[0] == 'Multimedia-Jeux') {
+				$e[0] = 'Multimedia';
+			}
+
+			// Projects
+			/// Mobile-applications/Heredis/114-Heredis-App => Applications-mobiles/Heredis-Heredis-App
+			$ee = explode('-', $e[2], 2);
+			array_shift($ee);
+			$res.=$e[0] . '/' . $e[1] . '-' . implode('-', $ee);
+			return $res;
+		}
+
+		return false;
+	}
+
 	public function run() {
 		// run have to be the last call of bootstrap
 		parent::run();
diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index 3f098d0..d4bb0f9 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.cubedesigners.com
+webhost = www.cubedesigners.fr
 
 database.adapter = pdo_mysql
 database.params.host = localhost
diff --git a/framework/application/controllers/IndexController.php b/framework/application/controllers/IndexController.php
index d4df531..cf69518 100644
--- a/framework/application/controllers/IndexController.php
+++ b/framework/application/controllers/IndexController.php
@@ -1,6 +1,5 @@
 <?php
 
 class IndexController extends CubeIT_Controller_IndexController {
-	
-}
 
+}
diff --git a/framework/application/views/helpers/AgencyBlocs.php b/framework/application/views/helpers/AgencyBlocs.php
index 24edab4..f7c13a0 100644
--- a/framework/application/views/helpers/AgencyBlocs.php
+++ b/framework/application/views/helpers/AgencyBlocs.php
@@ -1,37 +1,37 @@
-<?php
-
-class Cubedesigners_View_Helper_AgencyBlocs extends Zend_View_Helper_Abstract {
-
-    public function agencyBlocs($blocs) {
-
-        $blocs = $blocs['blocs'];
-
-        $res = '<div class="blocs">';
-
-        $i = 0;
-
-        foreach ($blocs as $id => $bloc) {
-
-            if (($i % 2) == 0 && $i != 0) {
-                $res.='<div class="spacer"></div>';
-            }
-
-            $image = $this->view->imageProcess()->imageProcessGetUrl($bloc['photo'], $bloc['titre'], 120, 120);
-
-            $res.='<div class="sousbloc" itemscope itemtype="http://schema.org/Person">';
-            $res.='<span style="background:url(\'' . $image . '\') no-repeat" class="photo" itemprop="image"></span>';
-            $res.='<h3 itemprop="name">' . $bloc['titre'] . '</h3>';
-            $res.='<span class="poste" itemprop="jobTitle">' . $bloc['poste'] . '</span>';
-            $res.='<span class="texte">' . $this->view->markupDotclear($bloc['texte']) . '</span>';
-            $res.='</div>';
-
-            $i++;
-        }
-
-        $res .= '</div>';
-        return $res;
-    }
-
-}
-
-?>
+<?php
+
+class Cubedesigners_View_Helper_AgencyBlocs extends Zend_View_Helper_Abstract {
+
+	public function agencyBlocs($blocs) {
+
+		$blocs = $blocs['blocs'];
+
+		$res = '<div class="blocs">';
+
+		$i = 0;
+
+		foreach ($blocs as $id => $bloc) {
+
+			if (($i % 2) == 0 && $i != 0) {
+				$res.='<div class="spacer"></div>';
+			}
+
+			$image = $this->view->imageProcess()->imageProcessGetUrl($bloc['photo'], $bloc['titre'], 120, 120);
+
+			$res.='<div class="sousbloc" itemscope itemtype="http://schema.org/Person">';
+			$res.='<span style="background:url(\'' . $image . '\') no-repeat" class="photo" itemprop="image"></span>';
+			$res.='<h3 itemprop="name">' . $bloc['titre'] . '</h3>';
+			$res.='<span class="poste" itemprop="jobTitle">' . $bloc['poste'] . '</span>';
+			$res.= $this->view->markupDotclear($bloc['texte'], array('class' => 'texte'));
+			$res.='</div>';
+
+			$i++;
+		}
+
+		$res .= '</div>';
+		return $res;
+	}
+
+}
+
+?>
diff --git a/framework/application/views/helpers/FooterActualites.php b/framework/application/views/helpers/FooterActualites.php
index fb0015d..36fa77a 100644
--- a/framework/application/views/helpers/FooterActualites.php
+++ b/framework/application/views/helpers/FooterActualites.php
@@ -9,8 +9,12 @@ class Cubedesigners_View_Helper_FooterActualites extends Zend_View_Helper_Abstra
 		$nbActus = count($actus);
 
 		$res = '<section class="actus">';
+		$res.='<h2>' . __('Actualités') . '</h2>';
 		foreach ($actus as $id => $actu) {
-			$res.='<article class="actu">' . $this->view->dateTime($actu['date'], "dd-MM-y", array('class' => 'date')) . $this->view->markupDotclear($actu['texte']) . '</article>';
+			$res.='<article class="actu">';
+			$res.= $this->view->dateTime($actu['date'], "dd-MM-y", array('class' => 'date'));
+			$res.='<h3>' . nl2br($actu['texte']) . '</h3>';
+			$res.='</article>';
 		}
 		$res.= '</section>';
 
diff --git a/framework/application/views/helpers/RealisationsList.php b/framework/application/views/helpers/RealisationsList.php
index 113e1a1..8d391d5 100644
--- a/framework/application/views/helpers/RealisationsList.php
+++ b/framework/application/views/helpers/RealisationsList.php
@@ -32,7 +32,7 @@ class Cubedesigners_View_Helper_RealisationsList extends CubeIT_View_Helper_Abst
 
 			$rea = $this->view->imageProcess($r->visuel, $r->titre, 170, 127);
 			$rea.='<h2>' . $r->titre . '</h2>';
-			$rea.='<h3>' . Cubedesigners_Util::getCategoryById($r->categories) . ' // ' . $this->dateTime($r->date, Zend_Date::YEAR) . '</h3>';
+			$rea.='<h3>' . Cubedesigners_Util::getCategoryById($r->categories) . ' / ' . $this->dateTime($r->date, Zend_Date::YEAR) . '</h3>';
 
 			$url = Cubedesigners_Util::generateAutoUri($r, $datas['seourl_rea']);
 
diff --git a/framework/application/views/helpers/Twocols.php b/framework/application/views/helpers/Twocols.php
index 6f82a95..6905233 100644
--- a/framework/application/views/helpers/Twocols.php
+++ b/framework/application/views/helpers/Twocols.php
@@ -5,10 +5,10 @@ class Cubedesigners_View_Helper_Twocols extends Zend_View_Helper_Abstract {
 	public function twocols($displayTitle = true) {
 		$this->view->headLink()->appendStylesheet('/less/twocols.less');
 		$res = '<div class="twocols">';
+		$res.='<section>';
 		if ($displayTitle) {
 			$res.= '<div class="title">' . $this->view->markupDotclear($this->view->titre) . '</div>';
 		}
-		$res.='<section>';
 		$res.='<div class="cols">';
 		$res.='<div class="col">' . $this->view->markupDotclear($this->view->colonnegauche) . '</div>';
 		$res.='<div class="col">' . $this->view->markupDotclear($this->view->colonnedroite) . '</div>';
diff --git a/framework/application/views/scripts/common/footer.phtml b/framework/application/views/scripts/common/footer.phtml
index 53ee8d1..005a7af 100644
--- a/framework/application/views/scripts/common/footer.phtml
+++ b/framework/application/views/scripts/common/footer.phtml
@@ -19,7 +19,6 @@ echo $this->clear();
                     </div>
 
                     <div class="bloc">
-                        <h2><?php echo __("Actualités"); ?></h2>
 						<?php echo $this->footerActualites($this->option('actus')); ?>
 						<div class="social">
 							<h2><?php echo __("Suivez-nous"); ?></h2>
@@ -45,7 +44,7 @@ echo $this->clear();
 						<?php
 						$fr = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
 						if (!isset($this->enversion)) {
-							$en = 'http://www.cubedesigners.com/en';
+							$en = 'http://en.cubedesigners.com/en/';
 						} else {
 							$en = $this->enversion;
 						}
diff --git a/framework/application/views/scripts/common/header.phtml b/framework/application/views/scripts/common/header.phtml
index 8b7fefb..43868fd 100644
--- a/framework/application/views/scripts/common/header.phtml
+++ b/framework/application/views/scripts/common/header.phtml
@@ -14,12 +14,14 @@ if (!is_null($homepage)) {
 		/* LOGO */
 
 		echo $this->link($this->image('/images/logo.svg', '', 318, 132), $home, array('class' => 'logo'));
-		echo '<div class="sublogo"><h1>Cubedesigners</h1><h2>Agence de création sur mesure</h2></div>';
-
+		if ($this->currentPage && $this->currentPage->getTemplate() == 'home') {
+			echo '<div class="sublogo"><h1>Cubedesigners</h1><h2>Agence de création sur mesure</h2></div>';
+		} else {
+			echo '<div class="sublogo"><h2>Cubedesigners</h2><h3>Agence de création sur mesure</h3></div>';
+		}
 
 		/* NAVIGATION */
 		$mainMenu = $this->navigation()->findOneById($this->localeDefault() . '/' . CubeIT_Navigation::MAIN);
-
 		echo $this->navigation()->menu()->renderMenu($mainMenu, array('maxDepth' => 0)) . "\n";
 		?>
 
diff --git a/framework/application/views/scripts/realisations/index.phtml b/framework/application/views/scripts/realisations/index.phtml
index 753fd69..d277a15 100644
--- a/framework/application/views/scripts/realisations/index.phtml
+++ b/framework/application/views/scripts/realisations/index.phtml
@@ -1,7 +1,7 @@
 <?php
 
 $r = CubeIT_Util_Cms::unserialize($this->realisation);
-$this->headTitle($r->titre . ' - ' . $r->legende . ' // ' . $this->currentPage->getParent()->getTitle(), 'SET');
+$this->headTitle($r->titre . ' - ' . $r->legende . ' / ' . $this->currentPage->getParent()->getTitle(), 'SET');
 $this->headSeo()->setDescription($this->realisation->description);
 $this->headOpenGraph()->setDescription($this->realisation->description);
 
diff --git a/framework/application/views/scripts/studies/index.phtml b/framework/application/views/scripts/studies/index.phtml
index 75ad2d1..7c83916 100644
--- a/framework/application/views/scripts/studies/index.phtml
+++ b/framework/application/views/scripts/studies/index.phtml
@@ -1,5 +1,5 @@
 <?php
-$this->headTitle($this->titre . ' // ' . $this->currentPage->getParent()->getTitle() . ' // Cubedesigners', 'SET');
+$this->headTitle($this->titre . ' / ' . $this->currentPage->getParent()->getTitle() . ' // Cubedesigners', 'SET');
 $this->headSeo()->setDescription($this->studie->legende);
 $this->headOpenGraph()->setDescription($this->studie->legende);
 $this->headScript()->addScriptAndStyle('casestudies_detail');
diff --git a/framework/application/views/scripts/templates/agence.phtml b/framework/application/views/scripts/templates/agence.phtml
index e849aef..200d1e6 100644
--- a/framework/application/views/scripts/templates/agence.phtml
+++ b/framework/application/views/scripts/templates/agence.phtml
@@ -3,28 +3,17 @@ $this->headScript()->addScriptAndStyle('agence');
 $this->headScript()->addScriptAndStyle('slideshow');
 echo $this->twocols();
 ?>
+<div class="agency-pictos">
+	<div class="bloc-holder">
+		<?php echo $this->agencyPictos($this->pictos); ?>
+	</div>
+</div>
 
+<div class="agency-photo"><?php echo $this->imageSlideshowContinuous($this->photo, 650, array(), array('arrowspermanent' => 1)); ?></div>
 
-<section>
-    <div class="agency-pictos">
-        <div class="bloc-holder">
-			<?php echo $this->agencyPictos($this->pictos); ?>
-        </div>
-    </div>
-</section>
-
-<section>
-    <div class="agency-photo"><?php echo $this->imageSlideshowContinuous($this->photo, 650, array(), array('arrowspermanent' => 1)); ?></div>
-</section>
-
-<section>
-    <div class="agency-persons">
-        <div class="bloc-holder">
-
-            <h2><?php echo ucfirst($this->equipe['titre']); ?></h2>
-
-			<?php echo $this->agencyBlocs($this->equipe); ?>
-
-        </div>
-    </div>
+<section class="agency-persons">
+	<div class="bloc-holder">
+		<h2><?php echo ucfirst($this->equipe['titre']); ?></h2>
+		<?php echo $this->agencyBlocs($this->equipe); ?>
+	</div>
 </section>
\ No newline at end of file
diff --git a/less/agence.less b/less/agence.less
index 1da7ac5..9726aef 100644
--- a/less/agence.less
+++ b/less/agence.less
@@ -99,10 +99,3 @@
         border-radius: 60px;
     }
 }
-
-
-/* max-width pour faibles résolutions */
-@media screen and (max-width: 1009px) {
-
-
-}
\ No newline at end of file
diff --git a/less/footer.less b/less/footer.less
index 7da5f7a..eee0a7f 100644
--- a/less/footer.less
+++ b/less/footer.less
@@ -29,12 +29,12 @@
 				}
 
 				.actus{
-					height: 262px;
+					height:366px;
 					.actu {
 						color:#6c6c6c;
 						padding-bottom: 20px;
 
-						.dotclear {
+						h3 {
 							width:90%;
 							font-size:16px;
 							line-height:20px;
@@ -105,6 +105,10 @@
 			padding:8px 0 0 0;
 		}
 
+		.Pinterest{
+			display:none;
+		}
+
 		.Facebook:hover {
 			background-color: #39599f;
 		}