Minor adjustments based on feedback from Vincent

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index d50547da50954a041586c7aef10916476f232a64..e8d095126adf153806246cb705628eb4b6bf7fa0 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.domain = physioassist.fr
 
 webhost = www.
 
@@ -44,8 +45,8 @@ navigation.containers[] = 0;
 navigation.containers[] = -2;
 navigation.containers[] = -3;
 
-locales.fr =
-;locales.en =
+locales.fr = simeox.dev.cubedesigners.com
+locales.en = en.simeox.dev.cubedesigners.com
 
 
 acl.perpage = true
@@ -63,6 +64,8 @@ privacy.analytics = true
 
 dev = true
 
+session.domain = simeox.dev.cubedesigners.com
+
 minify.js = false
 
 seo.universalAnalytics =

diff --git a/framework/application/layouts/scripts/layout.phtml b/framework/application/layouts/scripts/layout.phtml
index 5aa0a6bb6d5cb468972dd3cf11d5f47fc63f68c7..90add3df1daac230a38c8d73642f6ddeda105764 100644 (file)
--- a/framework/application/layouts/scripts/layout.phtml
+++ b/framework/application/layouts/scripts/layout.phtml
@@ -23,7 +23,7 @@ $fonts = array('google' => array('families' => array('Open+Sans:400,300,600,300i
 $this->headScript()->addWebFont($fonts);
 
 // Set viewport width for mobile devices
-$this->headMeta()->setName('viewport', 'width=960');
+$this->headMeta()->setName('viewport', 'width=1100');
 
 profile(__FILE__, __LINE__, 'Before rendering body');
 $res = $this->htmlPage($this->render('common/body.phtml'));

diff --git a/framework/application/views/helpers/PartnerLogos.php b/framework/application/views/helpers/PartnerLogos.php
index 83f217dd96d51e217542336fe71274f46fed7385..a5f47f90c349fd745d40f0747601f4a324dbbdf4 100644 (file)
--- a/framework/application/views/helpers/PartnerLogos.php
+++ b/framework/application/views/helpers/PartnerLogos.php
@@ -8,9 +8,8 @@ class Simeox_View_Helper_PartnerLogos extends CubeIT_View_Helper_Abstract {
 
         foreach($logos as $l) {
             $attribs = !empty($l['description']) ? array('data-tooltip' => $l['description']) : array();
-            $res .= $this->link(
-                $this->imageProcess($l['logo'], $l['name'], $maxWidth, $maxHeight, $attribs, 'R', 'C', 'M', false, 'auto', 'transparent'),
-                $l['link']);
+            $img = $this->imageProcess($l['logo'], $l['name'], $maxWidth, $maxHeight, $attribs, 'R', 'C', 'M', false, 'auto', 'transparent');
+            $res .= !empty($l['link']) ? $this->link($img, $l['link']) : $img;
             $res .= ' '; // space needed for justify elements spacing
         }
 

diff --git a/framework/application/views/scripts/common/footer.phtml b/framework/application/views/scripts/common/footer.phtml
index 9c89804b78c48afb17555d60c0beb1758848a95a..e8a3fe46ea3b46fa86e3572ff13a64fe3d1078fc 100644 (file)
--- a/framework/application/views/scripts/common/footer.phtml
+++ b/framework/application/views/scripts/common/footer.phtml
@@ -1,15 +1,17 @@
-<footer>
+<footer class="group">
     <div class="content">
         <nav class="locales">
             <ul>
                 <?php
 
                 $locales = Bootstrap::getInstance()->getOpt('locales');
+                fb($locales, 'locales');
 
                 foreach ($locales as $locale => $url) {
 
                     // Check which locale URL we are on
                     $attr = ($_SERVER['HTTP_HOST'] == $url) ? array('class' => 'active') : array();
+                    $attr['target'] = '_self';
 
                     echo '<li>'. $this->link($locale, 'http://'.$url, $attr) .'</li>';
                 }

diff --git a/framework/application/views/scripts/home/contact.phtml b/framework/application/views/scripts/home/contact.phtml
index f0394f8317332701544c020e962cb6cc3f9611e8..fa3465b54f01c97831f5f6e1d31bc4132acc8454 100644 (file)
--- a/framework/application/views/scripts/home/contact.phtml
+++ b/framework/application/views/scripts/home/contact.phtml
@@ -15,6 +15,9 @@ $address .= $this->microdataProp($c['ville'], 'addressLocality', array('class' =
 //$address .= ' - ';
 //$address .= $this->microdataProp(Zend_Locale::getTranslation($c['pays'], 'territory'), 'addressCountry', array('class' => 'country'));
 
+// Link to Google Maps
+$address = $this->link($address, 'https://www.google.com/maps/place/'. urlencode("{$c['adresse']}, {$c['code_postal']} {$c['ville']}"));
+
 $postalAddress = $this->microdataPostalAddress($address, array('class' => 'address'), 'address');
 
 ?>

diff --git a/js/common.js b/js/common.js
index e31d817759901aad7e160c03b7cbf60b39122d9b..64e12bda0a9382040be3f9a2cf86c75c37d218f7 100644 (file)
--- a/js/common.js
+++ b/js/common.js
@@ -7,33 +7,37 @@ function load_common_once() {
     // Handle cookie banner
     cookieBanner();
 
-    $('a').click(function() {
-        if(!localScrollInitialised) { // Only initalise localscroll after first click
-            $.localScroll({
+    //$('a').click(function() {
+    //    if(!localScrollInitialised) { // Only initalise localscroll after first click
+            $('header.site').localScroll({
                 axis: 'y',
-                //onBefore: onStartAutoScroll,
-                //onAfter: onEndAutoScroll,
                 duration: 1000,
-                hash: true,
+                //hash: true,
                 offset: -65 // For fixed header height
             });
-
-            localScrollInitialised = true;
-        }
-    });
+    //
+    //        localScrollInitialised = true;
+    //    }
+    //});
 
     // Shrinking fixed header
     $(window).scroll(function() {
-        if ($(this).scrollTop() > 100) {
-            $('header.site').addClass("small");
-        } else {
-            $('header.site').removeClass("small");
-        }
+        shrinkHeader();
     });
 
+    shrinkHeader(); // Trigger even when no scroll (eg. page refresh)
+
     $('.partners .logos').imagefit(); // Make sure logos fit onto one line
 }
 
+function shrinkHeader() {
+    if ($(this).scrollTop() > 100) {
+        $('header.site').addClass("small");
+    } else {
+        $('header.site').removeClass("small");
+    }
+}
+
 
 function cookieBanner() {
     if($('#cookieBanner').length) {

diff --git a/less/about.less b/less/about.less
index 100887d6c8c7a44b2c236ea53714709deda3cbed..6498958622cab05f1cc5c67d7476d739932167f5 100644 (file)
--- a/less/about.less
+++ b/less/about.less
@@ -20,7 +20,7 @@
   }
 
   img {
-    padding-top: 2em;
+    padding-top: 1.5em;
   }
 }
 

diff --git a/less/common.less b/less/common.less
index 7e4a1738d2b4b196327cb8566f9c33b81142427f..8d723c22fd81fdb4e2b9aa30c32f5baf481636ab 100644 (file)
--- a/less/common.less
+++ b/less/common.less
@@ -44,7 +44,8 @@ h2 {
 }
 
 p {
-  padding-bottom: 1em;
+  padding: 0.5em 0 1em 0;
+  line-height: 1.5;
 }
 
 .content {
@@ -61,7 +62,7 @@ p {
     background-repeat: no-repeat;
     background-position: 0 5px;
     line-height: 1.5;
-    margin-bottom: 10px;
+    margin-bottom: 13px;
   }
   ul li ul {
     margin-top: 10px;
@@ -82,7 +83,7 @@ header.site {
   width: 100%;
   background-color: #fff;
   z-index: 10;
-  transition: all 0.3s ease;
+  transition: height 0.3s ease;
 
   .content {
     position: relative;
@@ -112,15 +113,13 @@ header.site {
       //font-size: 16px;
       margin-top: 20px;
     }
-    nav.locales {
-      //top: 6px; // or hide completely?
-      opacity: 0;
-    }
   }
 }
 
 main {
   padding-top: @header-height; // offset space for fixed header
+  overflow: hidden;
+  max-width: 100%;
 }
 
 .hero {
@@ -165,6 +164,10 @@ footer {
   }
 }
 
+#cookieBanner {
+  font-size: 12px !important;
+}
+
 #adminBar {
   position: absolute;
   width: 100%;

diff --git a/less/contact.less b/less/contact.less
index a001843736c21af6787dd1a57f3c7049f9e1584d..a073acb514429900e85e1fb2e52ebfac1c6623b4 100644 (file)
--- a/less/contact.less
+++ b/less/contact.less
@@ -42,5 +42,6 @@
     display: inline-block;
     vertical-align: middle;
     font-size: 16px; // needed to reset .jgroup font-size
+    margin-right: 20px; // Small margin for browsers that don't support justify spacing trick
   }
 }
\ No newline at end of file

diff --git a/less/ie8.less b/less/ie8.less
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..64166062260c1d2972035a87b268e61eef4edf3f 100644 (file)
--- a/less/ie8.less
+++ b/less/ie8.less
@@ -0,0 +1,12 @@
+header.site {
+  position: absolute;
+
+  &.small {
+    height: auto;
+
+    .logo {
+      height: inherit;
+      margin-top: inherit;
+    }
+  }
+}
\ No newline at end of file

diff --git a/less/simeox.less b/less/simeox.less
index eb1af75d5fe89af252388ede3ab8084643691b93..3cc7995f08ed2e4ad8c8ac1858c7a0031825d632 100644 (file)
--- a/less/simeox.less
+++ b/less/simeox.less
@@ -71,7 +71,7 @@
 
   .dotclear {
     max-width: 425px;
-    margin-top: 120px;
+    margin-top: 90px;
   }
 
   .video {