From 37382fbee84d5da4cbb44b8f6612a9f98e8bdf34 Mon Sep 17 00:00:00 2001
From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de>
Date: Mon, 31 Jan 2022 08:06:41 +0100
Subject: [PATCH] # 71 Shortcut buttons enhanced

* adds bootstrap class to prevent link style rendering
* reorganizes templates for home view into separate quickstart templates
---
 konova/templates/konova/home.html             | 116 +-----------------
 .../includes/quickstart/compensations.html    |  37 ++++++
 .../includes/quickstart/ecoaccounts.html      |  42 +++++++
 .../includes/quickstart/interventions.html    |  37 ++++++
 news/templates/news/dashboard-news.html       |   2 +-
 5 files changed, 120 insertions(+), 114 deletions(-)
 create mode 100644 konova/templates/konova/includes/quickstart/compensations.html
 create mode 100644 konova/templates/konova/includes/quickstart/ecoaccounts.html
 create mode 100644 konova/templates/konova/includes/quickstart/interventions.html

diff --git a/konova/templates/konova/home.html b/konova/templates/konova/home.html
index 533bbba3..d6499532 100644
--- a/konova/templates/konova/home.html
+++ b/konova/templates/konova/home.html
@@ -7,123 +7,13 @@
     <div id="quickstart" class="col-md px-3">
         <div class="row px-3">
             <div class="col-md">
-                <h4>
-                {% trans 'Intervention' %}
-                </h4>
-                <div class="row">
-                    <a href="{% url 'intervention:index' %}">
-                        <div class="col-sm-5">
-                            <div class="qs-box d-flex justify-content-center align-items-center">
-                                {% fa5_icon 'pencil-ruler' %}
-                            </div>
-                        </div>
-                    </a>
-                    <div class="col-sm">
-                        <div class="col-md mb-2">
-                            <div>{% trans 'Total' %}</div>
-                            <div class="class badge badge-pill rlp-gd-outline w-100">{{total_intervention_count|intcomma}}</div>
-                        </div>
-                        <div class="col-md">
-                            <div>{% trans 'Shared with you' %}</div>
-                            <div class="class badge badge-pill rlp-gd-outline w-100">{{user_intervention_count|intcomma}}</div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-md">
-                    <div class="row my-1">
-                        <a href="{% url 'intervention:new' %}">
-                            <button class="btn btn-default">{% fa5_icon 'plus' %} {% trans 'Create' %}</button>
-                        </a>
-                    </div>
-                    <div class="row my-1">
-                        <a href="{% url 'intervention:index' %}">
-                            <button class="btn btn-default">{% fa5_icon 'eye' %} {% trans 'Show' %}</button>
-                        </a>
-                    </div>
-                </div>
-                <hr>
+                {% include 'konova/includes/quickstart/interventions.html' %}
             </div>
-
             <div class="col-md">
-                <h4>
-                {% trans 'Compensation' %}
-                </h4>
-                <div class="row">
-                    <a href="{% url 'compensation:index' %}">
-                        <div class="col-sm-5">
-                            <div class="qs-box d-flex justify-content-center align-items-center">
-                                {% fa5_icon 'leaf' %}
-                            </div>
-                        </div>
-                    </a>
-                    <div class="col-sm">
-                        <div class="col-md mb-2">
-                            <div>{% trans 'Total' %}</div>
-                            <div class="class badge badge-pill rlp-gd-outline w-100">{{total_compensation_count|intcomma}}</div>
-                        </div>
-                        <div class="col-md">
-                            <div>{% trans 'Shared with you' %}</div>
-                            <div class="class badge badge-pill rlp-gd-outline w-100">{{user_compensation_count|intcomma}}</div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-md">
-                    <div class="row my-1">
-                        <a href="{% url 'compensation:new' %}">
-                            <button class="btn btn-default">{% fa5_icon 'plus' %} {% trans 'Create' %}</button>
-                        </a>
-                    </div>
-                    <div class="row my-1">
-                        <a href="{% url 'compensation:index' %}">
-                            <button class="btn btn-default">{% fa5_icon 'eye' %} {% trans 'Show' %}</button>
-                        </a>
-                    </div>
-                </div>
-                <hr>
+                {% include 'konova/includes/quickstart/compensations.html' %}
             </div>
-
-
             <div class="col-md">
-                <h4>
-                {% trans 'Eco-account' %}
-                </h4>
-                <div class="row">
-                    <a href="{% url 'compensation:acc-index' %}">
-                        <div class="col-sm-5">
-                            <div class="qs-box d-flex justify-content-center align-items-center">
-                                {% fa5_icon 'tree' %}
-                            </div>
-                        </div>
-                    </a>
-                    <div class="col-sm">
-                        <div class="col-md mb-2">
-                            <div>{% trans 'Total' %}</div>
-                            <div class="class badge badge-pill rlp-gd-outline w-100">{{total_eco_count|intcomma}}</div>
-                        </div>
-                        <div class="col-md">
-                            <div>{% trans 'Shared with you' %}</div>
-                            <div class="class badge badge-pill rlp-gd-outline w-100">{{user_eco_count|intcomma}}</div>
-                        </div>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="col-sm-12 col-lg">
-                        <div class="col-sm">
-                            <div class="row my-1">
-                                <a href="{% url 'compensation:acc-new' %}">
-                                    <button class="btn btn-default">{% fa5_icon 'plus' %} {% trans 'Create' %}</button>
-                                </a>
-                            </div>
-                            <div class="row my-1">
-                                <a href="{% url 'compensation:acc-index' %}">
-                                    <button class="btn btn-default">{% fa5_icon 'eye' %} {% trans 'Show' %}</button>
-                                </a>
-                            </div>
-                        </div>
-                        </div>
-                    </div>
-                </div>
-                <hr>
+                {% include 'konova/includes/quickstart/ecoaccounts.html' %}
             </div>
         </div>
     </div>
diff --git a/konova/templates/konova/includes/quickstart/compensations.html b/konova/templates/konova/includes/quickstart/compensations.html
new file mode 100644
index 00000000..347bbef1
--- /dev/null
+++ b/konova/templates/konova/includes/quickstart/compensations.html
@@ -0,0 +1,37 @@
+{% load i18n fontawesome_5 humanize %}
+
+<h4>
+    {% trans 'Compensation' %}
+</h4>
+<div class="row">
+    <a class="text-decoration-none" href="{% url 'compensation:index' %}">
+        <div class="col-sm-5">
+            <div class="qs-box d-flex justify-content-center align-items-center">
+                {% fa5_icon 'leaf' %}
+            </div>
+        </div>
+    </a>
+    <div class="col-sm">
+        <div class="col-md mb-2">
+            <div>{% trans 'Total' %}</div>
+            <div class="class badge badge-pill rlp-gd-outline w-100">{{total_compensation_count|intcomma}}</div>
+        </div>
+        <div class="col-md">
+            <div>{% trans 'Shared with you' %}</div>
+            <div class="class badge badge-pill rlp-gd-outline w-100">{{user_compensation_count|intcomma}}</div>
+        </div>
+    </div>
+</div>
+<div class="col-md">
+    <div class="row my-1">
+        <a href="{% url 'compensation:new' %}">
+            <button class="btn btn-default">{% fa5_icon 'plus' %} {% trans 'Create' %}</button>
+        </a>
+    </div>
+    <div class="row my-1">
+        <a href="{% url 'compensation:index' %}">
+            <button class="btn btn-default">{% fa5_icon 'eye' %} {% trans 'Show' %}</button>
+        </a>
+    </div>
+</div>
+<hr>
\ No newline at end of file
diff --git a/konova/templates/konova/includes/quickstart/ecoaccounts.html b/konova/templates/konova/includes/quickstart/ecoaccounts.html
new file mode 100644
index 00000000..aa5cc68a
--- /dev/null
+++ b/konova/templates/konova/includes/quickstart/ecoaccounts.html
@@ -0,0 +1,42 @@
+{% load i18n fontawesome_5 humanize %}
+
+<h4>
+    {% trans 'Eco-account' %}
+</h4>
+<div class="row">
+    <a class="text-decoration-none" href="{% url 'compensation:acc-index' %}">
+        <div class="col-sm-5">
+            <div class="qs-box d-flex justify-content-center align-items-center">
+                {% fa5_icon 'tree' %}
+            </div>
+        </div>
+    </a>
+    <div class="col-sm">
+        <div class="col-md mb-2">
+            <div>{% trans 'Total' %}</div>
+            <div class="class badge badge-pill rlp-gd-outline w-100">{{total_eco_count|intcomma}}</div>
+        </div>
+        <div class="col-md">
+            <div>{% trans 'Shared with you' %}</div>
+            <div class="class badge badge-pill rlp-gd-outline w-100">{{user_eco_count|intcomma}}</div>
+        </div>
+    </div>
+</div>
+<div class="row">
+    <div class="col-sm-12 col-lg">
+        <div class="col-sm">
+            <div class="row my-1">
+                <a href="{% url 'compensation:acc-new' %}">
+                    <button class="btn btn-default">{% fa5_icon 'plus' %} {% trans 'Create' %}</button>
+                </a>
+            </div>
+            <div class="row my-1">
+                <a href="{% url 'compensation:acc-index' %}">
+                    <button class="btn btn-default">{% fa5_icon 'eye' %} {% trans 'Show' %}</button>
+                </a>
+            </div>
+        </div>
+    </div>
+</div>
+</div>
+<hr>
\ No newline at end of file
diff --git a/konova/templates/konova/includes/quickstart/interventions.html b/konova/templates/konova/includes/quickstart/interventions.html
new file mode 100644
index 00000000..965faeb6
--- /dev/null
+++ b/konova/templates/konova/includes/quickstart/interventions.html
@@ -0,0 +1,37 @@
+{% load i18n fontawesome_5 humanize %}
+
+<h4>
+    {% trans 'Intervention' %}
+</h4>
+<div class="row">
+    <a class="text-decoration-none" href="{% url 'intervention:index' %}">
+        <div class="col-sm-5">
+            <div class="qs-box d-flex justify-content-center align-items-center">
+                {% fa5_icon 'pencil-ruler' %}
+            </div>
+        </div>
+    </a>
+    <div class="col-sm">
+        <div class="col-md mb-2">
+            <div>{% trans 'Total' %}</div>
+            <div class="class badge badge-pill rlp-gd-outline w-100">{{total_intervention_count|intcomma}}</div>
+        </div>
+        <div class="col-md">
+            <div>{% trans 'Shared with you' %}</div>
+            <div class="class badge badge-pill rlp-gd-outline w-100">{{user_intervention_count|intcomma}}</div>
+        </div>
+    </div>
+</div>
+<div class="col-md">
+    <div class="row my-1">
+        <a href="{% url 'intervention:new' %}">
+            <button class="btn btn-default">{% fa5_icon 'plus' %} {% trans 'Create' %}</button>
+        </a>
+    </div>
+    <div class="row my-1">
+        <a href="{% url 'intervention:index' %}">
+            <button class="btn btn-default">{% fa5_icon 'eye' %} {% trans 'Show' %}</button>
+        </a>
+    </div>
+</div>
+<hr>
\ No newline at end of file
diff --git a/news/templates/news/dashboard-news.html b/news/templates/news/dashboard-news.html
index 6301e2cc..f6aa9c6d 100644
--- a/news/templates/news/dashboard-news.html
+++ b/news/templates/news/dashboard-news.html
@@ -17,7 +17,7 @@
         {% endfor %}
         <div class="col-sm-12 col-md-12 col-lg">
             <div class="card {{msg.importance|bootstrap_cls}} h-100">
-                <a class="w-100 h-100" href="{% url 'news:index' %}">
+                <a class="w-100 h-100 text-decoration-none" href="{% url 'news:index' %}">
                     <div class="card-body  d-flex align-items-center justify-content-center h-100">
                         <h5 class="card-title">{% trans 'Older ...' %}</h5>
                     </div>
-- 
2.45.2