From 4c84ea49d3b4399fa0c5772e438d1730feda03a4 Mon Sep 17 00:00:00 2001
From: Mike Griniezakis <griniezakismike12@gmail.com>
Date: Thu, 28 Nov 2024 11:02:02 +0200
Subject: [PATCH 1/4] Show the application name in the splash screen #6531

Currently, the splash screen does not show the application name.
It shows "Arches" in all cases. This commit adds the application name to the splash screen.

Changed the nav bar to show and the carousel to show the application name.
---
 arches/app/templates/index.htm | 14 +++++++-------
 arches/app/views/main.py       |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/arches/app/templates/index.htm b/arches/app/templates/index.htm
index d65981e37b7..829000cdf71 100644
--- a/arches/app/templates/index.htm
+++ b/arches/app/templates/index.htm
@@ -53,7 +53,7 @@
 
         {% render_bundle 'css/index' 'css' %}
         {% render_bundle 'css/index-slider' 'css' %}
-        
+
         {% if app_settings.ACCESSIBILITY_MODE %}
             {% render_bundle 'css/accessibility' 'css' %}
         {% endif %}
@@ -81,7 +81,7 @@
                             <img class="navbar-brand-v5-icon" src="{% webpack_static 'img/landing/Arches_logo_white.png' %}" alt="{% trans 'Arches Logo' %}">
                         </div>
                         <div class="application-name">
-                            <h1>{% blocktrans %}Arches | {{version}}{% endblocktrans %}</h1>
+                            <h1>{% blocktrans %}{{app_name}} | {{version}}{% endblocktrans %}</h1>
                         </div>
                     </div>
                 </div>
@@ -169,7 +169,7 @@ <h1>{% blocktrans %}Arches | {{version}}{% endblocktrans %}</h1>
                     <div class="slide-img-container">
                         <img src="{% webpack_static 'img/landing/landing-primary.jpg' %}" alt="" aria-describedby="slide1-attribution">
                         <div class="slide-caption">
-                            <h2>{% blocktrans %}Arches {{version}}{% endblocktrans %}</h2>
+                            <h2>{% blocktrans %}{{app_name}} {{version}}{% endblocktrans %}</h2>
                             <p>{% trans "A web and mobile platform for" %}</p>
                             <p>{% trans "managing your most important resource information" %}</p>
                         </div>
@@ -178,7 +178,7 @@ <h2>{% blocktrans %}Arches {{version}}{% endblocktrans %}</h2>
                     <div class="slide-img-container">
                         <img src="{% webpack_static 'img/landing/bhutan_tigersnest_lr.jpg' %}" alt="" aria-describedby="slide2-attribution">
                         <div class="slide-caption">
-                            <h2>{% blocktrans %}Arches {{version}}{% endblocktrans %}</h2>
+                            <h2>{% blocktrans %}{{app_name}} {{version}}{% endblocktrans %}</h2>
                             <p>{% trans "A web and mobile platform for" %}</p>
                             <p>{% trans "managing your most important resource information" %}</p>
                         </div>
@@ -187,7 +187,7 @@ <h2>{% blocktrans %}Arches {{version}}{% endblocktrans %}</h2>
                     <div class="slide-img-container">
                         <img src="{% webpack_static 'img/landing/potala_palace.jpg' %}" alt="" aria-describedby="slide3-attribution">
                         <div class="slide-caption">
-                            <h2>{% blocktrans %}Arches {{version}}{% endblocktrans %}</h2>
+                            <h2>{% blocktrans %}{{app_name}} {{version}}{% endblocktrans %}</h2>
                             <p>{% trans "A web and mobile platform for" %}</p>
                             <p>{% trans "managing your most important resource information" %}</p>
                         </div>
@@ -485,7 +485,7 @@ <h2 class="app-footer-heading">{% trans "Guides and Documentation" %}</h2>
         ], function ($, ko) {
             $(document).ready(function () {
                 App.init();
-                
+
                 var contentSections = $('.app-info-block'),
                     navigationItems = $('#cd-vertical-nav a');
 
@@ -546,4 +546,4 @@ <h2 class="app-footer-heading">{% trans "Guides and Documentation" %}</h2>
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/arches/app/views/main.py b/arches/app/views/main.py
index 29800d2d185..f7eac8c1dea 100644
--- a/arches/app/views/main.py
+++ b/arches/app/views/main.py
@@ -34,6 +34,7 @@ def index(request):
             "main_script": "index",
             "active_page": "Home",
             "app_title": settings.APP_TITLE,
+            "app_name": settings.APP_NAME,
             "copyright_text": settings.COPYRIGHT_TEXT,
             "copyright_year": settings.COPYRIGHT_YEAR,
             "app_version": settings.APP_VERSION,

From f71e3d043b4ec16afefb2466bad6df8dd7c17958 Mon Sep 17 00:00:00 2001
From: Mike Griniezakis <griniezakismike12@gmail.com>
Date: Wed, 4 Dec 2024 10:03:40 +0200
Subject: [PATCH 2/4] update changelog to include the change for #6531

---
 releases/8.0.0.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/releases/8.0.0.md b/releases/8.0.0.md
index 534dd729c22..e38244418e6 100644
--- a/releases/8.0.0.md
+++ b/releases/8.0.0.md
@@ -28,6 +28,7 @@ Arches 8.0.0 Release Notes
 - Make number datatype node values searchable in the main search [#11619](https://github.com/archesproject/arches/issues/11619)
 - Prevent navigation to a new browser tab when clicking Manage link in index.htm [#11635](https://github.com/archesproject/arches/issues/11635)
 - Add support for tile sort order to the bulk data manager [#11638](https://github.com/archesproject/arches/pull/11638)
+- Show the Application Name setting in the splash screen [#6531](https://github.com/archesproject/arches/issues/6531)
 
 ### Dependency changes
 ```

From c6c7554ff0e16950d3ab20fbee79af1d24871ace Mon Sep 17 00:00:00 2001
From: Mike Griniezakis <griniezakismike12@gmail.com>
Date: Fri, 13 Dec 2024 11:44:16 +0200
Subject: [PATCH 3/4] update the default installation template #6531

---
 .../project_name/templates/index.htm               | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/arches/install/arches-templates/project_name/templates/index.htm b/arches/install/arches-templates/project_name/templates/index.htm
index 7c44556067e..45db2f5100a 100644
--- a/arches/install/arches-templates/project_name/templates/index.htm
+++ b/arches/install/arches-templates/project_name/templates/index.htm
@@ -52,7 +52,7 @@
         <link rel="stylesheet" type="text/css" href="{% webpack_static 'plugins/slick/accessible-slick-theme.min.css' %}">
         {% render_bundle 'css/index' 'css' %}
         {% render_bundle 'css/index-slider' 'css' %}
-        
+
         {% if app_settings.ACCESSIBILITY_MODE %}
             {% render_bundle 'css/accessibility' 'css' %}
         {% endif %}
@@ -80,7 +80,7 @@
                             <img class="navbar-brand-v5-icon" src="{% webpack_static 'img/landing/Arches_logo_white.png' %}" alt="{% trans 'Arches Logo' %}">
                         </div>
                         <div class="application-name">
-                            <h1>{% blocktrans %}Arches | {{version}}{% endblocktrans %}</h1>
+                            <h1>{% blocktrans %}{{app_name}} | {{version}}{% endblocktrans %}</h1>
                         </div>
                     </div>
                 </div>
@@ -168,7 +168,7 @@ <h1>{% blocktrans %}Arches | {{version}}{% endblocktrans %}</h1>
                     <div class="slide-img-container">
                         <img src="{% webpack_static 'img/landing/landing-primary.jpg' %}" alt="" aria-describedby="slide1-attribution">
                         <div class="slide-caption">
-                            <h2>{% blocktrans %}Arches {{version}}{% endblocktrans %}</h2>
+                            <h2>{% blocktrans %}{{app_name}} {{version}}{% endblocktrans %}</h2>
                             <p>{% trans "A web and mobile platform for" %}</p>
                             <p>{% trans "managing your most important resource information" %}</p>
                         </div>
@@ -177,7 +177,7 @@ <h2>{% blocktrans %}Arches {{version}}{% endblocktrans %}</h2>
                     <div class="slide-img-container">
                         <img src="{% webpack_static 'img/landing/bhutan_tigersnest_lr.jpg' %}" alt="" aria-describedby="slide2-attribution">
                         <div class="slide-caption">
-                            <h2>{% blocktrans %}Arches {{version}}{% endblocktrans %}</h2>
+                            <h2>{% blocktrans %}{{app_name}} {{version}}{% endblocktrans %}</h2>
                             <p>{% trans "A web and mobile platform for" %}</p>
                             <p>{% trans "managing your most important resource information" %}</p>
                         </div>
@@ -186,7 +186,7 @@ <h2>{% blocktrans %}Arches {{version}}{% endblocktrans %}</h2>
                     <div class="slide-img-container">
                         <img src="{% webpack_static 'img/landing/potala_palace.jpg' %}" alt="" aria-describedby="slide3-attribution">
                         <div class="slide-caption">
-                            <h2>{% blocktrans %}Arches {{version}}{% endblocktrans %}</h2>
+                            <h2>{% blocktrans %}{{app_name}} {{version}}{% endblocktrans %}</h2>
                             <p>{% trans "A web and mobile platform for" %}</p>
                             <p>{% trans "managing your most important resource information" %}</p>
                         </div>
@@ -484,7 +484,7 @@ <h2 class="app-footer-heading">{% trans "Guides and Documentation" %}</h2>
         ], function ($, ko) {
             $(document).ready(function () {
                 App.init();
-                
+
                 var contentSections = $('.app-info-block'),
                     navigationItems = $('#cd-vertical-nav a');
 
@@ -545,4 +545,4 @@ <h2 class="app-footer-heading">{% trans "Guides and Documentation" %}</h2>
 
 </body>
 
-</html>
\ No newline at end of file
+</html>

From d57bf025b5cd939458cc3a486e502695c3458de9 Mon Sep 17 00:00:00 2001
From: Mike Griniezakis <griniezakismike12@gmail.com>
Date: Mon, 16 Dec 2024 10:46:25 +0200
Subject: [PATCH 4/4] Use project settings when getting the APP_NAME #6531

---
 arches/app/views/main.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/arches/app/views/main.py b/arches/app/views/main.py
index f7eac8c1dea..4961dc50e2f 100644
--- a/arches/app/views/main.py
+++ b/arches/app/views/main.py
@@ -16,14 +16,17 @@
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 
-import re
-import urllib.request, urllib.error, urllib.parse
+import urllib.error
+import urllib.parse
+import urllib.request
 from urllib.parse import urlparse
+
+from django.conf import settings as project_settings
+from django.http import HttpResponse, HttpResponseNotFound
+from django.shortcuts import render
+
 from arches import __version__
 from arches.app.models.system_settings import settings
-from django.shortcuts import render, redirect
-from django.http import HttpResponseNotFound, HttpResponse, HttpResponseRedirect
-from django.utils import translation
 
 
 def index(request):
@@ -34,7 +37,7 @@ def index(request):
             "main_script": "index",
             "active_page": "Home",
             "app_title": settings.APP_TITLE,
-            "app_name": settings.APP_NAME,
+            "app_name": project_settings.APP_NAME,
             "copyright_text": settings.COPYRIGHT_TEXT,
             "copyright_year": settings.COPYRIGHT_YEAR,
             "app_version": settings.APP_VERSION,