done #558 @0.5

diff --git a/framework/application/forms/CMS/Texte.php b/framework/application/forms/CMS/Texte.php
index 372338f173b8b2ddad6f1650b604a242b871fe37..496e41059ce1b10b772f13945c91cee7d0d3f931 100644 (file)
--- a/framework/application/forms/CMS/Texte.php
+++ b/framework/application/forms/CMS/Texte.php
@@ -1,5 +1,15 @@
 <?php
 
 class Fluidbook_Form_CMS_Texte extends Fluidbook_Form_CMS {
+       public function init() {
+               parent::init();
+               $title = new Zend_Form_Element_Textarea('title');
+               $title->setLabel('Titre');
+               $title->setAttrib('rows', 3);
+               $this->addElement($title);
 
+               $content = new CubeIT_Form_Element_Markitup('content');
+               $content->setLabel('Contenu');
+               $this->addElement($content);
+       }
 }
\ No newline at end of file

diff --git a/framework/application/views/scripts/templates/texte.phtml b/framework/application/views/scripts/templates/texte.phtml
index 981ae3aab1cbed3ed9c7298683a3e6f65b2c1781..75c6de14e7f8b3705a2b555329b28886f36f4f14 100644 (file)
--- a/framework/application/views/scripts/templates/texte.phtml
+++ b/framework/application/views/scripts/templates/texte.phtml
@@ -1,7 +1,7 @@
 <?php\r
-/**\r
- * Created by IntelliJ IDEA.\r
- * User: Vincent\r
- * Date: 22/06/2016\r
- * Time: 19:25\r
- */
\ No newline at end of file
+$this->headScript()->addScriptAndStyle('240-text');\r
+$res = $this->htmlElement('', 'div', array('class' => 'no-intro'));\r
+$c = $this->htmlElement($this->title($this->title), 'div', array('class' => 'col-2'));\r
+$c .= $this->htmlElement($this->markupDotclear($this->content), 'div', array('class' => 'col-6'));\r
+$res .= $this->htmlElement($c, 'div', array('class' => array('content-wrapper', 'grid', 'wrap')));\r
+echo $res;
\ No newline at end of file

diff --git a/less/002-common.less b/less/002-common.less
index 09f8bed2a7a6b9c6df8ffd2e9168f67d12852fd1..b3a34e4fd64d9d513b5061430c6cfb04e47730c7 100644 (file)
--- a/less/002-common.less
+++ b/less/002-common.less
@@ -151,4 +151,22 @@ a {
        ul {\r
                .list();\r
        }\r
+}\r
+\r
+.no-intro {\r
+       height: 0px;\r
+       box-sizing: content-box;\r
+       padding-top: 152px; // Minimum clearance and top for fixed menu\r
+\r
+       @media @m1280 {\r
+               padding-top: 120px;\r
+       }\r
+\r
+       @media @m900 {\r
+               padding-top: 100px;\r
+       }\r
+\r
+       @media @m768 {\r
+               padding-top: 80px;\r
+       }\r
 }
\ No newline at end of file

diff --git a/less/240-text.less b/less/240-text.less
new file mode 100644 (file)
index 0000000..4fc837f
--- /dev/null
+++ b/less/240-text.less
@@ -0,0 +1,14 @@
+@import "000-imports";\r
+\r
+h2 {\r
+       font-family: @playfair;\r
+       font-weight: 400;\r
+       font-size: 30px;\r
+       margin-bottom: .5em;\r
+       margin-top: .8em;\r
+       line-height: 1.1;\r
+\r
+       @media @m900 {\r
+               font-size: 20px;\r
+       }\r
+}
\ No newline at end of file