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

fix: change jats_type_override field to be Foundation styled #4530

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+34 −45
Open

fix: change jats_type_override field to be Foundation styled #4530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2ec0ef
#4012 fixes gaps showing underlines
ajrbyers Oct 29, 2024
038db4d
Fix error with extends in account templates #4526
joemull Dec 5, 2024
acb08cf
fix: change jats_type_override field to be Foundation styled
MartinPaulEve Dec 6, 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
Binary file removed src/static/common/img/icons/orcid.gif
View file
Open in desktop
Binary file not shown.
Binary file added src/static/common/img/icons/orcid.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/templates/admin/submission/edit/metadata.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ <h2 id="edit-metadata">Edit Metadata</h2>
<div class="large-6 columns">
<div class="large-12 columns">
<label>{{ info_form.jats_article_type_override.label }}</label>
{{ info_form.jats_article_type_override }}
{{ info_form.jats_article_type_override|foundation }}
Comment on lines 96 to +97
Copy link
Member

Choose a reason for hiding this comment

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

The foundation filter will render the label, I don't think we need the explicit render anymore, as it might render twice

</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/templates/common/elements/orcid_registration.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{% if orcid %}
<p>
ORCiD
<a href="{{ orcid }}"><img alt="ORCID logo" src="{% static 'common/img/icons/orcid.gif' %}"> {{ orcid }}</a>&nbsp;
<a href="{{ orcid }}"><img alt="ORCID logo" src="{% static 'common/img/icons/orcid.png' %}"> {{ orcid }}</a>&nbsp;
[<a href="{% url 'core_register' %}">remove</a>]
</p>
{% else %}
Expand Down
2 changes: 1 addition & 1 deletion src/themes/OLH/templates/core/accounts/activate_account.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% extends "core/base.html" %}
{% comment %}
This template is deprecated. Account pages are now part of the back-office.
{% endcomment %}

{% extends "core/base.html" %}
{% load foundation %}
{% load i18n %}

Expand Down
2 changes: 1 addition & 1 deletion src/themes/OLH/templates/core/accounts/edit_profile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% extends "core/base.html" %}
{% comment %}
This template is deprecated. Account pages are now part of the back-office.
{% endcomment %}

{% extends "core/base.html" %}
{% load i18n %}

{% block title %}{% trans "Edit Profile" %}{% endblock title %}
Expand Down
2 changes: 1 addition & 1 deletion src/themes/OLH/templates/core/accounts/get_reset_token.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% extends "core/base.html" %}
{% comment %}
This template is deprecated. Account pages are now part of the back-office.
{% endcomment %}

{% extends "core/base.html" %}
{% load i18n foundation %}


Expand Down
2 changes: 1 addition & 1 deletion src/themes/OLH/templates/core/accounts/orcid_registration.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% extends "core/base.html" %}
{% comment %}
This template is deprecated. Account pages are now part of the back-office.
{% endcomment %}

{% extends "core/base.html" %}
{% load foundation %}
{% load i18n %}

Expand Down
4 changes: 0 additions & 4 deletions src/themes/OLH/templates/core/accounts/public_profile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
{% comment %}
This template is deprecated. Account pages are now part of the back-office.
{% endcomment %}

{% extends "core/base.html" %}
{% load static %}
{% load i18n %}
Expand Down
2 changes: 1 addition & 1 deletion src/themes/OLH/templates/core/accounts/register.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% extends "core/base.html" %}
{% comment %}
This template is deprecated. Account pages are now part of the back-office.
{% endcomment %}

{% extends "core/base.html" %}
{% load foundation %}
{% load i18n %}

Expand Down
2 changes: 1 addition & 1 deletion src/themes/OLH/templates/core/accounts/reset_password.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% extends "core/base.html" %}
{% comment %}
This template is deprecated. Account pages are now part of the back-office.
{% endcomment %}

{% extends "core/base.html" %}
{% load foundation %}
{% load i18n %}

Expand Down
13 changes: 7 additions & 6 deletions src/themes/OLH/templates/journal/article.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ <h2>{{ article.title|safe }}</h2>
</strong>
{% for author in article.frozen_authors.all %}
{{ author.full_name }}
{% if author.orcid %}<a href="https://orcid.org/{{ author.orcid }}" class=""><img src="https://orcid.org/sites/default/files/images/orcid_16x16.png" alt="orcid logo"></a>{% endif %}
{% if author.orcid %}<a href="https://orcid.org/{{ author.orcid }}" class=""><img src="{% static 'common/img/icons/orcid.png' %}" alt="orcid logo"></a>{% endif %}
{% if author.institution and author.institution != " " %} ({{ author.institution }}){% endif %}
{% if author.display_email and not journal_settings.article.hide_author_email_links %}<a itemprop="email" href="mailto:{{ author.email }}" class="fa fa-envelope email-link"></a>{% endif %}
{% if not forloop.last %}, {% endif %}
Expand Down Expand Up @@ -71,9 +71,10 @@ <h3>{{ article.title|safe }}</h3>
href="#"
{% if author.biography %}data-toggle="author{{ forloop.counter }}{% endif %}">
{% if author.author.enable_public_profile %}<a class="profilelink" href="{% url 'core_public_profile' author.author.uuid %}">{{ author.full_name }}</a>{% else %}{{ author.full_name }}{% endif %}
{% if author.orcid %}<a href="https://orcid.org/{{ author.orcid }}" class="">
<img src="https://orcid.org/sites/default/files/images/orcid_16x16.png" alt="orcid logo">
</a>{% endif %}
{% if author.orcid %}
<a href="https://orcid.org/{{ author.orcid }}">
<img src="{% static 'common/img/icons/orcid.png' %}" alt="orcid logo"></a>
{% endif %}
{% if author.institution and author.institution != " " %}
<span itemprop="worksFor" itemscope
itemtype="http://schema.org/CollegeOrUniversity"><span
Expand Down Expand Up @@ -165,7 +166,7 @@ <h1>{{ article.title|safe }}</h1>
<ul>
{% for author in article.frozen_authors.all %}
<li>{{ author.full_name }}
{% if author.orcid %}<a href="https://orcid.org/{{ author.orcid }}" class=""><img src="https://orcid.org/sites/default/files/images/orcid_16x16.png" alt="orcid logo"></a>{% endif %}
{% if author.orcid %}<a href="https://orcid.org/{{ author.orcid }}" class=""><img src="{% static 'common/img/icons/orcid.png' %}" alt="orcid logo"></a>{% endif %}
{% if author.institution and author.institution != " " %} ({{ author.institution }}){% endif %}
{% if author.display_email and not journal_settings.article.hide_author_email_links %}<a itemprop="email" href="mailto:{{ author.email }}" class="fa fa-envelope email-link"></a>{% endif %}
</li>
Expand Down Expand Up @@ -317,7 +318,7 @@ <h4>{% trans "Authors" %}</h4>
{{ author.full_name }}
{% if author.orcid %}
<a href="https://orcid.org/{{ author.orcid }}" class="">
<img src="https://orcid.org/sites/default/files/images/orcid_16x16.png" alt="orcid logo">
<img src="{% static 'common/img/icons/orcid.png' %}" alt="orcid logo">
</a>
{% endif %}
{% if author.display_email and not journal_settings.article.hide_author_email_links %}
Expand Down
2 changes: 1 addition & 1 deletion src/themes/OLH/templates/repository/preprint.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ <h2>{% trans "Authors" %}</h2>
{{ author.full_name }}{% if author.orcid %}&nbsp;
<a href="https://orcid.org/{{ author.orcid }}"
target="_blank"><img
src="{% static 'common/img/icons/orcid.gif' %}"></a>
src="{% static 'common/img/icons/orcid.png' %}"></a>
{% endif %}{% if not forloop.last %}, {% endif %}
{% endfor %}
</p>
Expand Down
2 changes: 1 addition & 1 deletion src/themes/clean/templates/core/accounts/activate_account.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% extends "core/base.html" %}
{% comment %}
This template is deprecated. Account pages are now part of the back-office.
{% endcomment %}

{% extends "core/base.html" %}
{% load foundation %}
{% load i18n %}

Expand Down
2 changes: 1 addition & 1 deletion src/themes/clean/templates/core/accounts/edit_profile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% extends "core/base.html" %}
{% comment %}
This template is deprecated. Account pages are now part of the back-office.
{% endcomment %}

{% extends "core/base.html" %}
{% load i18n %}
{% load static %}

Expand Down
2 changes: 1 addition & 1 deletion src/themes/clean/templates/core/accounts/get_reset_token.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% extends "core/base.html" %}
{% comment %}
This template is deprecated. Account pages are now part of the back-office.
{% endcomment %}

{% extends "core/base.html" %}
{% load i18n bootstrap4 %}

{% block title %}{% trans "Reset Password" %}{% endblock title %}
Expand Down
2 changes: 1 addition & 1 deletion src/themes/clean/templates/core/accounts/orcid_registration.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% extends "core/base.html" %}
{% comment %}
This template is deprecated. Account pages are now part of the back-office.
{% endcomment %}

{% extends "core/base.html" %}
{% load foundation %}

{% block title %}{% trans 'Unregistered ORCiD' %}{% endblock title %}
Expand Down
4 changes: 0 additions & 4 deletions src/themes/clean/templates/core/accounts/public_profile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
{% comment %}
This template is deprecated. Account pages are now part of the back-office.
{% endcomment %}

{% extends "core/base.html" %}
{% load static %}

Expand Down
2 changes: 1 addition & 1 deletion src/themes/clean/templates/core/accounts/register.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% extends "core/base.html" %}
{% comment %}
This template is deprecated. Account pages are now part of the back-office.
{% endcomment %}

{% extends "core/base.html" %}
{% load bootstrap4 %}
{% load i18n %}

Expand Down
2 changes: 1 addition & 1 deletion src/themes/clean/templates/core/accounts/reset_password.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% extends "core/base.html" %}
{% comment %}
This template is deprecated. Account pages are now part of the back-office.
{% endcomment %}

{% extends "core/base.html" %}
{% load i18n %}
{% load bootstrap4 %}

Expand Down
10 changes: 5 additions & 5 deletions src/themes/clean/templates/journal/article.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ <h1 class="card-title align-text-bottom article-title">{{ article.title|safe }}<
href="{% url 'core_public_profile' author.author.uuid %}">{{ author.full_name }}</a>{% else %}
{{ author.full_name }}{% endif %}
{% if author.orcid %}<a href="https://orcid.org/{{ author.orcid }}">
<span style="background: url(https://orcid.org/sites/default/files/images/orcid_16x16.png) no-repeat;" class="orcid-img"></span>
</a>{% endif %}
<img src="{% static 'common/img/icons/orcid.png' %}" alt="orcid logo"></a>
{% endif %}
{% if author.institution and author.institution != " " %}
<span itemprop="worksFor" itemscope
itemtype="http://schema.org/CollegeOrUniversity"><span
Expand Down Expand Up @@ -155,9 +155,9 @@ <h2>{% trans "Authors" %}</h2>
{% for author in article.frozen_authors.all %}
<li>
{{ author.full_name }}
{% if author.orcid %}<a href="https://orcid.org/{{ author.orcid }}" class="">
<img src="https://orcid.org/sites/default/files/images/orcid_16x16.png" alt="orcid logo">
</a>{% endif %}
{% if author.orcid %}<a href="https://orcid.org/{{ author.orcid }}">
<img src="{% static 'common/img/icons/orcid.png' %}" alt="orcid logo"></a>
{% endif %}
{% if author.institution and author.institution != " " %}
<span itemprop="worksFor" itemscope
itemtype="http://schema.org/CollegeOrUniversity"><span
Expand Down
2 changes: 1 addition & 1 deletion src/themes/material/templates/core/accounts/activate_account.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% extends "core/base.html" %}
{% comment %}
This template is deprecated. Account pages are now part of the back-office.
{% endcomment %}

{% extends "core/base.html" %}
{% load foundation %}
{% load i18n %}

Expand Down
2 changes: 1 addition & 1 deletion src/themes/material/templates/core/accounts/edit_profile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% extends "core/base.html" %}
{% comment %}
This template is deprecated. Account pages are now part of the back-office.
{% endcomment %}

{% extends "core/base.html" %}
{% load i18n %}

{% block title %}{% trans "Edit Profile" %}{% endblock title %}
Expand Down
2 changes: 1 addition & 1 deletion src/themes/material/templates/core/accounts/get_reset_token.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% extends "core/base.html" %}
{% comment %}
This template is deprecated. Account pages are now part of the back-office.
{% endcomment %}

{% extends "core/base.html" %}
{% load i18n materializecss %}

{% block title %}{% trans "Reset Password" %}{% endblock title %}
Expand Down
4 changes: 0 additions & 4 deletions src/themes/material/templates/core/accounts/public_profile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
{% comment %}
This template is deprecated. Account pages are now part of the back-office.
{% endcomment %}

{% extends "core/base.html" %}
{% load static %}
{% load i18n %}
Expand Down
2 changes: 1 addition & 1 deletion src/themes/material/templates/core/accounts/register.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% extends "core/base.html" %}
{% comment %}
This template is deprecated. Account pages are now part of the back-office.
{% endcomment %}

{% extends "core/base.html" %}
{% load materializecss %}
{% load i18n %}
{% load static %}
Expand Down
2 changes: 1 addition & 1 deletion src/themes/material/templates/core/accounts/reset_password.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% extends "core/base.html" %}
{% comment %}
This template is deprecated. Account pages are now part of the back-office.
{% endcomment %}

{% extends "core/base.html" %}
{% load i18n %}
{% load materializecss %}

Expand Down
2 changes: 1 addition & 1 deletion src/themes/material/templates/journal/article.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ <h4>
{% if not forloop.first %}<br/> {% endif %}
{{ author.full_name }}
{% if author.orcid %}<a href="https://orcid.org/{{ author.orcid }}"
class=""><img src="https://orcid.org/sites/default/files/images/orcid_16x16.png" alt="orcid logo"></a>{% endif %}
class=""><img src="{% static 'common/img/icons/orcid.png' %}" alt="orcid logo"></a>{% endif %}
{% if author.institution and author.institution != " " %}
<span itemprop="worksFor" itemscope itemtype="http://schema.org/CollegeOrUniversity"></span>
<span itemprop="name">({{ author.institution }})</span>
Expand Down
2 changes: 1 addition & 1 deletion src/themes/material/templates/repository/preprint.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ <h2>{% trans "Authors" %}</h2>
<div class="truncatejs">
<p class="authors">
{% for author in preprint.authors %}
{{ author.full_name }}{% if author.orcid %}&nbsp;<a href="https://orcid.org/{{ author.orcid }}" target="_blank"><img src="{% static 'common/img/icons/orcid.gif' %}"></a>{% endif %}{% if not forloop.last %}, {% endif %}
{{ author.full_name }}{% if author.orcid %}&nbsp;<a href="https://orcid.org/{{ author.orcid }}" target="_blank"><img src="{% static 'common/img/icons/orcid.png' %}"></a>{% endif %}{% if not forloop.last %}, {% endif %}
{% endfor %}
</p>
</div>
Expand Down