done #1785 @0.5

diff --git a/framework/application/models/News.php b/framework/application/models/News.php
index 9bd0e63f7432518c523a2d8353f9a27429ad0ad8..08334299492e9ed6c74e5ef6ba6ad611b6ba0173 100644 (file)
--- a/framework/application/models/News.php
+++ b/framework/application/models/News.php
@@ -9,6 +9,8 @@ class CCGM_Model_News extends CubeIT_Model_Data_Table {
        protected $image;
        protected $title;
 
+       protected $_types = ['link' => 'json'];
+
        public static function getSchema($schema) {
                $table = parent::getSchema($schema);
                $table->addColumn('title', 'string', array('length' => 128));

diff --git a/framework/application/views/helpers/News.php b/framework/application/views/helpers/News.php
index 62b06eb0f6a2b6fa11742aaa94082c6d790dfb19..155cb201ac54b5d129880cdac408468d4452e853 100644 (file)
--- a/framework/application/views/helpers/News.php
+++ b/framework/application/views/helpers/News.php
@@ -6,8 +6,6 @@ class CCGM_View_Helper_News extends CubeIT_View_Helper_Abstract {
         */\r
        public function news() {\r
                $allnews = CCGM_Model_News::factory()->order('date DESC')->find();\r
-\r
-\r
                $res = '';\r
 \r
                foreach ($allnews as $news) {\r
@@ -21,7 +19,10 @@ class CCGM_View_Helper_News extends CubeIT_View_Helper_Abstract {
                $res = $this->imageProcess($n->getImage(), '', 200, 200);\r
                $c = $this->dateTime($n->getDate(), CubeIT_Date::DAY . '/' . CubeIT_Date::MONTH . '/' . CubeIT_Date::YEAR);\r
                $c .= $this->htmlElement($n->getTitle(), 'h2');\r
+               $c .= '<div class="acc">';\r
                $c .= $this->markupDotclear($n->getContent());\r
+               $c .= $this->linkCMS($n->getLink());\r
+               $c .= '</div>';\r
                $c .= $this->link('Lire la suite', '#', ['class' => 'more']);\r
                $c .= $this->link('Réduire', '#', ['class' => 'less']);\r
                $res .= $this->htmlElement($c, 'div', ['class' => 'c']);\r

diff --git a/js/news.js b/js/news.js
index 6f81869de8a70483558168077ca5ef69e07adc96..95b51767e10af535fe72b18227112e00da65246f 100644 (file)
--- a/js/news.js
+++ b/js/news.js
@@ -11,7 +11,7 @@
 \r
             $(this.element).on('click', '.more', function () {\r
                 var c = $(this).closest('.c');\r
-                var d = $(c).find('.dotclear');\r
+                var d = $(c).find('.acc');\r
                 d.css({maxHeight: 999});\r
                 $(this).hide();\r
                 $(c).find('.less').show();\r
@@ -23,7 +23,7 @@
 \r
             $(this.element).on('click', '.less', function () {\r
                 var c = $(this).closest('.c');\r
-                var d = $(c).find('.dotclear');\r
+                var d = $(c).find('.acc');\r
                 d.css({maxHeight: 72});\r
                 $(this).hide();\r
                 $(c).find('.more').show();\r

diff --git a/less/news.less b/less/news.less
index 6ed209da02cac7d78a98518303c2e123c9842194..f5024e03af299cc4e71ce060adcea6da9cfd483a 100644 (file)
--- a/less/news.less
+++ b/less/news.less
@@ -5,7 +5,7 @@
                border-bottom: 1px solid #dad9d9;\r
                padding-bottom: 48px;\r
                margin-bottom: 48px;\r
-               &:last-child{\r
+               &:last-child {\r
                        border-bottom: none;\r
                        margin-bottom: 0;\r
                }\r
@@ -33,13 +33,30 @@
                                font-size: 26px;\r
                        }\r
 \r
-                       .dotclear {\r
-                               line-height: 24px;\r
+                       .acc {\r
                                max-height: 72px;\r
                                overflow: hidden;\r
                                transition: max-height 450ms;\r
                                margin-bottom: 30px;\r
-                               p:last-child{\r
+                               > a {\r
+                                       display: inline-block;\r
+                                       text-align: center;\r
+                                       box-sizing: border-box;\r
+                                       white-space: nowrap;\r
+                                       background-color: #0ea6db;\r
+                                       font-weight: 300;\r
+                                       font-style: italic;\r
+                                       line-height: 29px;\r
+                                       border-radius: 3px;\r
+                                       color: #fff;\r
+                                       padding: 0 13px 1px 10px;\r
+                                       margin: 20px 0 20px 1px;\r
+                               }\r
+                       }\r
+\r
+                       .dotclear {\r
+                               line-height: 24px;\r
+                               p:last-child {\r
                                        margin-bottom: 0;\r
                                }\r
                        }\r
@@ -49,8 +66,8 @@
                                font-weight: 500;\r
                                font-size: 16px;\r
                                display: block;\r
-                               &:after{\r
-                                       content:"";\r
+                               &:after {\r
+                                       content: "";\r
                                        display: inline-block;\r
                                        margin-left: 10px;\r
                                        width: 15px;\r
@@ -63,9 +80,9 @@
                                }\r
                        }\r
 \r
-                       .less{\r
+                       .less {\r
                                display: none;\r
-                               &:after{\r
+                               &:after {\r
                                        transform: rotate(270deg);\r
                                }\r
                        }\r