diff --git a/arches/app/templates/index.htm b/arches/app/templates/index.htm index d65981e37b..829000cdf7 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 @@ {% trans 'Arches Logo' %}
-

{% blocktrans %}Arches | {{version}}{% endblocktrans %}

+

{% blocktrans %}{{app_name}} | {{version}}{% endblocktrans %}

@@ -169,7 +169,7 @@

{% blocktrans %}Arches | {{version}}{% endblocktrans %}

-

{% blocktrans %}Arches {{version}}{% endblocktrans %}

+

{% blocktrans %}{{app_name}} {{version}}{% endblocktrans %}

{% trans "A web and mobile platform for" %}

{% trans "managing your most important resource information" %}

@@ -178,7 +178,7 @@

{% blocktrans %}Arches {{version}}{% endblocktrans %}

-

{% blocktrans %}Arches {{version}}{% endblocktrans %}

+

{% blocktrans %}{{app_name}} {{version}}{% endblocktrans %}

{% trans "A web and mobile platform for" %}

{% trans "managing your most important resource information" %}

@@ -187,7 +187,7 @@

{% blocktrans %}Arches {{version}}{% endblocktrans %}

-

{% blocktrans %}Arches {{version}}{% endblocktrans %}

+

{% blocktrans %}{{app_name}} {{version}}{% endblocktrans %}

{% trans "A web and mobile platform for" %}

{% trans "managing your most important resource information" %}

@@ -485,7 +485,7 @@ ], function ($, ko) { $(document).ready(function () { App.init(); - + var contentSections = $('.app-info-block'), navigationItems = $('#cd-vertical-nav a'); @@ -546,4 +546,4 @@ - \ No newline at end of file + diff --git a/arches/app/views/main.py b/arches/app/views/main.py index 29800d2d18..4961dc50e2 100644 --- a/arches/app/views/main.py +++ b/arches/app/views/main.py @@ -16,14 +16,17 @@ along with this program. If not, see . """ -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,6 +37,7 @@ def index(request): "main_script": "index", "active_page": "Home", "app_title": settings.APP_TITLE, + "app_name": project_settings.APP_NAME, "copyright_text": settings.COPYRIGHT_TEXT, "copyright_year": settings.COPYRIGHT_YEAR, "app_version": settings.APP_VERSION, diff --git a/arches/install/arches-templates/project_name/templates/index.htm b/arches/install/arches-templates/project_name/templates/index.htm index 7c44556067..45db2f5100 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 @@ {% 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 @@ {% trans 'Arches Logo' %}
-

{% blocktrans %}Arches | {{version}}{% endblocktrans %}

+

{% blocktrans %}{{app_name}} | {{version}}{% endblocktrans %}

@@ -168,7 +168,7 @@

{% blocktrans %}Arches | {{version}}{% endblocktrans %}

-

{% blocktrans %}Arches {{version}}{% endblocktrans %}

+

{% blocktrans %}{{app_name}} {{version}}{% endblocktrans %}

{% trans "A web and mobile platform for" %}

{% trans "managing your most important resource information" %}

@@ -177,7 +177,7 @@

{% blocktrans %}Arches {{version}}{% endblocktrans %}

-

{% blocktrans %}Arches {{version}}{% endblocktrans %}

+

{% blocktrans %}{{app_name}} {{version}}{% endblocktrans %}

{% trans "A web and mobile platform for" %}

{% trans "managing your most important resource information" %}

@@ -186,7 +186,7 @@

{% blocktrans %}Arches {{version}}{% endblocktrans %}

-

{% blocktrans %}Arches {{version}}{% endblocktrans %}

+

{% blocktrans %}{{app_name}} {{version}}{% endblocktrans %}

{% trans "A web and mobile platform for" %}

{% trans "managing your most important resource information" %}

@@ -484,7 +484,7 @@ ], function ($, ko) { $(document).ready(function () { App.init(); - + var contentSections = $('.app-info-block'), navigationItems = $('#cd-vertical-nav a'); @@ -545,4 +545,4 @@ - \ No newline at end of file + diff --git a/releases/8.0.0.md b/releases/8.0.0.md index 534dd729c2..e38244418e 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 ```