#698

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index 5806d35d03bddf3b9ecbfcfd7d7c964698e47b05..7af82994223de1921bfbd03c5b2a38462549a711 100644 (file)
--- 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 a1ccdd6219aab36ad33ab0fa8beaea94d2a4cbb8..ab6feffe937ebd9d679263ee28c703ef031704b3 100644 (file)
--- 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 e6d1ea47900ff5e7746824fd3613f31948d6de44..18d3a3a4f2d7cbd84d7d0f349894b32dd7743382 100644 (file)
--- 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>';\r
 echo '<div id="contentWrapper">'; // Needed because FullPage.js doesn't work when the wrapper is a <main> element\r
 echo $content;\r
-echo $this->render('common/footer.phtml');\r
+\r
 echo '</div>';\r
 echo '</main>';\r
+echo $this->render('common/footer.phtml');\r
 echo '</div>';\r

diff --git a/framework/languages/en.php b/framework/languages/en.php
index e5913406184eef2baedf7267f095abf05c8e1066..b49ea7b7d84e6e801e38dd9a0e215c376f72ce03 100644 (file)
--- 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 (file)
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 58e895fa34eba2ecd75d4d847b5be9ee33c842db..967973bfc0018e9dea46e3b5597fbc8fd145ebac 100644 (file)
--- a/js/002-common.js
+++ b/js/002-common.js
@@ -71,10 +71,10 @@ function resize() {
 \r
     var mainHeight = wh;\r
     $("footer").each(function () {\r
-        mainHeight -= $(this).outerHeight();\r
+        mainHeight -= $(this).outerHeight()*zoom;\r
     });\r
 \r
-    $('main').css('min-height', mainHeight);\r
+    $('main').css('min-height', mainHeight/zoom);\r
 \r
     // Handle divs with background images that must have a proportional min-height\r
     $('body:not(.home) [data-bg-ratio]').each(function () {\r
@@ -119,11 +119,11 @@ function setZoom(ww) {
     }\r
 \r
     $('#z,header').css('transform', transform);\r
-    if(Modernizr.ie10 || Modernizr.ie11){\r
-        if(zoom>1) {\r
+    if (Modernizr.ie10 || Modernizr.ie11) {\r
+        if (zoom > 1) {\r
             $("#mm-0").css('height', h + 60);\r
         }\r
-        $("#footerHolder").css('transform',transform);\r
+        $("#footerHolder").css('transform', transform);\r
     }\r
 }\r
 \r

diff --git a/js/101-header.js b/js/101-header.js
index 36c359adcb096889290ced2b87ba480c891337f1..55a6c2477bbe5d42addfb2e95b24ae577616813b 100644 (file)
--- a/js/101-header.js
+++ b/js/101-header.js
@@ -38,6 +38,7 @@ function resizeHeader() {
 function setHeaderAnimation() {\r
     var h = $('#h');\r
     home = $('body').hasClass('home');\r
+    var error = $('#error').length > 0;\r
     var fullPages = $('body').hasClass('fullpages'); // Are we in full page mode?\r
 \r
     if (htl !== undefined) {\r
@@ -49,8 +50,14 @@ function setHeaderAnimation() {
     // Background-color & height\r
     htl.add(TweenMax.fromTo(h, 1.5, {height: 90}, {height: 75}), 0);\r
 \r
-    if (home && (isMobile() || !fullPages)) {\r
-        htl.add(TweenMax.fromTo($("#h,#nav-icon"), 1, {className: $("main section:first").data('headerstyle')}, {className: "-=light"}), 1);\r
+    if ((home || error) && (isMobile() || !fullPages)) {\r
+        var c;\r
+        if (home) {\r
+            c = $("main section:first").data('headerstyle');\r
+        } else if (error) {\r
+            c = 'light';\r
+        }\r
+        htl.add(TweenMax.fromTo($("#h,#nav-icon"), 1, {className: c}, {className: "-=light"}), 1);\r
     }\r
     if (fullPages && !isMobile()) {\r
         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);\r

diff --git a/less/002-common.less b/less/002-common.less
index d10cf89b94d93bb9aac14b56a3d29323e6b0cbab..39e11bf395cdf6121d10c7f452532b83b6935dd1 100644 (file)
--- a/less/002-common.less
+++ b/less/002-common.less
@@ -1,5 +1,16 @@
 @import "000-imports";\r
 \r
+::selection {\r
+       background: #8AAB41;\r
+       color: #fff;\r
+}\r
+\r
+::-moz-selection {\r
+       background: #8AAB41;\r
+       color: #fff;\r
+}\r
+\r
+\r
 html {\r
        box-sizing: border-box;\r
 }\r