wip #6989 @0.5

diff --git a/framework/application/forms/CMS/Sub/Contact/Offices.php b/framework/application/forms/CMS/Sub/Contact/Offices.php
index fbb1fa16f03e28e5d21d967df358830429d5ebfa..7a459c2df3fcd456064f09c7c2d1ad3597567a41 100644 (file)
--- a/framework/application/forms/CMS/Sub/Contact/Offices.php
+++ b/framework/application/forms/CMS/Sub/Contact/Offices.php
@@ -7,8 +7,8 @@ class Cubedesigners_Form_CMS_Sub_Contact_Offices extends CubeIT_Form_Multi_SubFo
 
         $office = new Cubedesigners_Form_CMS_Sub_Contact_Office();
         $this->setBaseSubForm($office);
-        $this->setBaseLegend('Edition du bureau « $coordonnees »');
-        $this->setNewLegend('Nouveau bureau');
+        $this->setBaseLegend('Edit office « $coordonnees »');
+        $this->setNewLegend('New office');
     }
 
 }

diff --git a/framework/application/forms/CMS/Sub/Coordonnees.php b/framework/application/forms/CMS/Sub/Coordonnees.php
index dcf6cb80e7e4013857e25e762f2b0686efc925fa..775fe6dc44eab25707264288fa439638e6696657 100644 (file)
--- a/framework/application/forms/CMS/Sub/Coordonnees.php
+++ b/framework/application/forms/CMS/Sub/Coordonnees.php
@@ -4,13 +4,13 @@ class Cubedesigners_Form_CMS_Sub_Coordonnees extends CubeIT_Form_Adresse {
 
     public function init() {
         $nom = new Zend_Form_Element_Text('nom');
-        $nom->setLabel('Nom');
+        $nom->setLabel('Name');
         $this->addElement($nom);
 
         parent::init();
 
         $tel = new CubeIT_Form_Element_Phone('tel');
-        $tel->setLabel('Téléphone');
+        $tel->setLabel('Phone');
         $this->addElement($tel);
 
         $fax = new CubeIT_Form_Element_Phone('fax');

diff --git a/framework/application/forms/CMS/Sub/MapPoint.php b/framework/application/forms/CMS/Sub/MapPoint.php
index ebf68e279545813bae795ffa7bce2dc404a57f71..422b74bbb2c797992b04a03ec174f982db137c21 100644 (file)
--- a/framework/application/forms/CMS/Sub/MapPoint.php
+++ b/framework/application/forms/CMS/Sub/MapPoint.php
@@ -6,7 +6,7 @@ class Cubedesigners_Form_CMS_Sub_MapPoint extends Cubedesigners_Form_CMS_Sub_Coo
         parent::init();
 
         $icon = new CubeIT_Form_Element_File_Image('icon');
-        $icon->setLabel('Icône');
+        $icon->setLabel('Icon');
         $this->addElement($icon);
     }
 

diff --git a/framework/application/forms/CMS/Sub/MapSettings.php b/framework/application/forms/CMS/Sub/MapSettings.php
index 73950cc829ba83c6651ccdac1e9679cf3d4ae4fc..b2198a00eccf4068a25ac6e8ff1aeebd90a1945c 100644 (file)
--- a/framework/application/forms/CMS/Sub/MapSettings.php
+++ b/framework/application/forms/CMS/Sub/MapSettings.php
@@ -6,15 +6,15 @@ class Cubedesigners_Form_CMS_Sub_MapSettings extends CubeIT_Form_SubForm {
         parent::init();
 
         $zoom = new CubeIT_Form_Element_Int('zoom');
-        $zoom->setLabel('Niveau de zoom');
+        $zoom->setLabel('Zoom level');
         $this->addElement($zoom);
 
         $centre = new CubeIT_Form_Adresse('centre');
-        $centre->setLegend('Centrer la carte sur');
+        $centre->setLegend('Center map on');
         $this->addSubForm($centre, 'centre');
 
         $google = new CubeIT_Form_Element_Url('googleLink');
-        $google->setLabel('Lien vers plan agrandi');
+        $google->setLabel('Link to Google map');
         $this->addElement($google);
     }
 

diff --git a/framework/application/forms/Settings.php b/framework/application/forms/Settings.php
index c793530a5d017941b24ae8f330796defea1cd81c..60e402545519b7afd62e1c897533d9746b8eebc2 100644 (file)
--- a/framework/application/forms/Settings.php
+++ b/framework/application/forms/Settings.php
@@ -8,16 +8,16 @@ class Cubedesigners_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');
+               $locales->setLabel('Enabled locales');
                $this->addElement($locales);
 
                $longTitle = new Zend_Form_Element_Text('longTitle');
-               $longTitle->setLabel('Titre long par défaut (limité à 65 caractères)');
+               $longTitle->setLabel('Default long title');
                $longTitle->setAttrib('maxlength', 65);
                $this->addElementLocalized($longTitle);
 
                $description = new CubeIT_Form_Element_Textarea('description');
-               $description->setLabel('Description de la page par défaut (limité à 160 caractères)');
+               $description->setLabel('Default description');
                $description->setAttrib('maxlength', 160);
                $description->setAttrib('rows', 2);
                $this->addElementLocalized($description);
@@ -27,7 +27,7 @@ class Cubedesigners_Form_Settings extends CubeIT_Form_Settings {
                 */
 
                $logoTitle = new Zend_Form_Element_Text('logoTitle');
-               $logoTitle->setLabel('Titre (logo)');
+               $logoTitle->setLabel('Logo title');
                $this->addElementLocalized($logoTitle);
 
                /* BLOC CONTACT */
@@ -35,20 +35,11 @@ class Cubedesigners_Form_Settings extends CubeIT_Form_Settings {
                $contact->setLabel('Contact details');
                $this->addSubFormLocalized($contact, 'contact');
 
-               /* BLOC SUIVEZ-NOUS */
-               $followus = new Cubedesigners_Form_CMS_Sub_Followus();
-               $followus->setLabel('Bloc Suivez-nous');
-               $this->addSubFormLocalized($followus, 'followus');
 
                /* COPYRIGHT */
                $copyright = new Zend_Form_Element_Text('copyright');
-               $copyright->setLabel('Copyright du bas de page');
+               $copyright->setLabel('Footer copyright');
                $this->addElementLocalized($copyright);
-
-
-               $privacy = new CubeIT_Form_Element_Markitup('privacy_text');
-               $privacy->setLabel(__('Mention vie privée'));
-               $this->addElement($privacy);
-       }
+               }
 
 }

diff --git a/framework/library/CubeIT/Form/Adresse.php b/framework/library/CubeIT/Form/Adresse.php
index 74ef9287374c9352bddf1253cf87c0fb083d79a8..409a719e8e1ba453effa8fbf2f9714b50f38d560 100644 (file)
--- a/framework/library/CubeIT/Form/Adresse.php
+++ b/framework/library/CubeIT/Form/Adresse.php
@@ -6,26 +6,26 @@ class CubeIT_Form_Adresse extends CubeIT_Form_SubForm {
                parent::init();
 
                $adresse = new CubeIT_Form_Element_Textarea('adresse');
-               $adresse->setLabel(__('Adresse postale'));
+               $adresse->setLabel('Address');
                $adresse->setAttrib('rows', 2);
                $adresse->setOrder(10);
                $adresse->setTranslate(false);
                $this->addElement($adresse);
 
                $code_postal = new CubeIT_Form_Element_Text('code_postal');
-               $code_postal->setLabel(__('Code postal'));
+               $code_postal->setLabel('Post code');
                $code_postal->setTranslate(false);
                $code_postal->setOrder(20);
                $this->addElement($code_postal);
 
                $ville = new CubeIT_Form_Element_Text('ville');
-               $ville->setLabel(__('Ville'));
+               $ville->setLabel('City');
                $ville->setOrder(30);
                $ville->setTranslate(false);
                $this->addElement($ville);
 
                $pays = new CubeIT_Form_Element_Country('pays');
-               $pays->setLabel(__('Pays'));
+               $pays->setLabel('Country');
                $pays->setDetectCountry();
                $pays->setOrder(40);
                $this->addElement($pays);

diff --git a/images/favicon/favicon-ios-114.png b/images/favicon/favicon-ios-114.png
deleted file mode 100644 (file)
index 8733ff9..0000000
Binary files a/images/favicon/favicon-ios-114.png and /dev/null differ

diff --git a/images/favicon/favicon-ios-120.png b/images/favicon/favicon-ios-120.png
deleted file mode 100644 (file)
index 18ee52d..0000000
Binary files a/images/favicon/favicon-ios-120.png and /dev/null differ

diff --git a/images/favicon/favicon-ios-144.png b/images/favicon/favicon-ios-144.png
deleted file mode 100644 (file)
index f1c33e2..0000000
Binary files a/images/favicon/favicon-ios-144.png and /dev/null differ

diff --git a/images/favicon/favicon-ios-152.png b/images/favicon/favicon-ios-152.png
deleted file mode 100644 (file)
index e3843be..0000000
Binary files a/images/favicon/favicon-ios-152.png and /dev/null differ

diff --git a/images/favicon/favicon-ios-57.png b/images/favicon/favicon-ios-57.png
deleted file mode 100644 (file)
index 6491290..0000000
Binary files a/images/favicon/favicon-ios-57.png and /dev/null differ

diff --git a/images/favicon/favicon-ios-72.png b/images/favicon/favicon-ios-72.png
deleted file mode 100644 (file)
index 4ef8df3..0000000
Binary files a/images/favicon/favicon-ios-72.png and /dev/null differ

diff --git a/images/favicon/favicon-ios-76.png b/images/favicon/favicon-ios-76.png
deleted file mode 100644 (file)
index 39ec327..0000000
Binary files a/images/favicon/favicon-ios-76.png and /dev/null differ

diff --git a/images/favicon/favicon.ico b/images/favicon/favicon.ico
index d975e14b6db52ee2e5e3e07d1f1adc0cba54e88e..ce9fe09ce8a20f6cef5969ae937518ccd0aa16ea 100644 (file)
Binary files a/images/favicon/favicon.ico and b/images/favicon/favicon.ico differ

diff --git a/images/favicon/favicon.png b/images/favicon/favicon.png
index f39c018d199f3a8b3bf99e7c7f584445024514b1..f178aa1c4839ff1342691698ac71809a99c22cb3 100644 (file)
Binary files a/images/favicon/favicon.png and b/images/favicon/favicon.png differ

diff --git a/less/bannerCookies.less b/less/bannerCookies.less
index 8f43f0a20aabc333bb24941354dc8911722fbb89..b9ed71ef80ac53b43e0b23d6ec0257a50cd6f94e 100644 (file)
--- a/less/bannerCookies.less
+++ b/less/bannerCookies.less
@@ -1,5 +1,6 @@
 @import "00-constants";
 
 #cookieBanner {
+  display: none;
   background-color: #2d3035;
 }
\ No newline at end of file