Prepare transation file | wip #568 @2

diff --git a/framework/application/forms/CMS/Contact.php b/framework/application/forms/CMS/Contact.php
index 18552603ec12f2290c91f78fc24f748f7d7d8a33..2d7171f90039545c64a93732d4295758a575994e 100644 (file)
--- a/framework/application/forms/CMS/Contact.php
+++ b/framework/application/forms/CMS/Contact.php
@@ -5,7 +5,7 @@ class Fluidbook_Form_CMS_Contact extends Fluidbook_Form_CMS_Base {
     public function init() {\r
         parent::init();\r
 \r
-        $resellers_title = new Zend_Form_Element_Textarea('resellers_title');\r
+        $resellers_title = new CubeIT_Form_Element_Textarea('resellers_title');\r
         $resellers_title->setLabel('Titre pour bloc "Revendeurs internationaux"');\r
         $resellers_title->setAttrib('rows', 3);\r
         $this->addElement($resellers_title);\r

diff --git a/framework/application/forms/CMS/Exemples.php b/framework/application/forms/CMS/Exemples.php
index 5d0574ea794b99b2bb41feb0b9ca90ef94987909..ef2690dc35a3180fdb0dda4d2124779d2f574a72 100644 (file)
--- a/framework/application/forms/CMS/Exemples.php
+++ b/framework/application/forms/CMS/Exemples.php
@@ -4,7 +4,7 @@ class Fluidbook_Form_CMS_Exemples extends Fluidbook_Form_CMS_Base {
        public function init() {\r
                parent::init();\r
 \r
-               $titre = new Zend_Form_Element_Textarea('title');\r
+               $titre = new CubeIT_Form_Element_Textarea('title');\r
                $titre->setLabel('Titre');\r
                $this->addElement($titre);\r
 \r

diff --git a/framework/application/forms/CMS/Fonctionnalites.php b/framework/application/forms/CMS/Fonctionnalites.php
index d806f1ba40dcb694197fa1c846424fcd9c48ed81..b5f44a358517006d12ae6c1fd0f94b3996c5c10d 100644 (file)
--- a/framework/application/forms/CMS/Fonctionnalites.php
+++ b/framework/application/forms/CMS/Fonctionnalites.php
@@ -9,7 +9,7 @@ class Fluidbook_Form_CMS_Fonctionnalites extends Fluidbook_Form_CMS_Base {
         $video->setLabel('Vidéo');\r
         $this->addElement($video);\r
 \r
-        $features_title = new Zend_Form_Element_Textarea('features_title');\r
+        $features_title = new CubeIT_Form_Element_Textarea('features_title');\r
         $features_title->setLabel('Titre pour "Fonctionnalités incluses de série"');\r
         $features_title->setAttrib('rows', 3);\r
         $this->addElement($features_title);\r
@@ -18,7 +18,7 @@ class Fluidbook_Form_CMS_Fonctionnalites extends Fluidbook_Form_CMS_Base {
         $features->setLegend('Fonctionnalités incluses de série');\r
         $this->addSubForm($features, 'features');\r
 \r
-        $services_title = new Zend_Form_Element_Textarea('services_title');\r
+        $services_title = new CubeIT_Form_Element_Textarea('services_title');\r
         $services_title->setLabel('Titre pour "Services inclus de série"');\r
         $services_title->setAttrib('rows', 3);\r
         $this->addElement($services_title);\r
@@ -27,7 +27,7 @@ class Fluidbook_Form_CMS_Fonctionnalites extends Fluidbook_Form_CMS_Base {
         $services->setLegend('Services inclus de série');\r
         $this->addSubForm($services, 'services');\r
 \r
-        $extras_title = new Zend_Form_Element_Textarea('extras_title');\r
+        $extras_title = new CubeIT_Form_Element_Textarea('extras_title');\r
         $extras_title->setLabel('Titre pour "Enrichissements et services optionnels"');\r
         $extras_title->setAttrib('rows', 3);\r
         $this->addElement($extras_title);\r

diff --git a/framework/application/forms/CMS/Sub/Contact/Footer.php b/framework/application/forms/CMS/Sub/Contact/Footer.php
index 2389a7e7822a56a86c4ee2c33d9e5dcbe60c2a99..71cadaabac938276d7e05a16d4240f3c08c44a02 100644 (file)
--- a/framework/application/forms/CMS/Sub/Contact/Footer.php
+++ b/framework/application/forms/CMS/Sub/Contact/Footer.php
@@ -5,7 +5,7 @@ class Fluidbook_Form_CMS_Sub_Contact_Footer extends CubeIT_Form_SubForm {
                parent::init();\r
 \r
 \r
-               $intro_title = new Zend_Form_Element_Textarea('title');\r
+               $intro_title = new CubeIT_Form_Element_Textarea('title');\r
                $intro_title->setLabel('Titre');\r
                $intro_title->setAttrib('rows', 3);\r
                $this->addElement($intro_title);\r

diff --git a/framework/application/forms/CMS/Sub/Exemples/Category.php b/framework/application/forms/CMS/Sub/Exemples/Category.php
index b7e401cd73cabb0a6432c84c05e467dfbda4d3b2..74fe0b5e5e9875a2c877fcc9301c69df9b4f19aa 100644 (file)
--- a/framework/application/forms/CMS/Sub/Exemples/Category.php
+++ b/framework/application/forms/CMS/Sub/Exemples/Category.php
@@ -8,11 +8,11 @@ class Fluidbook_Form_CMS_Sub_Exemples_Category extends CubeIT_Form_List_Model {
                $id = new CubeIT_Form_Element_Id();\r
                $this->addElement($id);\r
 \r
-               $title = new Zend_Form_Element_Text('name');\r
+               $title = new CubeIT_Form_Element_Text('name');\r
                $title->setLabel('Nom');\r
                $this->addElementLocalized($title, false);\r
 \r
-               $link = new Zend_Form_Element_Text('linklabel');\r
+               $link = new CubeIT_Form_Element_Text('linklabel');\r
                $link->setLabel('Label du lien « voir d\'autres ... »');\r
                $this->addElementLocalized($link, false);\r
 \r

diff --git a/framework/application/forms/CMS/Sub/Exemples/Fluidbook.php b/framework/application/forms/CMS/Sub/Exemples/Fluidbook.php
index 4db316246091b055cfcd1bf54b21f3998aab21df..4bed9b216be366d223cda41123330dfc73baa7ed 100644 (file)
--- a/framework/application/forms/CMS/Sub/Exemples/Fluidbook.php
+++ b/framework/application/forms/CMS/Sub/Exemples/Fluidbook.php
@@ -7,11 +7,12 @@ class Fluidbook_Form_CMS_Sub_Exemples_Fluidbook extends CubeIT_Form_List_Model {
                $id = new CubeIT_Form_Element_Id();\r
                $this->addElement($id);\r
 \r
-               $title = new Zend_Form_Element_Text('title');\r
+               $title = new CubeIT_Form_Element_Text('title');\r
+               $title->setTranslate(false);\r
                $title->setLabel('Titre');\r
                $this->addElementLocalized($title, false);\r
 \r
-               $text = new Zend_Form_Element_Textarea('text');\r
+               $text = new CubeIT_Form_Element_Textarea('text');\r
                $text->setLabel('Texte');\r
                $this->addElementLocalized($text, false);\r
 \r

diff --git a/framework/application/forms/CMS/Sub/Features/Feature.php b/framework/application/forms/CMS/Sub/Features/Feature.php
index 0fa076cf65936082a1874b990093035c937275ff..d0a59a0725f44d1b5ec62c998e346e546ff001fd 100644 (file)
--- a/framework/application/forms/CMS/Sub/Features/Feature.php
+++ b/framework/application/forms/CMS/Sub/Features/Feature.php
@@ -2,40 +2,40 @@
 
 class Fluidbook_Form_CMS_Sub_Features_Feature extends CubeIT_Form_SubForm {
 
-    public function init() {
-        parent::init();
-
-        $title = new Zend_Form_Element_Text('title');
-        $title->setLabel('Titre du bloc');
-        $this->addElement($title);
-
-        $content = new CubeIT_Form_Element_Markitup('content');
-        $content->setLabel('Contenus');
-        $this->addElement($content);
-
-        $icon = new Zend_Form_Element_Text('icon');
-        $icon->setLabel('Pictogramme reference (CSS class)');
-        $this->addElement($icon);
-
-        $bg_gradient = new Fluidbook_Form_CMS_Sub_Gradient();
-        $bg_gradient->setLegend('Background Gradient');
-        $this->addSubForm($bg_gradient, 'background_gradient');
-
-        $bg_image = new CubeIT_Form_Element_File_Image('background_image');
-        $bg_image->setLabel('Background Image');
-        $this->addElement($bg_image);
-
-        $layout = new Zend_Form_Element_Select('layout');
-        $layout->setLabel('Layout');
-        $layout->setMultiOptions(array(
-            'square-top' => 'Square block with image top',
-            'square-bottom' => 'Square block with image bottom',
-            'rectangle-right' => 'Large rectangle with image right',
-            'rectangle-bottom' => 'Large rectangle with image bottom',
-            'small-rectangle-tall' => 'Small rectangle (tall)',
-            'small-rectangle-wide' => 'Small rectangle (wide)',
-        ));
-        $this->addElement($layout);
-
-    }
+       public function init() {
+               parent::init();
+
+               $title = new CubeIT_Form_Element_Text('title');
+               $title->setLabel('Titre du bloc');
+               $this->addElement($title);
+
+               $content = new CubeIT_Form_Element_Markitup('content');
+               $content->setLabel('Contenus');
+               $this->addElement($content);
+
+               $icon = new Fluidbook_Form_Element_Picto('icon');
+               $icon->setLabel('Pictogramme reference (CSS class)');
+               $this->addElement($icon);
+
+               $bg_gradient = new Fluidbook_Form_CMS_Sub_Gradient();
+               $bg_gradient->setLegend('Background Gradient');
+               $this->addSubForm($bg_gradient, 'background_gradient');
+
+               $bg_image = new CubeIT_Form_Element_File_Image('background_image');
+               $bg_image->setLabel('Background Image');
+               $this->addElement($bg_image);
+
+               $layout = new Zend_Form_Element_Select('layout');
+               $layout->setLabel('Layout');
+               $layout->setMultiOptions(array(
+                       'square-top' => 'Square block with image top',
+                       'square-bottom' => 'Square block with image bottom',
+                       'rectangle-right' => 'Large rectangle with image right',
+                       'rectangle-bottom' => 'Large rectangle with image bottom',
+                       'small-rectangle-tall' => 'Small rectangle (tall)',
+                       'small-rectangle-wide' => 'Small rectangle (wide)',
+               ));
+               $this->addElement($layout);
+
+       }
 }
\ No newline at end of file

diff --git a/framework/application/forms/CMS/Sub/Home/Block.php b/framework/application/forms/CMS/Sub/Home/Block.php
index bfda0de8cdcbcfc97f3e21e498266daa519fb369..eac06f5bf825a427442d0f61a523841e3e6f3173 100644 (file)
--- a/framework/application/forms/CMS/Sub/Home/Block.php
+++ b/framework/application/forms/CMS/Sub/Home/Block.php
@@ -4,7 +4,7 @@ class Fluidbook_Form_CMS_Sub_Home_Block extends CubeIT_Form_SubForm {
        public function init() {
                parent::init();
 
-               $title = new Zend_Form_Element_Textarea('title');
+               $title = new CubeIT_Form_Element_Textarea('title');
         $title->setAttrib('rows', 2);
                $title->setLabel('Titre');
                $title->setOrder(10);

diff --git a/framework/application/forms/CMS/Sub/Home/Services/Example.php b/framework/application/forms/CMS/Sub/Home/Services/Example.php
index ecb5b5833ec248aee32514b0c30a1915173f2479..386043d83535f51d6f7f2559109e76e925e8d879 100644 (file)
--- a/framework/application/forms/CMS/Sub/Home/Services/Example.php
+++ b/framework/application/forms/CMS/Sub/Home/Services/Example.php
@@ -5,7 +5,7 @@ class Fluidbook_Form_CMS_Sub_Home_Services_Example extends CubeIT_Form_SubForm {
     public function init() {
         parent::init();
 
-        $title = new Zend_Form_Element_Text('title');
+        $title = new CubeIT_Form_Element_Text('title');
         $title->setLabel('Titre du exemple');
         $this->addElement($title);
 

diff --git a/framework/application/forms/CMS/Sub/Intro.php b/framework/application/forms/CMS/Sub/Intro.php
index 18f68be5930a85d381cee90f270589b71164029a..b5505415f42e6e7afe962e8072d6a6396758876b 100644 (file)
--- a/framework/application/forms/CMS/Sub/Intro.php
+++ b/framework/application/forms/CMS/Sub/Intro.php
@@ -10,7 +10,7 @@ class Fluidbook_Form_CMS_Sub_Intro extends CubeIT_Form_SubForm {
        public function init() {\r
                parent::init();\r
 \r
-               $intro_title = new Zend_Form_Element_Textarea('title');\r
+               $intro_title = new CubeIT_Form_Element_Textarea('title');\r
                $intro_title->setLabel('Titre');\r
                $intro_title->setAttrib('rows', 3);\r
                $this->addElement($intro_title);\r

diff --git a/framework/application/forms/CMS/Sub/Resellers/Reseller.php b/framework/application/forms/CMS/Sub/Resellers/Reseller.php
index 66ef0cfb8e2fb94082c5143937aefcf522ea989b..0f23288037756f7283bdf5be420993139952fa45 100644 (file)
--- a/framework/application/forms/CMS/Sub/Resellers/Reseller.php
+++ b/framework/application/forms/CMS/Sub/Resellers/Reseller.php
@@ -2,10 +2,14 @@
 
 class Fluidbook_Form_CMS_Sub_Resellers_Reseller extends CubeIT_Form_SubForm {
 
+       public function getTranslate(){
+               return false;
+       }
+
     public function init() {
         parent::init();
-        
-        $company = new Zend_Form_Element_Text('company');
+
+        $company = new CubeIT_Form_Element_Text('company');
         $company->setLabel('Nom de la société');
         $this->addElement($company);
 

diff --git a/framework/application/forms/CMS/Sub/Resellers/Resellers.php b/framework/application/forms/CMS/Sub/Resellers/Resellers.php
index 17826a15e824c196ed4dab377e7770254b430ac8..b91b7048a6b9970272c84419ae416ee631734b1c 100644 (file)
--- a/framework/application/forms/CMS/Sub/Resellers/Resellers.php
+++ b/framework/application/forms/CMS/Sub/Resellers/Resellers.php
@@ -11,4 +11,9 @@ class Fluidbook_Form_CMS_Sub_Resellers_Resellers extends CubeIT_Form_Multi_SubFo
         $this->setNewLegend('Nouveau revendeur');
         
     }
+
+       public function getTranslate(){
+               return false;
+       }
+
 }
\ No newline at end of file

diff --git a/framework/application/forms/CMS/Sub/Social/Network.php b/framework/application/forms/CMS/Sub/Social/Network.php
index 3c57872e3849f24eb547c880d4fa3013783b2f38..8c9d316e5379507cf0866b406036857ab7edccf3 100644 (file)
--- a/framework/application/forms/CMS/Sub/Social/Network.php
+++ b/framework/application/forms/CMS/Sub/Social/Network.php
@@ -5,7 +5,8 @@ class Fluidbook_Form_CMS_Sub_Social_Network extends CubeIT_Form_SubForm {
        public function init() {
                parent::init();
 
-               $title = new Zend_Form_Element_Text('title');
+               $title = new CubeIT_Form_Element_Text('title');
+               $title->setTranslate(false);
                $title->setLabel('Titre du réseau social');
                $this->addElement($title);
 
@@ -17,7 +18,7 @@ class Fluidbook_Form_CMS_Sub_Social_Network extends CubeIT_Form_SubForm {
                $couleur->setLabel('Couleur');
                $this->addElement($couleur);
 
-               $icon = new Zend_Form_Element_Text('icon');
+               $icon = new Fluidbook_Form_Element_Picto('icon');
                $icon->setLabel('Pictogramme (fontastic)');
                $this->addElement($icon);
        }

diff --git a/framework/application/forms/CMS/Texte.php b/framework/application/forms/CMS/Texte.php
index 496e41059ce1b10b772f13945c91cee7d0d3f931..23c6c3d1e5f258e41454e39f13a78f0039396abf 100644 (file)
--- a/framework/application/forms/CMS/Texte.php
+++ b/framework/application/forms/CMS/Texte.php
@@ -3,7 +3,7 @@
 class Fluidbook_Form_CMS_Texte extends Fluidbook_Form_CMS {
        public function init() {
                parent::init();
-               $title = new Zend_Form_Element_Textarea('title');
+               $title = new CubeIT_Form_Element_Textarea('title');
                $title->setLabel('Titre');
                $title->setAttrib('rows', 3);
                $this->addElement($title);

diff --git a/framework/application/forms/Contactdetails.php b/framework/application/forms/Contactdetails.php
index d489b493020b28c4ed4ce842fc59430abfec29fb..fbd9cb7b1098986be3e286e3cb564f99db384a9f 100644 (file)
--- a/framework/application/forms/Contactdetails.php
+++ b/framework/application/forms/Contactdetails.php
@@ -9,8 +9,9 @@
 class Fluidbook_Form_Contactdetails extends CubeIT_Form_Adresse {\r
        public function init() {\r
                parent::init();\r
-               $company = new Zend_Form_Element_Text('company');\r
+               $company = new CubeIT_Form_Element_Text('company');\r
                $company->setLabel('Nom');\r
+               $company->setTranslate(false);\r
                $company->setOrder(5);\r
                $this->addElement($company);\r
 \r

diff --git a/framework/application/forms/Element/Picto.php b/framework/application/forms/Element/Picto.php
new file mode 100644 (file)
index 0000000..59e51dc
--- /dev/null
+++ b/framework/application/forms/Element/Picto.php
@@ -0,0 +1,8 @@
+<?php\r
+\r
+class Fluidbook_Form_Element_Picto extends Zend_Form_Element_Text {\r
+\r
+       public function getTranslate() {\r
+               return false;\r
+       }\r
+}
\ No newline at end of file

diff --git a/framework/application/forms/RequestQuote.php b/framework/application/forms/RequestQuote.php
index 67a5b3764feb5594bb3ae15ebb4ff68203ebb1d0..f382e9322fd0e786ecbfc7abb548d139825fb98c 100644 (file)
--- a/framework/application/forms/RequestQuote.php
+++ b/framework/application/forms/RequestQuote.php
@@ -5,17 +5,17 @@ class Fluidbook_Form_RequestQuote extends CubeIT_Form {
        public function init() {
                parent::init();
 
-               $first_name = new Zend_Form_Element_Text('prenom');
+               $first_name = new CubeIT_Form_Element_Text('prenom');
                $first_name->setLabel(__('Prénom'));
                $this->addElement($first_name);
 
-               $last_name = new Zend_Form_Element_Text('nom');
+               $last_name = new CubeIT_Form_Element_Text('nom');
                $last_name->setLabel(__('Nom'));
                $last_name->setRequired(true);
                $last_name->addErrorMessage(__('Veuillez indiquer votre nom'));
                $this->addElement($last_name);
 
-               $company = new Zend_Form_Element_Text('rs');
+               $company = new CubeIT_Form_Element_Text('rs');
                $company->setLabel(__('Nom de la société'));
                $company->setRequired(true);
                $company->addErrorMessage(__('Veuillez indiquer le nom de votre société'));
@@ -41,11 +41,11 @@ class Fluidbook_Form_RequestQuote extends CubeIT_Form {
                $email->addErrorMessage(__('Veuillez indiquer une adresse e-mail valide'));
                $this->addElement($email);
 
-               $phone = new Zend_Form_Element_Text('telephone');
+               $phone = new CubeIT_Form_Element_Text('telephone');
                $phone->setLabel(__('Téléphone'));
                $this->addElement($phone);
 
-               $comments = new Zend_Form_Element_Textarea('detail');
+               $comments = new CubeIT_Form_Element_Textarea('detail');
                $comments->setLabel(__('Commentaires sur votre projet'));
                $this->addElement($comments);
 

diff --git a/framework/application/forms/Settings.php b/framework/application/forms/Settings.php
index ef18efc21231e61983d47748f21345197a17bc4e..a1ccdd6219aab36ad33ab0fa8beaea94d2a4cbb8 100644 (file)
--- a/framework/application/forms/Settings.php
+++ b/framework/application/forms/Settings.php
@@ -11,7 +11,7 @@ class Fluidbook_Form_Settings extends CubeIT_Form_Settings {
                $logo->setLabel('Logo');
                $this->addElement($logo);
 
-               $longTitle = new Zend_Form_Element_Text('longTitle');
+               $longTitle = new CubeIT_Form_Element_Text('longTitle');
                $longTitle->setLabel('Titre long par défaut');
                $this->addElementLocalized($longTitle);
 

diff --git a/framework/application/forms/User.php b/framework/application/forms/User.php
index 77b81760be070fadf3d8c22ecce080436b3625ef..c41dd87603ba33d7be04927526e1d3bac28c4a85 100644 (file)
--- a/framework/application/forms/User.php
+++ b/framework/application/forms/User.php
@@ -4,6 +4,4 @@ class Fluidbook_Form_User extends CubeIT_Form_User {
        public function init(){
                parent::init();
        }
-}
-
-?>
+}
\ No newline at end of file

diff --git a/less/010-admin.less b/less/010-admin.less
index 1f4f8d20a2ed2e8def95d4a0068a03e4847319e5..3099aa99c455358b28157ff58deba76c8013f202 100644 (file)
--- a/less/010-admin.less
+++ b/less/010-admin.less
@@ -23,4 +23,8 @@
 \r
 #adminlogin {\r
        padding-top: 150px;\r
+}\r
+\r
+#contentWrapper .cubeit-content{\r
+       padding-top:120px;\r
 }
\ No newline at end of file