(no commit message)

diff --git a/.htaccess b/.htaccess
index 47155715bee48b7b30b0851623c1fdf725d7db94..3f5849485ab36f49cdaacec303e9185b930348b8 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -9,22 +9,14 @@
        php_flag magic_quotes_sybase off
 </IfModule>
 
-# Specific OVH Environnement variables
-<IfModule mod_env.c>
-       SetEnv PHP_VER 5_4
-       SetEnv ZEND_OPTIMIZER 1
-       SetEnv REGISTER_GLOBALS 0
-       SetEnv MAGIC_QUOTES 0
-       SetEnv SESSION_USE_TRANS_SID 0
-</IfModule>
-
 # Rewrite for Zend Framework
 <IfModule mod_rewrite.c>
        Options +FollowSymlinks
        RewriteEngine on
        RewriteBase /
        # Redirection to www. subdomain
-       RewriteCond %{HTTP_HOST} ^cubedesigners.fr$
+       RewriteCond %{HTTP_HOST} !=www.cubedesigners.fr
+       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/views/scripts/common/footer.phtml b/framework/application/views/scripts/common/footer.phtml
index d0532a8c76896bb21f8a1f6ff743c91b09428ecd..29ec12f882d85867d346fe2151e19e576bba6bab 100644 (file)
--- a/framework/application/views/scripts/common/footer.phtml
+++ b/framework/application/views/scripts/common/footer.phtml
@@ -39,13 +39,29 @@ if (!is_null($mentions_page)) {
             </div>
 
             <div class="footer-bottom">
-                               <?php
-                               echo $this->option('copyright');
+                               <div class="content">
+                                       <div class="copyright">
+                                               <?php
+                                               echo $this->option('copyright');
 
-                               if (!is_null($mentions)) {
-                                       echo ' | <a href="' . $mentions . '">' . ucfirst($mentions_page->title) . '</a>';
-                               }
-                               ?>
+                                               if (!is_null($mentions)) {
+                                                       echo ' <a href="' . $mentions . '">' . ucfirst($mentions_page->title) . '</a>';
+                                               }
+                                               ?>
+                                       </div>
+                                       <nav  class="locales">
+                                               <?php
+                                               $fr = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+                                               if (!isset($this->enversion)) {
+                                                       $en = 'http://www.cubedesigners.com/en';
+                                               } else {
+                                                       $en = $this->enversion;
+                                               }
+                                               echo $this->link('fr', $fr, array('class' => 'active', array('hreflang' => 'en')));
+                                               echo $this->link('en', $en, array('hreflang' => 'en'));
+                                               ?>
+                                       </nav>
+                               </div>
             </div>
         </div>
     </div>

diff --git a/less/footer.less b/less/footer.less
index 23c821106c0a5d7c0f1d600a7fa70b392ae1ddeb..06e2d1c3e8773608735059b5023294c521a5a001 100644 (file)
--- a/less/footer.less
+++ b/less/footer.less
@@ -124,9 +124,36 @@
                background-color: #191919;
                height: 30px;
                color: #6c6c6c;
-               text-align: center;
+               text-align: left;
                font-size: 12px;
                line-height: 30px;
+               padding:8px 0;
+
+               .copyright{
+                       display:inline-block;
+                       float:left;
+               }
+
+               .locales{
+                       float:right;
+                       a{
+                               display:inline-block;
+                               line-height: 30px;
+                               text-transform: uppercase;
+                               height:30px;
+                               width:30px;
+                               border-radius: 30px;
+                               background-color:#282828;
+                               color:#616161;
+                               text-align:center;
+                               margin:0 0 0 10px;
+
+                               &.active,&:hover{
+                                       background-color:#3885e0;
+                                       color:#fff;
+                               }
+                       }
+               }
        }
 
 }