From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 23 Sep 2016 13:39:07 +0000 (+0000)
Subject: #698
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=857e21dafbb51c12d151490fc2920fff5443f606;p=fluidbook-v3.git

#698
---

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index 5806d35..7af8299 100644
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -18,6 +18,7 @@ timezone = 'Europe/Paris'
 
 session.lifetime = 31536000 ;1 year
 session.adapter = cache
+session.cookieDomain = fluidbook.com
 
 database.adapter = pdo_mysql
 database.params.host = localhost
diff --git a/framework/application/forms/Settings.php b/framework/application/forms/Settings.php
index a1ccdd6..ab6feff 100644
--- a/framework/application/forms/Settings.php
+++ b/framework/application/forms/Settings.php
@@ -64,6 +64,10 @@ class Fluidbook_Form_Settings extends CubeIT_Form_Settings {
 		$social = new Fluidbook_Form_CMS_Sub_Social_Networks();
 		$social->setLegend('Réseaux Sociaux');
 		$this->addSubFormLocalized($social, 'social_networks');
+
+		$e404 = new CubeIT_Form_Element_Markitup('e404');
+		$e404->setLabel('Erreur 404');
+		$this->addElementLocalized($e404);
 	}
 
 }
\ No newline at end of file
diff --git a/framework/application/views/scripts/common/content.phtml b/framework/application/views/scripts/common/content.phtml
index e6d1ea4..18d3a3a 100644
--- a/framework/application/views/scripts/common/content.phtml
+++ b/framework/application/views/scripts/common/content.phtml
@@ -6,7 +6,8 @@ echo '<div id="z">';
 echo '<main>';
 echo '<div id="contentWrapper">'; // Needed because FullPage.js doesn't work when the wrapper is a <main> element
 echo $content;
-echo $this->render('common/footer.phtml');
+
 echo '</div>';
 echo '</main>';
+echo $this->render('common/footer.phtml');
 echo '</div>';
diff --git a/framework/languages/en.php b/framework/languages/en.php
index e591340..b49ea7b 100644
--- a/framework/languages/en.php
+++ b/framework/languages/en.php
@@ -1,4 +1,28 @@
 <?php
 $translations = array (
-
+  'Prénom' => 'First name',
+  'Nom' => 'Last name',
+  'Veuillez indiquer votre nom' => 'Please indicate your name',
+  'Nom de la société' => 'Company name',
+  'Veuillez indiquer le nom de votre société' => 'Please indicate the name of your company',
+  'Vous êtes' => 'You are',
+  'Une agence de communication' => 'A communication agency',
+  'Un créatif freelance' => 'A freelancer',
+  'Une société' => 'A company',
+  'Autre' => 'Other',
+  'Veuillez indiquer le type de votre société' => 'Please indicate your company sector',
+  'Email professionnel' => 'Work email',
+  'Veuillez indiquer une adresse e-mail valide' => 'Please enter a valid email address',
+  'Téléphone' => 'Telephone',
+  'Commentaires sur votre projet' => 'Remarks about your project',
+  'Envoyer la demande' => 'Send the request',
+  'Tél :' => 'Tel:',
+  'email :' => 'email:',
+  'Tél.' => 'Tel.',
+  'Plan du site' => 'Site map',
+  'Demander un devis' => 'Ask for a quote',
+  'Contactez-nous' => 'Contact us',
+  'Voir le Fluidbook' => 'See the Fluidbook',
+  'Demandez un devis' => 'Ask for a quote',
+  'Contact' => 'Contact',
 );
\ No newline at end of file
diff --git a/images/error/404/background.jpg b/images/error/404/background.jpg
new file mode 100644
index 0000000..11eed92
Binary files /dev/null and b/images/error/404/background.jpg differ
diff --git a/js/002-common.js b/js/002-common.js
index 58e895f..967973b 100644
--- a/js/002-common.js
+++ b/js/002-common.js
@@ -71,10 +71,10 @@ function resize() {
 
     var mainHeight = wh;
     $("footer").each(function () {
-        mainHeight -= $(this).outerHeight();
+        mainHeight -= $(this).outerHeight()*zoom;
     });
 
-    $('main').css('min-height', mainHeight);
+    $('main').css('min-height', mainHeight/zoom);
 
     // Handle divs with background images that must have a proportional min-height
     $('body:not(.home) [data-bg-ratio]').each(function () {
@@ -119,11 +119,11 @@ function setZoom(ww) {
     }
 
     $('#z,header').css('transform', transform);
-    if(Modernizr.ie10 || Modernizr.ie11){
-        if(zoom>1) {
+    if (Modernizr.ie10 || Modernizr.ie11) {
+        if (zoom > 1) {
             $("#mm-0").css('height', h + 60);
         }
-        $("#footerHolder").css('transform',transform);
+        $("#footerHolder").css('transform', transform);
     }
 }
 
diff --git a/js/101-header.js b/js/101-header.js
index 36c359a..55a6c24 100644
--- a/js/101-header.js
+++ b/js/101-header.js
@@ -38,6 +38,7 @@ function resizeHeader() {
 function setHeaderAnimation() {
     var h = $('#h');
     home = $('body').hasClass('home');
+    var error = $('#error').length > 0;
     var fullPages = $('body').hasClass('fullpages'); // Are we in full page mode?
 
     if (htl !== undefined) {
@@ -49,8 +50,14 @@ function setHeaderAnimation() {
     // Background-color & height
     htl.add(TweenMax.fromTo(h, 1.5, {height: 90}, {height: 75}), 0);
 
-    if (home && (isMobile() || !fullPages)) {
-        htl.add(TweenMax.fromTo($("#h,#nav-icon"), 1, {className: $("main section:first").data('headerstyle')}, {className: "-=light"}), 1);
+    if ((home || error) && (isMobile() || !fullPages)) {
+        var c;
+        if (home) {
+            c = $("main section:first").data('headerstyle');
+        } else if (error) {
+            c = 'light';
+        }
+        htl.add(TweenMax.fromTo($("#h,#nav-icon"), 1, {className: c}, {className: "-=light"}), 1);
     }
     if (fullPages && !isMobile()) {
         htl.add(TweenMax.fromTo(h, 0.75, {backgroundColor: 'transparent', boxShadow: '0 0 0 rgba(0,0,0,0)'}, {backgroundColor: 'transparent', boxShadow: '0 0 0 rgba(0,0,0,0)'}), 0);
diff --git a/less/002-common.less b/less/002-common.less
index d10cf89..39e11bf 100644
--- a/less/002-common.less
+++ b/less/002-common.less
@@ -1,5 +1,16 @@
 @import "000-imports";
 
+::selection {
+	background: #8AAB41;
+	color: #fff;
+}
+
+::-moz-selection {
+	background: #8AAB41;
+	color: #fff;
+}
+
+
 html {
 	box-sizing: border-box;
 }