Wait #4904 @0.75

diff --git a/framework/application/forms/CMS/Fonctionnalitessub.php b/framework/application/forms/CMS/Fonctionnalitessub.php
index 3236ac4582098285f73c82aba36f477f60a67753..440f9608750d8216271baf2e9609c85fb4f5e6e9 100644 (file)
--- a/framework/application/forms/CMS/Fonctionnalitessub.php
+++ b/framework/application/forms/CMS/Fonctionnalitessub.php
@@ -6,19 +6,23 @@ class Fluidbook_Form_CMS_Fonctionnalitessub extends Fluidbook_Form_CMS_Base {
        public function init() {\r
                parent::init();\r
 \r
-               $titre = new CubeIT_Form_Element_Textarea('ex_title');\r
-               $titre->setLabel('Titre du bloc examples');\r
-               $titre->setAttrib('rows', 2);\r
-               $this->addElement($titre);\r
-\r
                $details = new Fluidbook_Form_CMS_Sub_Features_FeatureDetails();\r
                $details->setLabel('Détails');\r
                $this->addSubForm($details, 'details');\r
 \r
+        $blockquote = new CubeIT_Form_Element_Markitup('blockquote');\r
+        $blockquote->setLabel('Bloc de citation');\r
+        $this->addElement($blockquote);\r
+\r
                $logos = new CubeIT_Form_Element_File_Image('features_logos');\r
                $logos->setLabel('Logos');\r
                $this->addElement($logos);\r
 \r
+        $titre = new CubeIT_Form_Element_Textarea('ex_title');\r
+        $titre->setLabel('Titre du bloc références');\r
+        $titre->setAttrib('rows', 2);\r
+        $this->addElement($titre);\r
+\r
                $category = new Fluidbook_Form_CMS_Sub_Exemples_CategorySelect('ex_category');\r
                $category->setLabel('Catégorie de références');\r
                $this->addElement($category);\r
@@ -32,4 +36,4 @@ class Fluidbook_Form_CMS_Fonctionnalitessub extends Fluidbook_Form_CMS_Base {
                $exemples->setLabel('Gestion des exemples');\r
                $this->addElement($exemples);\r
        }\r
-}
\ No newline at end of file
+}\r

diff --git a/framework/application/views/scripts/templates/fonctionnalitessub.phtml b/framework/application/views/scripts/templates/fonctionnalitessub.phtml
index 5c870e33ec2ba4709e69869cb0c7acd3d2639f9e..9e3d3da228713ec0ef958bf75dd0c07e2219ee11 100644 (file)
--- a/framework/application/views/scripts/templates/fonctionnalitessub.phtml
+++ b/framework/application/views/scripts/templates/fonctionnalitessub.phtml
@@ -3,8 +3,13 @@ $this->headScript()->addScriptAndStyle('420-features-details');
 \r
 $res = $this->introBlock($this->intro);\r
 $res .= $this->featureDetails($this->details);\r
+\r
+if ($this->blockquote) {\r
+    $res .= $this->htmlElement($this->markupDotclear($this->blockquote), 'blockquote', ['class' => 'features-blockquote']);\r
+}\r
+\r
 $res .= $this->logos($this->features_logos);\r
 $res .= $this->exemples($this->ex_category, $this->ex_title, $this->ex_count);\r
 $res .= $this->contactFooter();\r
 \r
-echo $res;
\ No newline at end of file
+echo $res;\r

diff --git a/less/420-features-details.less b/less/420-features-details.less
index 8c67a71e9a98564f3fa11d401713a11db4b7355c..a2383709044abcee2841eaea9805cf6700dc923f 100644 (file)
--- a/less/420-features-details.less
+++ b/less/420-features-details.less
@@ -110,3 +110,24 @@
     }\r
   }\r
 }\r
+\r
+.features-blockquote {\r
+  background-color: #f3f3f3;\r
+  padding: 2.678555em 2em;\r
+  color: #66727a;\r
+  font-family: 'Open Sans', sans-serif;\r
+  font-weight: 400;\r
+  font-size: 1.4em;\r
+  text-align: center;\r
+  line-height: 1.6;\r
+\r
+  @media @m900 {\r
+    font-size: 1.1em;\r
+  }\r
+\r
+  div {\r
+    max-width: 80ch;\r
+    margin: 0 auto;\r
+  }\r
+\r
+}\r