Skip to content

Commit 3e800e1

Browse files
StephDriverStephDriver
committed
a11y: #4232 add OLH nav landmark
1 parent c8e8369 commit 3e800e1

File tree

3 files changed

+146
-143
lines changed

3 files changed

+146
-143
lines changed

‎src/themes/OLH/templates/core/base.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<body>
5050
{% include "common/elements/skip_to_main_content.html" %}
5151
<div class="wrapper">
52-
<header class="main-header" role="banner">
52+
<header class="main-header">
5353
<div class="main top-bar">
5454
<div class="top-bar-left header-image-bar border-right">
5555
{% if request.journal %}

‎src/themes/OLH/templates/core/nav.html

+92-90
Original file line numberDiff line numberDiff line change
@@ -3,101 +3,103 @@
33
{% load hooks %}
44
{% load next_url %}
55

6-
<div class="top-bar" id="main-menu" style="display: block;">
7-
<ul class="menu vertical medium-horizontal" data-responsive-menu="drilldown medium-dropdown">
8-
{% if request.journal.nav_home %}<li><a href="{% url 'website_index' %}">{% trans 'Home' %}</a></li>{% endif %}
9-
{% if request.journal.nav_news %}<li><a href="{% url 'core_news_list' %}">{{ journal_settings.news.news_title }}</a></li>{% endif %}
10-
{% for item in navigation_items %}
11-
{% if item.has_sub_nav %}
12-
<li class=".is-dropdown-submenu-parent"><a href="#"
13-
data-options="is_hover:true; hover_timeout:5000">{{ item.link_name }}</a>
14-
<ul class="menu vertical medium-horizontal">
15-
{% if item.link %}<li><a href="{{ item.url }}">{{ item.link_name }}</a></li>{% endif %}
16-
{% for subnav in item.sub_nav_items %}
17-
<li><a href="{{ subnav.url }}">{{ subnav.link_name }}</a></li>
18-
{% endfor %}
19-
</ul>
20-
</li>
21-
{% elif not item.for_footer %}
22-
<li><a href="{{ item.url }}">{{ item.link_name }}</a></li>
23-
{% endif %}
24-
{% endfor %}
25-
{% if request.journal.nav_articles %}<li><a href="{% url 'journal_articles' %}">{% trans 'Articles' %}</a></li>{% endif %}
26-
{% if request.journal.nav_issues %}<li><a href="{% url 'journal_issues' %}">{% trans 'Issues' %}</a></li>{% endif %}
27-
{% if journal_settings.general.enable_editorial_display %}
28-
{% if journal_settings.general.multi_page_editorial %}
29-
<li class=".is-dropdown-submenu-parent">
30-
<a href="#" data-options="is_hover:true; hover_timeout:5000">{{ journal_settings.styling.editorial_group_page_name }}</a>
6+
<nav>
7+
<div class="top-bar" id="main-menu" style="display: block;">
8+
<ul class="menu vertical medium-horizontal" data-responsive-menu="drilldown medium-dropdown">
9+
{% if request.journal.nav_home %}<li><a href="{% url 'website_index' %}">{% trans 'Home' %}</a></li>{% endif %}
10+
{% if request.journal.nav_news %}<li><a href="{% url 'core_news_list' %}">{{ journal_settings.news.news_title }}</a></li>{% endif %}
11+
{% for item in navigation_items %}
12+
{% if item.has_sub_nav %}
13+
<li class=".is-dropdown-submenu-parent"><a href="#"
14+
data-options="is_hover:true; hover_timeout:5000">{{ item.link_name }}</a>
3115
<ul class="menu vertical medium-horizontal">
32-
{% for group in request.journal.editorial_groups %}
33-
<li><a href="{% url 'editorial_team_group' group.pk %}">{{ group.name }}</a></li>
34-
{% endfor %}
16+
{% if item.link %}<li><a href="{{ item.url }}">{{ item.link_name }}</a></li>{% endif %}
17+
{% for subnav in item.sub_nav_items %}
18+
<li><a href="{{ subnav.url }}">{{ subnav.link_name }}</a></li>
19+
{% endfor %}
3520
</ul>
36-
</li>
37-
{% else %}
38-
<li><a href="{% url 'editorial_team' %}">{{ journal_settings.styling.editorial_group_page_name }}</a></li>
21+
</li>
22+
{% elif not item.for_footer %}
23+
<li><a href="{{ item.url }}">{{ item.link_name }}</a></li>
24+
{% endif %}
25+
{% endfor %}
26+
{% if request.journal.nav_articles %}<li><a href="{% url 'journal_articles' %}">{% trans 'Articles' %}</a></li>{% endif %}
27+
{% if request.journal.nav_issues %}<li><a href="{% url 'journal_issues' %}">{% trans 'Issues' %}</a></li>{% endif %}
28+
{% if journal_settings.general.enable_editorial_display %}
29+
{% if journal_settings.general.multi_page_editorial %}
30+
<li class=".is-dropdown-submenu-parent">
31+
<a href="#" data-options="is_hover:true; hover_timeout:5000">{{ journal_settings.styling.editorial_group_page_name }}</a>
32+
<ul class="menu vertical medium-horizontal">
33+
{% for group in request.journal.editorial_groups %}
34+
<li><a href="{% url 'editorial_team_group' group.pk %}">{{ group.name }}</a></li>
35+
{% endfor %}
36+
</ul>
37+
</li>
38+
{% else %}
39+
<li><a href="{% url 'editorial_team' %}">{{ journal_settings.styling.editorial_group_page_name }}</a></li>
40+
{% endif %}
41+
{% endif %}
42+
{% if request.journal.nav_sub %}<li><a href="{% url 'journal_submissions' %}">{% trans 'Submission' %}</a></li>{% endif %}
43+
{% if request.journal.nav_contact %}<li><a href="{% url 'contact' %}">{% trans 'Contact' %}</a></li>{% endif %}
44+
{% hook 'nav_block' %}
45+
{% if request.journal.nav_start and not journal_settings.general.disable_journal_submission %}
46+
<li>
47+
<a href="{% url 'submission_start' %}" class="button">
48+
<i aria-hidden="true" class="fa fa-cloud-upload"></i> {% trans 'Start Submission' %}
49+
</a>
50+
</li>
51+
{% endif %}
52+
{% if request.journal.nav_review %}
53+
<li>
54+
<a href="{% url 'become_reviewer' %}" class="button">
55+
<i aria-hidden="true" class="fa fa-trophy"></i>
56+
{% trans 'Become a Reviewer' %}
57+
</a>
58+
</li>
3959
{% endif %}
40-
{% endif %}
41-
{% if request.journal.nav_sub %}<li><a href="{% url 'journal_submissions' %}">{% trans 'Submission' %}</a></li>{% endif %}
42-
{% if request.journal.nav_contact %}<li><a href="{% url 'contact' %}">{% trans 'Contact' %}</a></li>{% endif %}
43-
{% hook 'nav_block' %}
44-
{% if request.journal.nav_start and not journal_settings.general.disable_journal_submission %}
45-
<li>
46-
<a href="{% url 'submission_start' %}" class="button">
47-
<i aria-hidden="true" class="fa fa-cloud-upload"></i> {% trans 'Start Submission' %}
48-
</a>
49-
</li>
50-
{% endif %}
51-
{% if request.journal.nav_review %}
52-
<li>
53-
<a href="{% url 'become_reviewer' %}" class="button">
54-
<i aria-hidden="true" class="fa fa-trophy"></i>
55-
{% trans 'Become a Reviewer' %}
56-
</a>
57-
</li>
58-
{% endif %}
5960

60-
<li class=".is-dropdown-submenu-parent show-for-small-only">
61-
<a href="#" data-options="is_hover:true; hover_timeout:5000">{% trans 'Account' %}</a>
62-
<ul class="menu vertical medium-horizontal">
63-
{% if request.user.is_authenticated %}
64-
<li><a href="{% url 'core_dashboard' %}">{% trans 'Dashboard' %}</a></li>
65-
<li class="divider"></li>
66-
{% if not journal_settings.general.disable_journal_submission %}<li><a href="{% url 'submission_start' %}">{% trans 'Submit' %}</a></li>{% endif %}
67-
{% user_has_role request 'editor' as user_is_editor %}
68-
{% if user_is_editor or request.user.is_staff%}
61+
<li class=".is-dropdown-submenu-parent show-for-small-only">
62+
<a href="#" data-options="is_hover:true; hover_timeout:5000">{% trans 'Account' %}</a>
63+
<ul class="menu vertical medium-horizontal">
64+
{% if request.user.is_authenticated %}
65+
<li><a href="{% url 'core_dashboard' %}">{% trans 'Dashboard' %}</a></li>
6966
<li class="divider"></li>
70-
<li><a href="{% url 'kanban' %}">{% trans 'Kanban' %}</a></li>
71-
<li><a href="{% url 'core_manager_index' %}">{% trans 'Manager' %}</a></li>
72-
{% if request.resolver_match.url_name and request.resolver_match.url_name == 'article_view' and article %}
73-
<li><a href="{% url 'manage_archive_article' article.pk %}">{% trans 'Edit Article' %}</a></li>
74-
{% endif %}
75-
{% if request.resolver_match.url_name and request.resolver_match.url_name == 'journal_issue' and issue %}
76-
<li><a href="{% url 'manage_issues_id' issue.pk %}">{% trans 'Edit Issue' %}</a></li>
67+
{% if not journal_settings.general.disable_journal_submission %}<li><a href="{% url 'submission_start' %}">{% trans 'Submit' %}</a></li>{% endif %}
68+
{% user_has_role request 'editor' as user_is_editor %}
69+
{% if user_is_editor or request.user.is_staff%}
70+
<li class="divider"></li>
71+
<li><a href="{% url 'kanban' %}">{% trans 'Kanban' %}</a></li>
72+
<li><a href="{% url 'core_manager_index' %}">{% trans 'Manager' %}</a></li>
73+
{% if request.resolver_match.url_name and request.resolver_match.url_name == 'article_view' and article %}
74+
<li><a href="{% url 'manage_archive_article' article.pk %}">{% trans 'Edit Article' %}</a></li>
75+
{% endif %}
76+
{% if request.resolver_match.url_name and request.resolver_match.url_name == 'journal_issue' and issue %}
77+
<li><a href="{% url 'manage_issues_id' issue.pk %}">{% trans 'Edit Issue' %}</a></li>
78+
{% endif %}
79+
{% if request.resolver_match.url_name and request.resolver_match.url_name == 'core_news_item' and news_item %}
80+
<li><a href="{% url 'core_manager_edit_news' news_item.pk %}">{% trans 'Edit News Item' %}</a></li>
81+
{% endif %}
7782
{% endif %}
78-
{% if request.resolver_match.url_name and request.resolver_match.url_name == 'core_news_item' and news_item %}
79-
<li><a href="{% url 'core_manager_edit_news' news_item.pk %}">{% trans 'Edit News Item' %}</a></li>
83+
{% if request.user.is_staff %}
84+
<li><a href="/admin/">{% trans 'Admin' %}</a></li>
8085
{% endif %}
86+
<li class="divider"></li>
87+
<li><a href="{% url 'core_edit_profile' %}">{% trans 'Profile' %}</a></li>
88+
<li><a href="{% url 'core_logout' %}">{% trans 'Logout' %}</a></li>
89+
{% else %}
90+
<li>
91+
<a href="{% url 'core_login' %}">
92+
{% trans "Log in" %}
93+
</a>
94+
</li>
95+
<li>
96+
<a href="{% url 'core_register' %}">
97+
{% trans "Register" %}
98+
</a>
99+
</li>
81100
{% endif %}
82-
{% if request.user.is_staff %}
83-
<li><a href="/admin/">{% trans 'Admin' %}</a></li>
84-
{% endif %}
85-
<li class="divider"></li>
86-
<li><a href="{% url 'core_edit_profile' %}">{% trans 'Profile' %}</a></li>
87-
<li><a href="{% url 'core_logout' %}">{% trans 'Logout' %}</a></li>
88-
{% else %}
89-
<li>
90-
<a href="{% url 'core_login' %}">
91-
{% trans "Log in" %}
92-
</a>
93-
</li>
94-
<li>
95-
<a href="{% url 'core_register' %}">
96-
{% trans "Register" %}
97-
</a>
98-
</li>
99-
{% endif %}
100-
</ul>
101-
</li>
102-
</ul>
103-
</div>
101+
</ul>
102+
</li>
103+
</ul>
104+
</div>
105+
</nav>

‎src/themes/OLH/templates/press/nav.html

+53-52
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,65 @@
11
{% load hooks %}
22
{% load i18n %}
33
{% load next_url %}
4-
5-
<div class="top-bar" id="main-menu" style="display: block;">
6-
<ul class="menu vertical medium-horizontal" data-responsive-menu="drilldown medium-dropdown">
7-
<li><a href="/">{% trans 'Home' %}</a></li>
8-
{% for item in navigation_items %}
9-
{% if item.has_sub_nav %}
4+
<nav>
5+
<div class="top-bar" id="main-menu" style="display: block;">
6+
<ul class="menu vertical medium-horizontal" data-responsive-menu="drilldown medium-dropdown">
7+
<li><a href="/">{% trans 'Home' %}</a></li>
8+
{% for item in navigation_items %}
9+
{% if item.has_sub_nav %}
10+
<li class=".is-dropdown-submenu-parent"><a href="#"
11+
data-options="is_hover:true; hover_timeout:5000">{{ item.link_name }}</a>
12+
<ul class="menu vertical medium-horizontal">
13+
{% if item.link %}<li><a href="{{ item.url }}">{{ item.link_name }}</a></li>{% endif %}
14+
{% for subnav in item.sub_nav_items %}
15+
<li><a href="{% if not subnav.is_external %}/{% endif %}{{ subnav.link }}">{{ subnav.link_name }}</a></li>
16+
{% endfor %}
17+
</ul>
18+
</li>
19+
{% elif not item.for_footer %}
20+
<li><a href="{% if not item.is_external %}/{% endif %}{{ item.link }}">{{ item.link_name }}</a></li>
21+
{% endif %}
22+
{% endfor %}
23+
{% if request.press.publishes_journals and not request.press.disable_journals %}
24+
<li><a href="{% url 'press_journals' %}">{% trans 'Journals' %}</a></li>
25+
{% endif %}
26+
{% if request.press.publishes_conferences%}
27+
<li><a href="{% url 'press_conferences' %}">{% trans 'Conferences' %}</a></li>
28+
{% endif %}
29+
{% if request.press.enable_preprints %}
1030
<li class=".is-dropdown-submenu-parent"><a href="#"
11-
data-options="is_hover:true; hover_timeout:5000">{{ item.link_name }}</a>
31+
data-options="is_hover:true; hover_timeout:5000">{% trans 'Repositories' %}</a>
1232
<ul class="menu vertical medium-horizontal">
13-
{% if item.link %}<li><a href="{{ item.url }}">{{ item.link_name }}</a></li>{% endif %}
14-
{% for subnav in item.sub_nav_items %}
15-
<li><a href="{% if not subnav.is_external %}/{% endif %}{{ subnav.link }}">{{ subnav.link_name }}</a></li>
33+
{% for repo in request.press.live_repositories %}
34+
<li><a href="{{ repo.site_url }}">{{ repo.name }}</a></li>
1635
{% endfor %}
1736
</ul>
1837
</li>
19-
{% elif not item.for_footer %}
20-
<li><a href="{% if not item.is_external %}/{% endif %}{{ item.link }}">{{ item.link_name }}</a></li>
2138
{% endif %}
22-
{% endfor %}
23-
{% if request.press.publishes_journals and not request.press.disable_journals %}
24-
<li><a href="{% url 'press_journals' %}">{% trans 'Journals' %}</a></li>
25-
{% endif %}
26-
{% if request.press.publishes_conferences%}
27-
<li><a href="{% url 'press_conferences' %}">{% trans 'Conferences' %}</a></li>
28-
{% endif %}
29-
{% if request.press.enable_preprints %}
30-
<li class=".is-dropdown-submenu-parent"><a href="#"
31-
data-options="is_hover:true; hover_timeout:5000">{% trans 'Repositories' %}</a>
39+
{% if journal_settings.general.enable_editorial_display %}
40+
<li><a href="{% url 'editorial_team' %}">{% trans 'Editorial Team' %}</a></li>{% endif %}
41+
<li><a href="{% url 'contact' %}">{% trans 'Contact' %}</a></li>
42+
{% hook 'nav_block' %}
43+
<li class=".is-dropdown-submenu-parent show-for-small-only">
44+
<a href="#" data-options="is_hover:true; hover_timeout:5000">{% trans 'Account' %}</a>
3245
<ul class="menu vertical medium-horizontal">
33-
{% for repo in request.press.live_repositories %}
34-
<li><a href="{{ repo.site_url }}">{{ repo.name }}</a></li>
35-
{% endfor %}
36-
</ul>
37-
</li>
38-
{% endif %}
39-
{% if journal_settings.general.enable_editorial_display %}
40-
<li><a href="{% url 'editorial_team' %}">{% trans 'Editorial Team' %}</a></li>{% endif %}
41-
<li><a href="{% url 'contact' %}">{% trans 'Contact' %}</a></li>
42-
{% hook 'nav_block' %}
43-
<li class=".is-dropdown-submenu-parent show-for-small-only">
44-
<a href="#" data-options="is_hover:true; hover_timeout:5000">{% trans 'Account' %}</a>
45-
<ul class="menu vertical medium-horizontal">
46-
{% if request.user.is_authenticated %}
47-
{% if user_is_editor or request.user.is_staff %}
46+
{% if request.user.is_authenticated %}
47+
{% if user_is_editor or request.user.is_staff %}
48+
<li class="divider"></li>
49+
<li><a href="{% url 'core_manager_index' %}">{% trans 'Manager' %}</a></li>
50+
{% endif %}
51+
{% if request.user.is_staff %}
52+
<li><a href="/admin/">{% trans 'Admin' %}</a></li>
53+
{% endif %}
4854
<li class="divider"></li>
49-
<li><a href="{% url 'core_manager_index' %}">{% trans 'Manager' %}</a></li>
55+
<li><a href="{% url 'core_edit_profile' %}">{% trans 'Profile' %}</a></li>
56+
<li><a href="{% url 'core_logout' %}">{% trans 'Logout' %}</a></li>
57+
{% else %}
58+
<li><a href="{% url 'core_login' %}">{% trans "Log in" %}</a></li>
59+
<li><a href="{% url 'core_register' %}"> {% trans "Register" %}</a></li>
5060
{% endif %}
51-
{% if request.user.is_staff %}
52-
<li><a href="/admin/">{% trans 'Admin' %}</a></li>
53-
{% endif %}
54-
<li class="divider"></li>
55-
<li><a href="{% url 'core_edit_profile' %}">{% trans 'Profile' %}</a></li>
56-
<li><a href="{% url 'core_logout' %}">{% trans 'Logout' %}</a></li>
57-
{% else %}
58-
<li><a href="{% url 'core_login' %}">{% trans "Log in" %}</a></li>
59-
<li><a href="{% url 'core_register' %}"> {% trans "Register" %}</a></li>
60-
{% endif %}
61-
</ul>
62-
</li>
63-
</ul>
64-
</div>
61+
</ul>
62+
</li>
63+
</ul>
64+
</div>
65+
</nav>

0 commit comments

Comments
 (0)