From a44bb4131dd191b4ef5be4e1403fd18bb4987b55 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Thu, 26 Sep 2024 14:31:54 +0200
Subject: 🩹 Welcome page: simplify and init Welcome fields management
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ishtar_common/templates/index.html   |  4 ++--
 ishtar_common/templates/welcome.html | 10 ----------
 2 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 ishtar_common/templates/welcome.html

(limited to 'ishtar_common/templates')

diff --git a/ishtar_common/templates/index.html b/ishtar_common/templates/index.html
index d1000396a..69bc52617 100644
--- a/ishtar_common/templates/index.html
+++ b/ishtar_common/templates/index.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% block content %}<div id="welcome" class="container">
-    <h2>{% if welcome_title %}{{welcome_title}}{% else %}{% trans "Welcome in Ishtar, open source software for management and inventory of archaeological data" %}{% endif %}</h2>
+    <h2>{{welcome_title}}</h2>
     <div class="row">
         {% if display_random_image %}
         {{random_image}}
@@ -9,7 +9,7 @@
         <div class="col col-lg-9">
             <div class="card">
                 <div class="card-body">
-                {% if homepage %}{{homepage|safe}}{% else %}{% include "welcome.html" %}{% endif %}
+                    {{homepage|safe}}
                 </div>
             </div>
         </div>
diff --git a/ishtar_common/templates/welcome.html b/ishtar_common/templates/welcome.html
deleted file mode 100644
index c5d21cecc..000000000
--- a/ishtar_common/templates/welcome.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% load i18n %}
-
-<p>{% trans "Some useful links:" %}</p>
-<ul>
-    <li><a href='https://ishtar-archeo.net' target="_blank">{% trans "Presentation site and blog" %}</a>{% trans ":"%} {% trans "stay tuned with Ishtar news!" %}</li>
-    <li><a href="https://ishtar.readthedocs.io/fr/{{ISHTAR_DOCUMENT_VERSION}}/" target="_blank">{% trans "Documentation" %}</a>{% trans ":"%} {% trans "inline documentation." %}</li>
-    <li><a href="{% url 'admin:index' %}" target="_blank">{% trans "Admin interface" %}</a>{% trans ":"%} {% trans "for admin only." %}</li>
-    <li><a href="https://discourse.ishtar-archeo.net/" target="_blank">{% trans "Forum" %}</a>{% trans ":"%} {% trans "need help? find a new bug? a fantastic feature to propose? Here is the place to go." %}</li>
-    <li><a href="https://gitlab.com/iggdrasil/ishtar" target="_blank">{% trans "Source code" %}</a> &ndash; <a href="https://tickets.iggdrasil.net/projects/ishtar" target="_blank">{% trans "tickets" %}</a>{% trans ":"%} {% trans "where the magic happens." %}</li>
-</ul>
-- 
cgit v1.2.3