Skip to content

Update with Template Fix #1142

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

Merged
jayvarner merged 9 commits into from
Mar 25, 2026
Merged

Update with Template Fix #1142

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
73b6f99
build(deps): Bump django-celery-results in /requirements
dependabot[bot] Jul 15, 2022
170a05d
Merge pull request #613 from ecds/dependabot/pip/requirements/django-…
jayvarner Feb 21, 2023
0013e58
build(deps): Bump terser from 5.13.1 to 5.16.4
dependabot[bot] Feb 21, 2023
23d641a
Merge pull request #789 from ecds/dependabot/npm_and_yarn/terser-5.16.4
jayvarner Feb 21, 2023
cf93d15
Merge branch 'release' into develop
jayvarner Mar 24, 2026
bb2377a
Add Matomo to local settings. Bump version
jayvarner Mar 25, 2026
e49aed7
Fix formatting
jayvarner Mar 25, 2026
d051613
Merge branch 'main' into develop
jayvarner Mar 25, 2026
8cb4258
Update base.html
jayvarner Mar 25, 2026
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
252 changes: 121 additions & 131 deletions apps/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,173 +1,163 @@
{% load static i18n %}
<!doctype html>
{% load menu_tags %} {% load sass_tags %} {% load wagtailcore_tags %} {%
wagtail_site as current_site %}
<!DOCTYPE html>
{% load menu_tags %}
{% load sass_tags %}
{% load wagtailcore_tags %}
{% wagtail_site as current_site %}
<html lang="en">
<head>
<meta charset="utf-8" />
<meta http-equiv="x-ua-compatible" content="ie=edge" />
<title>
{% block title %} {{ request.site.name }} {% endblock title %}
{% block title %}
{{ request.site.name }}
{% endblock title %}
</title>
<meta property="og:site" content="Readux 2 - Read, Annotate, Publish" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
{% block extra_head %}
<meta name="description" content="" />
<meta name="keywords" content="" />
<meta name="description" content="" />
<meta name="keywords" content="" />
{% endblock extra_head %}
<meta name="author" content="" />
{% if collection.label %}
<meta
property="og:title"
content="Readux collection: {{ collection.label }}"
/>
<meta
name="twitter:title"
content="Readux collection: {{ collection.label }}"
/>
<meta
property="og:image"
content="https://{{ request.META.HTTP_HOST }}/media/{{ collection.thumbnail }}"
/>
<meta property="og:description" content="{{ collection.summary|escape }}" />
<meta
name="twitter:description"
content="{{ collection.summary|escape }}"
/>
<meta property="og:type" content="website" />
<meta
property="og:url"
content="https://{{ request.META.HTTP_HOST }}/col/{{ collection.pid }}"
/>
<meta property="og:title" content="Readux collection: {{ collection.label }}" />
<meta name="twitter:title" content="Readux collection: {{ collection.label }}" />
<meta property="og:image" content="https://{{ request.META.HTTP_HOST }}/media/{{ collection.thumbnail }}" />
<meta property="og:description" content="{{ collection.summary|escape }}" />
<meta name="twitter:description" content="{{ collection.summary|escape }}" />
<meta property="og:type" content="website" />
<meta property="og:url" content="https://{{ request.META.HTTP_HOST }}/col/{{ collection.pid }}" />
{% elif volume.label %}
<meta property="og:title" content="{{ volume.label|escape }}" />
<meta name="twitter:title" content="{{ volume.label|escape }}" />
<meta property="og:description" content="{{ volume.summary|escape }}" />
<meta name="twitter:description" content="{{ volume.summary|escape }}" />
<meta property="og:type" content="book" />
<!-- Zotero metadata -->
<meta name="citation_title" content="{{ volume.label|escape }}" />
<meta name="citation_authors" content="{{ volume.author|safe }}" />
<meta name="citation_date" content="{{ volume.published_date|safe }}" />
<meta name="citation_publisher" content="{{ volume.publisher|safe }}" />
<meta
name="citation_public_url"
content="https://{{ request.META.HTTP_HOST }}{% url 'volume' volume.pid %}/page/all"
/>
{% for lang in volume.languages.all %}
<meta name="citation_language" content="{{ lang.name }}" />
{% endfor %}
<!-- End Zotero metadata -->
<meta property="og:title" content="{{ volume.label|escape }}" />
<meta name="twitter:title" content="{{ volume.label|escape }}" />
<meta property="og:description" content="{{ volume.summary|escape }}" />
<meta name="twitter:description" content="{{ volume.summary|escape }}" />
<meta property="og:type" content="book" />
<!-- Zotero metadata -->
<meta name="citation_title" content="{{ volume.label|escape }}" />
<meta name="citation_authors" content="{{ volume.author|safe }}" />
<meta name="citation_date" content="{{ volume.published_date|safe }}" />
<meta name="citation_publisher" content="{{ volume.publisher|safe }}" />
<meta name="citation_public_url"
content="https://{{ request.META.HTTP_HOST }}{% url 'volume' volume.pid %}/page/all" />
{% for lang in volume.languages.all %}
<meta name="citation_language" content="{{ lang.name }}" />
{% endfor %}
<!-- End Zotero metadata -->

{% for page in volume.canvas_set.all %} {% if forloop.first %}
<meta property="og:image" content="{{ page.social_media }}" />
<meta property="og:image:secure_url" content="{{ page.social_media }}" />
<meta property="og:image:type" content="image/jpeg" />
{% if "/cantaloupe/iiif/2" in page.social_media %}
<meta name="twitter:image" content="{{ page.twitter_media1 }}" />
{% with first_page=volume.canvas_set.first %}
{% if first_page %}
<meta property="og:image" content="{{ first_page.social_media }}" />
<meta property="og:image:secure_url" content="{{ first_page.social_media }}" />
<meta property="og:image:type" content="image/jpeg" />
{% if "/cantaloupe/iiif/2" in first_page.social_media %}
<meta name="twitter:image" content="{{ first_page.twitter_media1 }}" />
{% else %}
<meta name="twitter:image" content="{{ first_page.twitter_media2 }}" />
{% endif %}
<meta property="og:image:width" content="600" />
{% endif %}
{% endwith %}
{% elif page.title %}
<meta property="og:title" content="{{ page.title }}" />
<meta name="twitter:title" content="{{ page.title }}" />
<meta property="og:image"
content="https://{{ request.META.HTTP_HOST }}/apps/static/images/readux_logo.jpg" />
<meta property="og:description" content="{{ page.tagline|striptags }}" />
<meta name="twitter:description" content="{{ page.tagline|striptags }}" />
{% else %}
<meta name="twitter:image" content="{{ page.twitter_media2 }}" />
<meta property="og:title" content="Readux 2" />
<meta name="twitter:title" content="Readux 2" />
<meta property="og:image"
content="https://{{ request.META.HTTP_HOST }}/apps/static/images/readux_logo.jpg" />
<meta property="og:description" content="Read, Annotate, Publish" />
<meta name="twitter:description" content="Read, Annotate, Publish" />
<meta property="og:url" content="https://{{ request.META.HTTP_HOST }}" />
{% endif %}
<meta property="og:image:width" content="600" />
{% endif %} {% endfor %} {% elif page.title %}
<meta property="og:title" content="{{ page.title }}" />
<meta name="twitter:title" content="{{ page.title }}" />
<meta
property="og:image"
content="https://{{ request.META.HTTP_HOST }}/apps/static/images/readux_logo.jpg"
/>
<meta property="og:description" content="{{ page.tagline|striptags }}" />
<meta name="twitter:description" content="{{ page.tagline|striptags }}" />
{% else %}
<meta property="og:title" content="Readux 2" />
<meta name="twitter:title" content="Readux 2" />
<meta
property="og:image"
content="https://{{ request.META.HTTP_HOST }}/apps/static/images/readux_logo.jpg"
/>
<meta property="og:description" content="Read, Annotate, Publish" />
<meta name="twitter:description" content="Read, Annotate, Publish" />
<meta property="og:url" content="https://{{ request.META.HTTP_HOST }}" />
{% endif %}
<meta
name="twitter:image:alt"
content="Readux Logo - Emory Center for Digital scholarship - Read, Annotate, Publish"
/>
<meta name="twitter:image:alt"
content="Readux Logo - Emory Center for Digital scholarship - Read, Annotate, Publish" />
<meta property="og:site_name" content="{{ current_site.site_name }}" />
<meta name="twitter:card" content="summary_large_image" />
<meta name="twitter:site" content="@emorycds" />
<meta name="twitter:creator" content="@emorycds" />
<link rel="icon" href="{% static 'images/favicons/favicon.ico' %}" />
{% block css %}
<link
rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/uikit/3.17.0/css/uikit.min.css"
/>
<link
type="text/css"
href="{% sass_src 'css/readux.scss' %}"
rel="stylesheet"
/>
<link
type="text/css"
href="{% sass_src 'css/components/login.scss' %}"
rel="stylesheet"
/>
{% endblock css %} {% block extra_css %} {% endblock extra_css %}
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/uikit/3.17.0/css/uikit.min.css" />
<link type="text/css" href="{% sass_src 'css/readux.scss' %}" rel="stylesheet" />
<link type="text/css" href="{% sass_src 'css/components/login.scss' %}" rel="stylesheet" />
{% endblock css %}
{% block extra_css %}
{% endblock extra_css %}

</head>

<body>
{# NOTE: Jump to main content required for accessibility #}
<a class="sr-only" href="#main">Jump to main content</a>

{# Primary container; host for Vue application #} {% block nav %} {%
endblock nav %}
{# Primary container; host for Vue application #}
{% block nav %}
{% endblock nav %}
<div id="v-readux">

{# Content container #}
<main id="main">
{# Django errors and alerts #} {% if messages %} {% for message in
messages %}
<div class="uk-alert-{{ message.tags }}" uk-alert>
<a class="uk-alert-close" uk-close></a>
<p>{{ message }}</p>
</div>
{% endfor %} {% endif %} {% block modal %} {% endblock modal %} {% block
wrapper %} {% block content %} {% endblock content %} {% endblock
wrapper %} {# IIIF viewer #} {% block viewer %} {% endblock viewer %}
{# Django errors and alerts #}
{% if messages %}
{% for message in messages %}
<div class="uk-alert-{{ message.tags }}" uk-alert>
<a class="uk-alert-close" uk-close></a>
<p>{{ message }}</p>
</div>
{% endfor %}
{% endif %}

{% block modal %}
{% endblock modal %}

{% block wrapper %}
{% block content %}
{% endblock content %}
{% endblock wrapper %}
{# IIIF viewer #}
{% block viewer %}
{% endblock viewer %}
</main>

{# prevent duplicate footer on homepage bug #} {% if request.path != '/'
%} {% include "_home/_footer.html" %} {% endif %}
{# prevent duplicate footer on homepage bug #}
{% if request.path != '/' %}
{% include "_home/_footer.html" %}
{% endif %}
</div>

<!-- Matomo Image Tracker-->
<img
referrerpolicy="no-referrer-when-downgrade"
src="https://matomo.ecdsdev.org/matomo.php?idsite={{ MATOMO_ID }}&amp;rec=1"
hidden
alt=""
height="0"
width="0"
/>
<img referrerpolicy="no-referrer-when-downgrade"
src="https://matomo.ecdsdev.org/matomo.php?idsite={{ MATOMO_ID }}&amp;rec=1"
hidden
alt=""
height="0"
width="0" />
<!-- End Matomo -->

{% block javascript %}
<script src="{% static 'js/main.js' %}"></script>
{% if has_ga_tracking_id %}
<!-- Google Analytics -->
<script>
window.ga =
window.ga ||
function () {
(ga.q = ga.q || []).push(arguments);
};
ga.l = +new Date();
ga("create", "{{ ga_tracking_id }}", "auto");
ga("send", "pageview");
</script>
<script async src="https://www.google-analytics.com/analytics.js"></script>
<!-- End Google Analytics -->
{% endif %} {% endblock javascript %} {% block extra_javascript %} {%
endblock extra_javascript %} {% csrf_token %}
<script src="{% static 'js/main.js' %}"></script>
{% if has_ga_tracking_id %}
<!-- Google Analytics -->
<script>
window.ga = window.ga || function() {
(ga.q = ga.q || []).push(arguments)
};
ga.l = +new Date;
ga("create", "{{ ga_tracking_id }}", "auto");
ga("send", "pageview");
</script>
<script async src='https://www.google-analytics.com/analytics.js'></script>
<!-- End Google Analytics -->
{% endif %}
{% endblock javascript %}
{% block extra_javascript %}
{% endblock extra_javascript %}
{% csrf_token %}
</body>
</html>
Loading