done #603 0:20

diff --git a/framework/application/forms/CMS.php b/framework/application/forms/CMS.php
index 1d899e73a5786127ba0b41b7e4c037c6f58ba45e..1a2e0c0fb669a88d25fc4e10aff427cc6a681c73 100644 (file)
--- a/framework/application/forms/CMS.php
+++ b/framework/application/forms/CMS.php
@@ -5,5 +5,3 @@ class Fluidbook_Form_CMS extends CubeIT_Form_CMS {
                parent::init();
        }
 }
-
-?>

diff --git a/framework/application/forms/CMS/Base.php b/framework/application/forms/CMS/Base.php
index 6b6d8f71907595d517379b0121887eb5f111df2b..a76dffe4d2283cfd3d95034d23bbdebefedc5faf 100644 (file)
--- a/framework/application/forms/CMS/Base.php
+++ b/framework/application/forms/CMS/Base.php
@@ -13,5 +13,9 @@ class Fluidbook_Form_CMS_Base extends Fluidbook_Form_CMS {
                $intro = new Fluidbook_Form_CMS_Sub_Intro();\r
                $intro->setLegend('Introduction');\r
                $this->addSubForm($intro, 'intro');\r
+\r
+               $contact=new CubeIT_Form_Element_Markitup('contact_footer');\r
+               $contact->setLabel('Texte du bloc « Contactez-nous ». Laisser vide pour utiliser le texte par défaut');\r
+               $this->addElement($contact);\r
        }\r
 }
\ No newline at end of file

diff --git a/framework/application/views/helpers/ContactFooter.php b/framework/application/views/helpers/ContactFooter.php
index 37e6a6082a2a673a015fbc56a6267acbad5295cb..44ec2cecf8725485d3a0bd4d9ce758fc16f68fc3 100644 (file)
--- a/framework/application/views/helpers/ContactFooter.php
+++ b/framework/application/views/helpers/ContactFooter.php
@@ -7,8 +7,12 @@ class Fluidbook_View_Helper_ContactFooter extends CubeIT_View_Helper_Abstract {
        public function contactFooter($cf = null) {\r
                if (null === $cf) {\r
                        $cf = CubeIT_Util_Cms::unserialize($this->option('contact_footer'));\r
+               }\r
 \r
+               if ($this->contact_footer != '') {\r
+                       $cf['content'] = $this->contact_footer;\r
                }\r
+\r
                $this->addScriptAndStyle('103-contact-footer');\r
 \r
                $res = $this->title($cf['title'], 'h2');\r
@@ -22,8 +26,8 @@ class Fluidbook_View_Helper_ContactFooter extends CubeIT_View_Helper_Abstract {
                $res = $this->backgroundBlock($res, $cf, array('content-wrapper'));\r
 \r
                return $this->htmlElement($res, 'section', array(\r
-                   'class' => 'contactFooter section',\r
-            'data-themecolor' => '#8aab41', // Todo: possibly set this via the admin?\r
-            'data-section-name' => 'contact'));\r
+                       'class' => 'contactFooter section',\r
+                       'data-themecolor' => '#8aab41', // Todo: possibly set this via the admin?\r
+                       'data-section-name' => 'contact'));\r
        }\r
 }
\ No newline at end of file