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 2 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>
1 change: 1 addition & 0 deletions arches/app/views/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ def index(request):
"main_script": "index",
"active_page": "Home",
"app_title": settings.APP_TITLE,
"app_name": settings.APP_NAME,
Copy link
Member

Choose a reason for hiding this comment

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

This doesn't seem to use the project settings, but rather only the Arches settings, so this value remains 'Arches'.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I updated the code to use the project settings when getting the APP_NAME in the commit d57bf02

Copy link
Member

Choose a reason for hiding this comment

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

Isn't "Arches" the expected value if there has not been a system settings tile saved for this setting?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Upon running the setup_db, the value "Arches" is inserted as the default value into the Application Name setting. With my previous commit, the splash page only changes when the Application Name is changed through the settings.

"copyright_text": settings.COPYRIGHT_TEXT,
"copyright_year": settings.COPYRIGHT_YEAR,
"app_version": settings.APP_VERSION,
Expand Down
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