Skip to content

Commit 71e2c13

Browse files
StephDriverStephDriver
committed
WIP olh Navigation end of Monday
1 parent 51f3e4e commit 71e2c13

File tree

1 file changed

+120
-46
lines changed

1 file changed

+120
-46
lines changed

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

Lines changed: 120 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -5,97 +5,171 @@
55

66
<nav>
77
<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 %}
8+
<ul class="menu vertical medium-horizontal"
9+
data-responsive-menu="drilldown medium-dropdown"
10+
role="menubar">
11+
{% if request.journal.nav_home %}
12+
<li>
13+
<a href="{% url 'website_index' %}" role="menuitem">{% trans 'Home' %}</a>
14+
</li>
15+
{% endif %}
16+
{% if request.journal.nav_news %}
17+
<li>
18+
<a href="{% url 'core_news_list' %}" role="menuitem">{{ journal_settings.news.news_title }}</a>
19+
</li>
20+
{% endif %}
1121
{% for item in navigation_items %}
1222
{% 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>
15-
<ul class="menu vertical medium-horizontal">
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 %}
20-
</ul>
23+
<li class="is-dropdown-submenu-parent" aria-expanded="false" aria-haspopup="true">
24+
<a href="#"
25+
role="menuitem"
26+
data-options="is_hover:true; hover_timeout:5000">
27+
{{ item.link_name }}
28+
</a>
29+
<ul class="menu vertical medium-horizontal" aria-label="{% trans 'Submenu for' %} {{ item.link_name }}">
30+
{% if item.link %}
31+
<li role="menuitem">
32+
<a href="{{ item.url }}" >{{ item.link_name }}</a>
33+
</li>
34+
{% endif %}
35+
{% for subnav in item.sub_nav_items %}
36+
<li role="menuitem">
37+
<a href="{{ subnav.url }}">{{ subnav.link_name }}</a>
38+
</li>
39+
{% endfor %}
40+
</ul>
2141
</li>
2242
{% elif not item.for_footer %}
23-
<li><a href="{{ item.url }}">{{ item.link_name }}</a></li>
43+
<li>
44+
<a href="{{ item.url }}" role="menuitem">{{ item.link_name }}</a>
45+
</li>
2446
{% endif %}
2547
{% 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 %}
48+
{% if request.journal.nav_articles %}
49+
<li>
50+
<a href="{% url 'journal_articles' %}" role="menuitem">{% trans 'Articles' %}</a>
51+
</li>
52+
{% endif %}
53+
{% if request.journal.nav_issues %}
54+
<li>
55+
<a href="{% url 'journal_issues' %}" role="menuitem">{% trans 'Issues' %}</a>
56+
</li>
57+
{% endif %}
2858
{% if journal_settings.general.enable_editorial_display %}
2959
{% 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">
60+
<li class="is-dropdown-submenu-parent" aria-expanded="false" aria-haspopup="true">
61+
<a href="#"
62+
role="menuitem"
63+
data-options="is_hover:true; hover_timeout:5000">
64+
{{ journal_settings.styling.editorial_group_page_name }}
65+
66+
</a>
67+
<ul class="menu vertical medium-horizontal" role="menu" aria-label="{% trans 'Submenu for' %} {{ journal_settings.styling.editorial_group_page_name }}">
3368
{% for group in request.journal.editorial_groups %}
34-
<li><a href="{% url 'editorial_team_group' group.pk %}">{{ group.name }}</a></li>
69+
<li>
70+
<a href="{% url 'editorial_team_group' group.pk %}" role="menuitem">{{ group.name }}</a>
71+
</li>
3572
{% endfor %}
3673
</ul>
3774
</li>
3875
{% else %}
39-
<li><a href="{% url 'editorial_team' %}">{{ journal_settings.styling.editorial_group_page_name }}</a></li>
76+
<li>
77+
<a href="{% url 'editorial_team' %}" role="menuitem">{{ journal_settings.styling.editorial_group_page_name }}</a>
78+
</li>
4079
{% endif %}
4180
{% 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 %}
81+
{% if request.journal.nav_sub %}
82+
<li>
83+
<a href="{% url 'journal_submissions' %}" role="menuitem">{% trans 'Submission' %}</a>
84+
</li>
85+
{% endif %}
86+
{% if request.journal.nav_contact %}
87+
<li>
88+
<a href="{% url 'contact' %}" role="menuitem">{% trans 'Contact' %}</a>
89+
</li>
90+
{% endif %}
4491
{% hook 'nav_block' %}
4592
{% if request.journal.nav_start and not journal_settings.general.disable_journal_submission %}
4693
<li>
47-
<a href="{% url 'submission_start' %}" class="button">
48-
<i aria-hidden="true" class="fa fa-cloud-upload"></i> {% trans 'Start Submission' %}
94+
<a href="{% url 'submission_start' %}" class="button" role="menuitem">
95+
<i aria-hidden="true" class="fa fa-cloud-upload"></i>
96+
{% trans 'Start Submission' %}
4997
</a>
5098
</li>
5199
{% endif %}
52100
{% if request.journal.nav_review %}
53101
<li>
54-
<a href="{% url 'become_reviewer' %}" class="button">
102+
<a href="{% url 'become_reviewer' %}" class="button" role="menuitem">
55103
<i aria-hidden="true" class="fa fa-trophy"></i>
56104
{% trans 'Become a Reviewer' %}
57105
</a>
58106
</li>
59107
{% endif %}
60108

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">
109+
<li class="is-dropdown-submenu-parent show-for-small-only" aria-expanded="false" aria-haspopup="true">
110+
<a href="#"
111+
role="menuitem"
112+
data-options="is_hover:true; hover_timeout:5000">
113+
{% trans 'Account' %}
114+
</a>
115+
<ul class="menu vertical medium-horizontal" role="menu" aria-label="{% trans 'Account menu' %}">
64116
{% if request.user.is_authenticated %}
65-
<li><a href="{% url 'core_dashboard' %}">{% trans 'Dashboard' %}</a></li>
66-
<li class="divider"></li>
67-
{% if not journal_settings.general.disable_journal_submission %}<li><a href="{% url 'submission_start' %}">{% trans 'Submit' %}</a></li>{% endif %}
117+
<li>
118+
<a href="{% url 'core_dashboard' %}" role="menuitem">{% trans 'Dashboard' %}</a>
119+
</li>
120+
<li class="divider" role="separator" aria-hidden="true"></li>
121+
{% if not journal_settings.general.disable_journal_submission %}
122+
<li>
123+
<a href="{% url 'submission_start' %}" role="menuitem">{% trans 'Submit' %}</a>
124+
</li>
125+
{% endif %}
68126
{% user_has_role request 'editor' as user_is_editor %}
69127
{% 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>
128+
<li class="divider" role="separator" aria-hidden="true"></li>
129+
<li>
130+
<a href="{% url 'kanban' %}" role="menuitem">{% trans 'Kanban' %}</a>
131+
</li>
132+
<li>
133+
<a href="{% url 'core_manager_index' %}" role="menuitem">{% trans 'Manager' %}</a>
134+
</li>
73135
{% 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>
136+
<li>
137+
<a href="{% url 'manage_archive_article' article.pk %}" role="menuitem">{% trans 'Edit Article' %}</a>
138+
</li>
75139
{% endif %}
76140
{% 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>
141+
<li>
142+
<a href="{% url 'manage_issues_id' issue.pk %}" role="menuitem">{% trans 'Edit Issue' %}</a>
143+
</li>
78144
{% endif %}
79145
{% 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>
146+
<li>
147+
<a href="{% url 'core_manager_edit_news' news_item.pk %}" role="menuitem">{% trans 'Edit News Item' %}</a>
148+
</li>
81149
{% endif %}
82150
{% endif %}
83151
{% if request.user.is_staff %}
84-
<li><a href="/admin/">{% trans 'Admin' %}</a></li>
152+
<li>
153+
<a href="/admin/" role="menuitem">{% trans 'Admin' %}</a>
154+
</li>
85155
{% 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>
156+
<li class="divider" role="separator" aria-hidden="true"></li>
157+
<li>
158+
<a href="{% url 'core_edit_profile' %}" role="menuitem">{% trans 'Profile' %}</a>
159+
</li>
160+
<li>
161+
<a href="{% url 'core_logout' %}" role="menuitem">{% trans 'Logout' %}</a>
162+
</li>
89163
{% else %}
90164
<li>
91-
<a href="{% url 'core_login' %}">
92-
{% trans "Log in" %}
93-
</a>
165+
<a href="{% url 'core_login' %}" role="menuitem">
166+
{% trans "Log in" %}
167+
</a>
94168
</li>
95169
<li>
96-
<a href="{% url 'core_register' %}">
97-
{% trans "Register" %}
98-
</a>
170+
<a href="{% url 'core_register' %}" role="menuitem">
171+
{% trans "Register" %}
172+
</a>
99173
</li>
100174
{% endif %}
101175
</ul>

0 commit comments

Comments
 (0)