]> _ Git - physioassist.git/commitdiff
#simeox : Disable english version
authorvincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Thu, 10 Mar 2016 13:33:42 +0000 (13:33 +0000)
committervincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Thu, 10 Mar 2016 13:33:42 +0000 (13:33 +0000)
Put online
Enable google & bing sitemaps
@0:30

framework/application/configs/application.ini
framework/application/forms/Settings.php
framework/application/views/scripts/common/footer.phtml
less/navigation.less

index f4b2f98a04868fa87c7412c94e3a6a819e0c898e..4890a58aa79099045f9963132d06f75b494d5558 100644 (file)
@@ -1,5 +1,5 @@
 [production]
-dev = true
+dev = false
 
 minify.js = true
 minify.css = true
@@ -20,7 +20,7 @@ session.lifetime = 31536000 ;1 year
 session.adapter = cache
 session.domain = physioassist.com
 
-webhost = www.
+webhost = www.physioassist.com
 
 database.adapter = pdo_mysql
 
@@ -29,10 +29,9 @@ database.params.username = physioastpwww
 database.params.password = IFuXxDtYqLZ6
 database.params.dbname = physioastpwww
 
-
 seo.universalAnalytics = UA-74498434-1
-seo.google =
-seo.bing =
+seo.google = google93c0129ef18a399d.html
+seo.bing = 8986457D1D126C38A815027C839372DC
 
 navigation.containers[] = 0;
 navigation.containers[] = -2;
@@ -41,7 +40,6 @@ navigation.containers[] = -3;
 locales.fr = www.physioassist.com
 locales.en = en.physioassist.com
 
-
 acl.perpage = true
 acl.roles[] = superadmin
 acl.roles[] = admin
@@ -53,9 +51,6 @@ compat_ie = 8
 privacy.enabled = true
 privacy.analytics = true
 
-httpauth.username = physio
-httpauth.password = assist2016z
-
 [testing : production]
 
 dev = true
@@ -76,4 +71,7 @@ robots = false
 locales.fr = simeox.dev.cubedesigners.com
 locales.en = en.simeox.dev.cubedesigners.com
 
-webhost = simeox.dev.cubedesigners.com
\ No newline at end of file
+webhost = simeox.dev.cubedesigners.com
+
+httpauth.username = physio
+httpauth.password = assist2016z
\ No newline at end of file
index e9409e75d716b6f4d8011f7308670ad763d2da7d..3dd3173c7e1f32db1115cc09613bd9e533896534 100644 (file)
@@ -7,6 +7,10 @@ class Simeox_Form_Settings extends CubeIT_Form_Settings {
 
                $this->setTitle('Edition des paramètres du site');
 
+               $locales = new CubeIT_Form_Element_LocalesMultiCheckbox('localesEnabled');
+               $locales->setLabel('Langues actives');
+               $this->addElement($locales);
+
                $logo = new CubeIT_Form_Element_File_Image('site_logo');
                $logo->setLabel('Logo principal');
                $this->addElement($logo);
index 40e13ea49f566345720e2640632548598e82aa6d..2ffdc7a5ecff3f1a18fb00a147bac3e1bca3328d 100644 (file)
@@ -1,23 +1,8 @@
 <footer class="group">
        <div class="content">
-               <nav class="locales">
-                       <ul>
-                               <?php
-
-                               $locales = Bootstrap::getInstance()->getOpt('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>';
-                               }
-
-                               ?>
-                       </ul>
-               </nav>
+               <?php
+               echo $this->localeNavigation(true, CubeIT_View_Helper_LocaleNavigation::BIGRAMME);
+               ?>
 
                <?php echo $this->markupDotclear($this->option('footer')); ?>
        </div>
index 7fd7d3e51056f1edea620c514c307f391d33b053..460a3583d171848951de857bd6bd41867fd19465 100644 (file)
@@ -30,18 +30,14 @@ nav.primary {
   }
 }
 
-nav.locales {
+nav.locale {
   font-size: 11px;
   font-weight: 300;
   float: right;
 
-  li {
-    display: inline-block;
-    line-height: 44px;
-    margin: 0 0 0 5px;
-  }
-
   a {
+    display: inline-block;
+    margin: 8px 0 0 5px;
     width: 28px;
     height: 28px;
     line-height: 28px;