Skip to content

Commit 42cd41b

Browse files
StephDriverStephDriver
committed
WIP end of Friday
1 parent f2da6db commit 42cd41b

File tree

8 files changed

+82
-45
lines changed

8 files changed

+82
-45
lines changed

‎src/themes/OLH/templates/elements/journal/box_article.html‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44

55
<div class="box article">
66
<a href="{% if article.is_remote %}{{ article.remote_url }}{% else %}{{ article.url }}{% endif %}"
7-
class="box-link"></a>
7+
class="box-link"
8+
aria-labelledby="{{ article.id }}-box-title">
9+
</a>
810
<div class="clearfix">
911
{% if not journal_settings.article.disable_article_thumbnails %}
1012
<div class="large-2 columns show-for-large">
@@ -25,21 +27,21 @@
2527
{% endif %}
2628

2729
{% if level == "deep" %}
28-
<h4>{{ article.title|safe }}
30+
<h4 id="{{ article.id }}-box-title" >{{ article.title|safe }}
2931
{% if article.is_remote %}
3032
&nbsp;<i aria-hidden="true" class="fa fa-external-link small-icon-text"></i>
3133
<span class="sr-only">, {% trans 'externally hosted article' %}.</span>
3234
{% endif %}
3335
</h4>
3436
{% elif level == "shallow" %}
35-
<h3>{{ article.title|safe }}
37+
<h3 id="{{ article.id }}-box-title" >{{ article.title|safe }}
3638
{% if article.is_remote %}
3739
&nbsp;<i aria-hidden="true" class="fa fa-external-link small-icon-text"></i>
3840
<span class="sr-only">, {% trans 'externally hosted article' %}.</span>
3941
{% endif %}
4042
</h3>
4143
{% else %}
42-
<h2>{{ article.title|safe }}
44+
<h2 id="{{ article.id }}-box-title" >{{ article.title|safe }}
4345
{% if article.is_remote %}
4446
&nbsp;<i aria-hidden="true" class="fa fa-external-link small-icon-text"></i>
4547
<span class="sr-only">, {% trans 'externally hosted article' %}.</span>

‎src/themes/OLH/templates/elements/journal/issue_list.html‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
{% for issue in issues %}
44
<div class="medium-3 columns {% if forloop.last %}end{% endif %}">
55
<div class="box issue">
6-
<a href="{% url 'journal_issue' issue.id %}" class="box-link"></a>
6+
<a href="{% url 'journal_issue' issue.id %}" class="box-link"
7+
aria-labelledby="{{ issue.id }}-box-title"
8+
aria-describedby="{{ issue.id }}-box-details" >
9+
</a>
710
{% if issue.cover_image %}
811
{% svg_or_image issue.cover_image alt_text=issue.title %}
912
{% elif journal.default_cover_image %}
@@ -13,10 +16,10 @@
1316
{% endif %}
1417

1518
<div class="info-bar">
16-
<h3>
19+
<h3 id="{{ issue.id }}-box-title">
1720
<span aria-label='{{ issue.display_title_a11y }}'>{{ issue.display_title }}</span>
1821
</h3>
19-
<p>{{ issue.get_sorted_articles.count }} {% trans "items" %}
22+
<p id="{{ issue.id }}-box-details">{{ issue.get_sorted_articles.count }} {% trans "items" %}
2023
</p>
2124
</div>
2225
</div>

‎src/themes/OLH/templates/journal/collections.html‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,27 @@ <h1>{% trans issue_type.plural_name %}</h1>
1818
{% for collection in collections %}
1919
<div class="large-4 columns {% if forloop.last %}end{% endif %}">
2020
<div class="box collection " data-equalizer-watch>
21-
<a href="{% url 'journal_collection' collection.pk %}" class="box-link"></a>
21+
<a href="{% url 'journal_collection' collection.pk %}" class="box-link"
22+
aria-labelledby="{{ collection.pk }}-box-link"
23+
aria-describedby="{{ collection.pk }}-box-link-details {{ collection.pk }}-box-link-description {{ collection.pk }}-box-link-image">
24+
</a>
2225
<img
26+
id="{{ collection.pk }}-box-link-image"
27+
aria-hidden="true"
2328
src="{{ collection.hero_image_url }}"
2429
alt="{{ collection.issue_title }}"
2530
class="img-fluid"
2631
onerror="if (this.src !='{% static 'common/img/sample/article-small.jpg' %}') this.src='{% static 'common/img/sample/article-small.jpg' %}'"
2732
>
28-
<div class="content">
29-
<p>{% trans 'Collection' %}<br/>
33+
<div class="content" aria-hidden="true">
34+
<p id="{{ collection.pk }}-box-link-details">{% trans 'Collection' %}<br/>
3035
<small>{% trans "Published" %}: {{ collection.date|date_human }}</small>
3136
</p>
32-
<h2>{{ collection.issue_title }}</h2>
37+
<h2 id="{{ collection.pk }}-box-link">{{ collection.issue_title }}</h2>
3338
{% if collection.short_description %}
34-
<p>{{ collection.short_description|safe }}</p>
39+
<p id="{{ collection.pk }}-box-link-description">{{ collection.short_description|safe }}</p>
3540
{% else %}
36-
<p>{{ collection.issue_description|safe }}</p>
41+
<p id="{{ collection.pk }}-box-link-description">{{ collection.issue_description|safe }}</p>
3742
{% endif %}
3843
</div>
3944
</div>

‎src/themes/OLH/templates/journal/homepage_elements/carousel.html‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,12 @@ <h2 id="carousel-title" class="sr-only">{% trans 'Carousel' %}</h2>
77
<ul class="orbit-container orbit-carousel">
88
{% for carousel_item in carousel_items %}
99
<li class="orbit-slide overlay">
10-
<a href="{{ carousel_item.url }}" class="box-link"></a>
10+
<a href="{{ carousel_item.url }}" class="box-link"
11+
aria-labelledby="{{ carousel_item.id }}-title"
12+
aria-describedby="{{ carousel_item.id }}-subtitle {{ carousel_item.id }}-details">
13+
</a>
1114
<img class="orbit-image"
15+
aria-hidden="true"
1216
{% if carousel_item.large_image_file.id %}
1317
src="{% url carousel_item.carousel_image_resolver 'id' carousel_item.id carousel_item.large_image_file.id %}"
1418
{% elif carousel_item.hero_image_url %}
@@ -21,11 +25,11 @@ <h2 id="carousel-title" class="sr-only">{% trans 'Carousel' %}</h2>
2125
src=""
2226
{% endif %}
2327
alt="{{ carousel_item.carousel_title|striptags }}">
24-
<figcaption class="orbit-caption">
25-
<p>{{ carousel_item.carousel_subtitle|safe }}</p>
26-
<h3>{{ carousel_item.carousel_title|truncatechars_html:200|safe }}</h3>
28+
<figcaption class="orbit-caption" aria-hidden="true">
29+
<p id="{{ carousel_item.id }}-subtitle">{{ carousel_item.carousel_subtitle|safe }}</p>
30+
<h3 id="{{ carousel_item.id }}-title">{{ carousel_item.carousel_title|truncatechars_html:200|safe }}</h3>
2731
{% if request.site_type.code == 'press' and carousel_item.stage %}
28-
<p>{% trans 'Published in: ' %} {{ carousel_item.journal.name }}</p>
32+
<p id="{{ carousel_item.id }}-details">{% trans 'Published in: ' %} {{ carousel_item.journal.name }}</p>
2933
{% endif %}
3034
</figcaption>
3135
</li>

‎src/themes/OLH/templates/journal/homepage_elements/journals.html‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@ <h2 id="featured-journals-title" class="title">{% trans "Featured Journals" %}</
1010
<div class="box journal-list">
1111

1212
{% if current_journal.is_remote %}
13-
<a href="{{ current_journal.remote_view_url }}" class="box-link"></a>
13+
<a href="{{ current_journal.remote_view_url }}" class="box-link"
14+
aria-labelledby="{{ current_journal.id }}-remote-title"
15+
aria-describedby="featured-journals-title">
16+
</a>
1417
<img src="{% if current_journal.default_cover_image %}{{ current_journal.default_cover_image.url }}{% endif %}">
15-
<div class="content">
16-
<h3><a href="{{ current_journal.remote_view_url }}">
18+
<div class="content" aria-hidden="true">
19+
<h3 id="{{ current_journal.id }}-remote-title"><a href="{{ current_journal.remote_view_url }}">
1720
{{ current_journal.name }}
1821
{% include "elements/icons/link_external.html" %}
1922
</a></h3>
@@ -22,11 +25,14 @@ <h3><a href="{{ current_journal.remote_view_url }}">
2225
{% else %}
2326

2427
<a href="{{ current_journal.site_url }}"
25-
class="box-link"></a>
26-
<img src="{% if current_journal.default_cover_image %}{{ current_journal.default_cover_image.url }}{% endif %}" alt="{% if current_journal.name != " " and current_journal.name != "" %}{{ current_journal.name }}{% else %}{% trans 'Unnamed Journal' %}{% endif %}">
28+
class="box-link"
29+
aria-labelledby="{{ current_journal.id }}-title"
30+
aria-describedby="featured-journals-title">
2731
</a>
28-
<div class="content">
29-
<h3><a href="{{ current_journal.site_url }}">
32+
<img src="{% if current_journal.default_cover_image %}{{ current_journal.default_cover_image.url }}{% endif %}" alt="{% if current_journal.name != " " and current_journal.name != "" %}{{ current_journal.name }}{% else %}{% trans 'Unnamed Journal' %}{% endif %}"
33+
aria-hidden="true">
34+
<div class="content" aria-hidden="true">
35+
<h3 id="{{ current_journal.id }}-title"><a href="{{ current_journal.site_url }}">
3036
{% if current_journal.name != " " and current_journal.name != "" %}
3137
{{ current_journal.name }}{% else %}{% trans "Unnamed Journal" %}
3238
{% endif %}

‎src/themes/OLH/templates/journal/homepage_elements/popular.html‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,33 @@ <h2 id="popular-articles-title" class="title">{% trans 'Most Popular Articles' %
1010
<div class="large-4 columns{% if forloop.last %} end{% endif %}" >
1111
<div class="box" data-equalizer-watch>
1212
<a href="{% if article.is_remote %}{{ article.remote_url }}{% else %}{{ article.url }}{% endif %}"
13-
class="box-link"></a>
13+
class="box-link"
14+
aria-labelledby="{{ article.id }}-box-title"
15+
aria-describedby="{{ article.id }}-box-image popular-articles-title" ></a>
1416

1517
{% if not journal_settings.article.disable_article_large_image %}
1618
{% if article.large_image_file %}
1719
<img src="{% url 'article_file_download' 'id' article.id article.large_image_file.id %}"
18-
alt="{{ article.title|striptags }}" class="feature-article-image">
20+
alt="{{ article.title|striptags }}" class="feature-article-image"
21+
id="{{ article.id }}-box-image" aria-hidden="true">
1922
{% elif article.issue.large_image %}
2023
<img src="{{ article.issue.large_image.url }}"
21-
alt="{{ article.title|striptags }}" class="feature-article-image">
24+
alt="{{ article.title|striptags }}" class="feature-article-image"
25+
id="{{ article.id }}-box-image" aria-hidden="true">
2226
{% elif article.journal.default_large_image %}
2327
<img src="{{ article.journal.default_large_image.url }}"
24-
alt="{{ article.title|striptags }}" class="feature-article-image">
28+
alt="{{ article.title|striptags }}" class="feature-article-image"
29+
id="{{ article.id }}-box-image" aria-hidden="true">
2530
{% else %}
2631
<img src="{% static 'common/img/sample/article-small.jpg' %}"
27-
alt="{{ article.title|striptags }}" class="feature-article-image">
32+
alt="{{ article.title|striptags }}" class="feature-article-image"
33+
id="{{ article.id }}-box-image" aria-hidden="true">
2834
{% endif %}
2935
{% endif %}
3036

3137
<div class="content">
3238
<p class="byline">{{ article.author_list }}</p>
33-
<h3>{{ article.title|safe|truncatechars:200 }}</h3>
39+
<h3 id="{{ article.id }}-box-title">{{ article.title|safe|truncatechars:200 }}</h3>
3440
</div>
3541
</div>
3642
</div>

‎src/themes/OLH/templates/press/homepage_elements/journals_and_html.html‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,14 @@ <h2 class="title">{% trans "Featured Journals" %}</h2>
1212
<div class="box journal-list">
1313

1414
{% if current_journal.is_remote %}
15-
<a href="{{ current_journal.remote_view_url }}" class="box-link"></a>
16-
<img src="{% if current_journal.default_cover_image %}{{ current_journal.default_cover_image.url }}{% endif %}">
15+
<a href="{{ current_journal.remote_view_url }}" class="box-link"
16+
aria-labelledby="{{ current_journal.id }}-remote-title"
17+
aria-describedby="featured-journals-title"></a>
18+
<img src="{% if current_journal.default_cover_image %}{{ current_journal.default_cover_image.url }}{% endif %}"
19+
aria-hidden="true">
1720

18-
<div class="content">
19-
<h3><a href="{{ current_journal.remote_view_url }}" target="_blank">
21+
<div class="content" aria-hidden="true">
22+
<h3 id="{{ current_journal.id }}-remote-title"><a href="{{ current_journal.remote_view_url }}" target="_blank">
2023
{{ current_journal.name }}
2124
{% include "elements/icons/link_external.html" %}
2225
</a></h3>
@@ -25,11 +28,14 @@ <h3><a href="{{ current_journal.remote_view_url }}" target="_blank">
2528
{% else %}
2629

2730
<a href="{{ current_journal.site_url }}"
28-
class="box-link"></a>
29-
<img src="{% if current_journal.default_cover_image %}{{ current_journal.default_cover_image.url }}{% endif %}" alt="{% if current_journal.name != " " and current_journal.name != "" %}{{ current_journal.name }}{% else %}Unnamed Journal{% endif %}">
31+
class="box-link"
32+
aria-labelledby="{{ current_journal.id }}-title"
33+
aria-describedby="featured-journals-title"></a>
34+
<img src="{% if current_journal.default_cover_image %}{{ current_journal.default_cover_image.url }}{% endif %}" alt="{% if current_journal.name != " " and current_journal.name != "" %}{{ current_journal.name }}{% else %}Unnamed Journal{% endif %}"
35+
aria-hidden="true">
3036
</a>
31-
<div class="content">
32-
<h3><a href="{{ current_journal.site_url }}">{% if current_journal.name != " " and current_journal.name != "" %}
37+
<div class="content" aria-hidden="true">
38+
<h3 id="{{ current_journal.id }}-title"><a href="{{ current_journal.site_url }}">{% if current_journal.name != " " and current_journal.name != "" %}
3339
{{ current_journal.name }}{% else %}{% trans "Unnamed Journal" %}{% endif %}</a></h3>
3440
</div>
3541
{% endif %}

‎src/themes/OLH/templates/repository/list.html‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,22 @@ <h1>{{ request.repository.object_name_plural }}</h1>
3030
{% for preprint in preprints %}
3131
<div class="box article">
3232
<a href="{% url 'repository_preprint' preprint.pk %}"
33-
class="box-link"></a>
34-
<div class="clearfix">
33+
class="box-link"
34+
aria-labelledby="{{ preprint.id }}-preprint-title"
35+
aria-describedby="{{ preprint.id }}-preprint-authors {{ preprint.id }}-preprint-details"></a>
36+
</a>
37+
<div class="clearfix" aria-hidden="true">
3538
<div class="large-12s columns end">
36-
<h2>{{ preprint.title|safe }}</h2>
37-
<p>{{ preprint.display_authors_compact }}</p>
38-
<p><span class="date">
39+
<h2 id="{{ preprint.id }}-preprint-title">{{ preprint.title|safe }}</h2>
40+
<p id="{{ preprint.id }}-preprint-authors">{{ preprint.display_authors_compact }}</p>
41+
<p id="{{ preprint.id }}-preprint-details"><span class="date">
3942
<i aria-hidden="true" class="fa fa-calendar"></i>
4043
<time datetime="{{ preprint.date_published|date:"Y-m-d" }}">
4144
<span role="time">{{ preprint.date_published|date_human }}</span>
4245
</time>&nbsp;&nbsp;
43-
<i aria-hidden="true" class="fa fa-paperclip"></i> {% include "common/repository/subject_display.html" %}</span></p>
46+
<i aria-hidden="true" class="fa fa-paperclip"></i>
47+
<span class="sr-only">{% trans 'subject:' %}</span>
48+
{% include "common/repository/subject_display.html" %}</span></p>
4449
<p>{{ preprint.abstract|striptags|truncatesmart:400 }}</p>
4550
</div>
4651
</div>

0 commit comments

Comments
 (0)