Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show the application name in the splash screen #6531 #11661

Closed
wants to merge 4 commits into from
Closed

Show the application name in the splash screen #6531 #11661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4c84ea4
Show the application name in the splash screen #6531
MikeGriniezakis Nov 28, 2024
f71e3d0
update changelog to include the change for #6531
MikeGriniezakis Dec 4, 2024
c6c7554
update the default installation template #6531
MikeGriniezakis Dec 13, 2024
d57bf02
Use project settings when getting the APP_NAME #6531
MikeGriniezakis Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions arches/app/templates/index.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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');

Expand Down Expand Up @@ -546,4 +546,4 @@ <h2 class="app-footer-heading">{% trans "Guides and Documentation" %}</h2>

</body>

</html>
</html>
14 changes: 9 additions & 5 deletions arches/app/views/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, I don't think we should be importing settings via the standard Django import until we address the behavior difference between dev and prod fleshed out in #11660.

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):
Expand All @@ -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,
Expand Down
14 changes: 7 additions & 7 deletions arches/install/arches-templates/project_name/templates/index.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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');

Expand Down Expand Up @@ -545,4 +545,4 @@ <h2 class="app-footer-heading">{% trans "Guides and Documentation" %}</h2>

</body>

</html>
</html>
1 change: 1 addition & 0 deletions releases/8.0.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down
Loading