From e0fc87ef587e2d2c137a1691c6bdcc5ee943c94b Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 4 Dec 2023 16:10:24 +0100
Subject: [PATCH] add view admin page + some styling

---
 .../ChillMainExtension.php                    |  3 +-
 .../Resources/views/NewsItem/_list.html.twig  | 30 +++++++++++++++
 .../Resources/views/NewsItem/_show.html.twig  | 13 +++++++
 .../Resources/views/NewsItem/index.html.twig  |  3 ++
 .../NewsItem/news_items_history.html.twig     | 37 ++++++++++---------
 .../Resources/views/NewsItem/show.html.twig   | 25 +++++--------
 .../views/NewsItem/view_admin.html.twig       | 29 +++++++++++++++
 7 files changed, 107 insertions(+), 33 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/NewsItem/_list.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/NewsItem/_show.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/NewsItem/view_admin.html.twig

diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 8b61ae4f1..aa025bdfe 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -563,7 +563,8 @@ class ChillMainExtension extends Extension implements
                             'template' => '@ChillMain/NewsItem/new.html.twig',
                         ],
                         'view' => [
-                            'role' => '',
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillMain/NewsItem/view_admin.html.twig'
                         ],
                         'edit' => [
                             'role' => 'ROLE_ADMIN',
diff --git a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/_list.html.twig b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/_list.html.twig
new file mode 100644
index 000000000..11ca95995
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/_list.html.twig
@@ -0,0 +1,30 @@
+<div class="item-bloc">
+    <div class="item-row">
+        <h3>
+            {{ entity.title }}
+        </h3>
+    </div>
+    <div class="item-row">
+        <p>
+            {% if entity.startDate %}
+                <span>{{ entity.startDate|format_date('long') }}</span>
+            {% endif %}
+            {% if entity.endDate %}
+                <span> - {{ entity.endDate|format_date('long') }}</span>
+            {% endif %}
+        </p>
+    </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>
+            </li>
+        </ul>
+    </div>
+</div>
+
diff --git a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/_show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/_show.html.twig
new file mode 100644
index 000000000..ed11908ec
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/_show.html.twig
@@ -0,0 +1,13 @@
+<div class="flex-table">
+    <div class="item-bloc">
+        <p class="date-label">
+            <span>{{ entity.startDate|format_date('long') }}</span>
+            {% if entity.endDate is not null %}
+                <span> - {{ entity.endDate|format_date('long') }}</span>
+            {% endif %}
+        </p>
+    </div>
+    <div class="item-bloc">
+        {{ entity.content|chill_markdown_to_html }}
+    </div>
+</div>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/index.html.twig
index 3e5d08cee..4ac053e7f 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/index.html.twig
@@ -19,6 +19,9 @@
                     {% endif %}
                     <td>
                         <ul class="record_actions">
+                            <li>
+                                <a href="{{ path('chill_crud_news_item_view', { 'id': entity.id }) }}" class="btn btn-show" title="{{ 'show'|trans }}"></a>
+                            </li>
                             <li>
                                 <a href="{{ path('chill_crud_news_item_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
                             </li>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/news_items_history.html.twig b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/news_items_history.html.twig
index e6e5f862c..134135791 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/news_items_history.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/news_items_history.html.twig
@@ -22,25 +22,28 @@
 
                     <div class="item-bloc">
                         <div class="item-row">
-                            <h3>
-                                {{ entity.title }}
-                            </h3>
-                        </div>
-                        <div class="item-row">
-                            <p>
-                                {% if entity.startDate %}
-                                    <span>{{ entity.startDate|format_date('long') }}</span>
-                                {% endif %}
-                                {% if entity.endDate %}
-                                    <span> - {{ entity.endDate|format_date('long') }}</span>
-                                {% endif %}
-                            </p>
-                        </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 class="wrap-list">
+                                <div class="wl-row">
+                                    <div class="wl-col">
+                                        <h2>{{ entity.title }}</h2>
+                                    </div>
+                                    <div class="wl-col">
+                                        <p>
+                                            {% if entity.startDate %}
+                                                <span>{{ entity.startDate|format_date('long') }}</span>
+                                            {% endif %}
+                                            {% if entity.endDate %}
+                                                <span> - {{ entity.endDate|format_date('long') }}</span>
+                                            {% endif %}
+                                        </p>
+                                    </div>
+                                </div>
                             </div>
                         </div>
+
+                        <div class="item-row separator">
+                            {{ 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 class="item-row">
                             <ul class="record_actions">
                                 <li>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/show.html.twig b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/show.html.twig
index 764a2cc6f..abd596918 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/show.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/show.html.twig
@@ -3,22 +3,17 @@
 {% block title 'news.show_details'|trans %}
 
 {% block content %}
-    <div class="col-md-10">
-        <h1>{{ entity.title }}</h1>
+    <div class="col-md-10 col-xxl">
+        <div class="news-item-show">
+            <h1>{{ entity.title }}</h1>
 
-        <div>
-            <span>{{ entity.startDate|format_date('long') }}</span>
-            {% if entity.endDate is not null %}
-                <span> - {{ entity.endDate|format_date('long') }}</span>
-            {% endif %}
+            {% include '@ChillMain/NewsItem/_show.html.twig' with { 'entity': entity } %}
+
+            <ul class="record_actions sticky-form-buttons">
+                <li class="cancel">
+                    <a href="{{ chill_return_path_or('chill_main_news_items_history') }}" class="btn btn-cancel">{{ 'Back to the list'|trans|chill_return_path_label }}</a>
+                </li>
+            </ul>
         </div>
-        <div>
-            {{ entity.content|chill_markdown_to_html }}
-        </div>
-        <ul class="record_actions sticky-form-buttons">
-            <li class="cancel">
-                <a href="{{ chill_return_path_or('chill_main_news_items_history') }}" class="btn btn-cancel">{{ 'Back to the list'|trans|chill_return_path_label }}</a>
-            </li>
-        </ul>
     </div>
 {% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/NewsItem/view_admin.html.twig b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/view_admin.html.twig
new file mode 100644
index 000000000..b9cee97cf
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/NewsItem/view_admin.html.twig
@@ -0,0 +1,29 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_view_title.html.twig') %}
+{% endblock %}
+
+{% block admin_content %}
+
+    <div class="col-md-10 col-xxl">
+        <div class="news-item-show">
+            <h1>{{ entity.title }}</h1>
+
+            {% include '@ChillMain/NewsItem/_show.html.twig' with { 'entity': entity } %}
+
+            <ul class="record_actions sticky-form-buttons">
+                <li class="cancel">
+                    <a href="{{ chill_return_path_or('chill_crud_news_item_index') }}" class="btn btn-cancel">{{ 'Back to the list'|trans|chill_return_path_label }}</a>
+                </li>
+                <li>
+                    <a href="{{ path('chill_crud_news_item_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
+                </li>
+                <li>
+                    <a href="{{ path('chill_crud_news_item_delete', { 'id': entity.id }) }}" class="btn btn-delete" title="{{ 'delete'|trans }}"></a>
+                </li>
+            </ul>
+        </div>
+    </div>
+
+{% endblock %}