Merge remote-tracking branch 'origin/issue159_page_acceuil' into testing-202401

src/Bundle/ChillMainBundle/Resources/public/module/news/index.js

@@ -0,0 +1 @@
+import './index.scss';

src/Bundle/ChillMainBundle/Resources/public/module/news/index.scss

@@ -0,0 +1,7 @@
+div.flex-table {
+    .news-content {
+        p {
+            margin-top: 1rem;
+        }
+    }
+}

src/Bundle/ChillMainBundle/Resources/views/NewsItem/_show.html.twig

@@ -8,6 +8,8 @@
         </p>
     </div>
     <div class="item-bloc">
+        <div class="news-content">
             {{ entity.content|chill_markdown_to_html }}
         </div>
+    </div>
 </div>

src/Bundle/ChillMainBundle/Resources/views/NewsItem/news_items_history.html.twig

@@ -4,6 +4,11 @@
     {{ 'news.title'|trans }}
 {% endblock title %}
 
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('mod_news') }}
+{% endblock %}
+
 {% block content %}
     <div class="col-md-10 asideactivity-list">
         <h2>{{ 'news.title'|trans }}</h2>
@@ -42,12 +47,14 @@
                         </div>
 
                         <div class="item-row separator">
+                            <div>
                                 {{ entity.content|u.truncate(350, '… [' ~ ('news.read_more'|trans) ~ '](' ~ chill_path_add_return_path('chill_main_single_news_item', { 'id': entity.id } ) ~ ')', false)|chill_markdown_to_html }}
                             </div>
+                        </div>
                         <div class="item-row">
                             <ul class="record_actions">
                                 <li>
-                                    <a href="{{ chill_path_add_return_path('chill_main_single_news_item', { 'id': entity.id } ) }}" class="btn btn-show btn-mini"></a>
+                                    <a href="{{ chill_path_add_return_path('chill_main_single_news_item', { 'id': entity.id } ) }}" class="btn btn-show btn-sm read-more">{{ 'news.read_more'|trans }}</a>
                                 </li>
                             </ul>
                         </div>

src/Bundle/ChillMainBundle/Resources/views/NewsItem/show.html.twig

@@ -2,6 +2,11 @@
 
 {% block title 'news.show_details'|trans %}
 
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('mod_news') }}
+{% endblock %}
+
 {% block content %}
     <div class="col-md-10 col-xxl">
         <div class="news-item-show">

src/Bundle/ChillMainBundle/Resources/views/NewsItem/view_admin.html.twig

@@ -4,6 +4,11 @@
     {% include('@ChillMain/CRUD/_view_title.html.twig') %}
 {% endblock %}
 
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('mod_news') }}
+{% endblock %}
+
 {% block admin_content %}
 
     <div class="col-md-10 col-xxl">

src/Bundle/ChillMainBundle/chill.webpack.config.js

@@ -76,6 +76,7 @@ module.exports = function(encore, entries)
     encore.addEntry('mod_pick_postal_code', __dirname + '/Resources/public/module/pick-postal-code/index.js');
     encore.addEntry('mod_pick_rolling_date', __dirname + '/Resources/public/module/pick-rolling-date/index.js');
     encore.addEntry('mod_address_details', __dirname + '/Resources/public/module/address-details/index');
+    encore.addEntry('mod_news', __dirname + '/Resources/public/module/news/index.js');
 
     // Vue entrypoints
     encore.addEntry('vue_address', __dirname + '/Resources/public/vuejs/Address/index.js');