Skip to content

Commit 6b15c3d

Browse files
larseggertlarseggert
committed
Fix nav-tabs
 - Legacy-Id: 19593
1 parent f12bc99 commit 6b15c3d

24 files changed

Lines changed: 222 additions & 160 deletions

‎ietf/templates/doc/document_top.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
{% load ietf_filters %}
33
<h2>{{ doc.title }}<br><small>{{ name }}</small></h2>
44

5-
<ul class="nav nav-tabs" role="tablist">
5+
<ul class="nav nav-tabs">
66
{% for name, t, url, active, tooltip in tabs %}
7-
<li {% if tooltip %}title="{{tooltip}}"{% endif %} class="{% if t == selected %}active {% endif %}{% if not active %}disabled {% endif %}">
8-
<a {% if active %}href="{{ url }}"{% endif %}>{{ name|capfirst_allcaps }}</a>
7+
<li {% if tooltip %}title="{{tooltip}}"{% endif %} class="nav-item">
8+
<a class="nav-link {% if t == selected %}active {% endif %}{% if not active %}disabled {% endif %}" {% if active %}href="{{ url }}"{% endif %}>{{ name|capfirst_allcaps }}</a>
99
</li>
1010
{% endfor %}
11-
</ul>
11+
</ul>

‎ietf/templates/group/group_base.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ <h1>{{ group.name}} ({{ group.acronym }})
2525
{% endif %}
2626
</h1>
2727

28-
<ul class="nav nav-tabs" role="tablist">
28+
<ul class="nav nav-tabs">
2929
{% for name, url in menu_entries %}
30-
<li {% if selected_menu_entry == name.lower %}class="active"{% endif %}>
31-
<a href="{{ url }}">{{ name }}</a>
30+
<li class="nav-item">
31+
<a class="nav-link {% if selected_menu_entry == name.lower %}active{% endif %}" href="{{ url }}">{{ name }}</a>
3232
</li>
3333
{% endfor %}
3434
</ul>
@@ -50,4 +50,4 @@ <h1>{{ group.name}} ({{ group.acronym }})
5050

5151
{% block js %}
5252
<script src="{% static "ietf/js/datatables.js" %}"></script>
53-
{% endblock %}
53+
{% endblock %}

‎ietf/templates/iesg/agenda.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
<div class="col-md-10">
2525
<h1>IESG agenda: {{ date }} </h1>
2626

27-
<ul class="nav nav-tabs" role="tablist">
28-
<li class="active"><a href="{% url 'ietf.iesg.views.agenda' %}">IESG Agenda</a></li>
29-
<li class=" "><a href="{% url 'ietf.iesg.views.agenda_documents' %}">Documents on future agendas</a></li>
30-
<li class=" "><a href="{% url 'ietf.iesg.views.discusses' %}">DISCUSS positions</a></li>
31-
<li class=" "><a href="{% url 'ietf.iesg.views.past_documents' %}">Documents on recent agendas</a></li>
32-
<li class=" "><a href="{% url 'ietf.iesg.views.photos' %}">IESG Photos</a></li>
27+
<ul class="nav nav-tabs">
28+
<li class="nav-item ><a class="nav-link active" href="{% url 'ietf.iesg.views.agenda' %}">IESG Agenda</a></li>
29+
<li class="nav-item "><a class="nav-link" href="{% url 'ietf.iesg.views.agenda_documents' %}">Documents on future agendas</a></li>
30+
<li class="nav-item "><a class="nav-link" href="{% url 'ietf.iesg.views.discusses' %}">DISCUSS positions</a></li>
31+
<li class="nav-item "><a class="nav-link" href="{% url 'ietf.iesg.views.past_documents' %}">Documents on recent agendas</a></li>
32+
<li class="nav-item "><a class="nav-link" href="{% url 'ietf.iesg.views.photos' %}">IESG Photos</a></li>
3333
</ul>
3434

3535
{% for num, section in sections %}
@@ -135,4 +135,4 @@ <h1>IESG agenda: {{ date }} </h1>
135135
</div>
136136

137137
</div>
138-
{% endblock content %}
138+
{% endblock content %}

‎ietf/templates/iesg/agenda_documents.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
{% origin %}
1717
<h1>Documents on future IESG telechat agendas</h1>
1818

19-
<ul class="nav nav-tabs" role="tablist">
20-
<li class=" "><a href="{% url 'ietf.iesg.views.agenda' %}">IESG Agenda</a></li>
21-
<li class="active"><a href="{% url 'ietf.iesg.views.agenda_documents' %}">Documents on future agendas</a></li>
22-
<li class=" "><a href="{% url 'ietf.iesg.views.discusses' %}">DISCUSS positions</a></li>
23-
<li class=" "><a href="{% url 'ietf.iesg.views.past_documents' %}">Documents on recent agendas</a></li>
24-
<li class=" "><a href="{% url 'ietf.iesg.views.photos' %}">IESG Photos</a></li>
19+
<ul class="nav nav-tabs">
20+
<li class="nav-item "><a class="nav-link" href="{% url 'ietf.iesg.views.agenda' %}">IESG Agenda</a></li>
21+
<li class="nav-item"><a class="nav-link active" href="{% url 'ietf.iesg.views.agenda_documents' %}">Documents on future agendas</a></li>
22+
<li class="nav-item "><a class="nav-link" href="{% url 'ietf.iesg.views.discusses' %}">DISCUSS positions</a></li>
23+
<li class="nav-item "><a class="nav-link" href="{% url 'ietf.iesg.views.past_documents' %}">Documents on recent agendas</a></li>
24+
<li class="nav-item "><a class="nav-link" href="{% url 'ietf.iesg.views.photos' %}">IESG Photos</a></li>
2525
</ul>
2626

2727

‎ietf/templates/iesg/discusses.html‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
{% origin %}
1616
<h1>IESG discuss positions</h1>
1717

18-
<ul class="nav nav-tabs" role="tablist">
19-
<li class=" "><a href="{% url 'ietf.iesg.views.agenda' %}">IESG Agenda</a></li>
20-
<li class=" "><a href="{% url 'ietf.iesg.views.agenda_documents' %}">Documents on future agendas</a></li>
21-
<li class="active"><a href="{% url 'ietf.iesg.views.discusses' %}">DISCUSS positions</a></li>
22-
<li class=" "><a href="{% url 'ietf.iesg.views.past_documents' %}">Documents on recent agendas</a></li>
23-
<li class=" "><a href="{% url 'ietf.iesg.views.photos' %}">IESG Photos</a></li>
18+
<ul class="nav nav-tabs">
19+
<li class="nav-item "><a class="nav-link" href="{% url 'ietf.iesg.views.agenda' %}">IESG Agenda</a></li>
20+
<li class="nav-item "><a class="nav-link" href="{% url 'ietf.iesg.views.agenda_documents' %}">Documents on future agendas</a></li>
21+
<li class="nav-item"><a class="nav-link active" href="{% url 'ietf.iesg.views.discusses' %}">DISCUSS positions</a></li>
22+
<li class="nav-item "><a class="nav-link" href="{% url 'ietf.iesg.views.past_documents' %}">Documents on recent agendas</a></li>
23+
<li class="nav-item "><a class="nav-link" href="{% url 'ietf.iesg.views.photos' %}">IESG Photos</a></li>
2424
</ul>
2525

2626

@@ -90,5 +90,4 @@ <h1>IESG discuss positions</h1>
9090
}
9191
});
9292
</script>
93-
{% endblock %}
94-
93+
{% endblock %}

‎ietf/templates/iesg/past_documents.html‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
{% origin %}
1616
<h1>Documents on recent agendas <small>in states {% for state in states %}{{state.name}}{% if not forloop.last %}, {% endif %} {% endfor %}</small></h1>
1717

18-
<ul class="nav nav-tabs" role="tablist">
19-
<li class=" "><a href="{% url 'ietf.iesg.views.agenda' %}">IESG Agenda</a></li>
20-
<li class=" "><a href="{% url 'ietf.iesg.views.agenda_documents' %}">Documents on future agendas</a></li>
21-
<li class=" "><a href="{% url 'ietf.iesg.views.discusses' %}">DISCUSS positions</a></li>
22-
<li class="active"><a href="{% url 'ietf.iesg.views.past_documents' %}">Documents on recent agendas</a></li>
23-
<li class=" "><a href="{% url 'ietf.iesg.views.photos' %}">IESG Photos</a></li>
18+
<ul class="nav nav-tabs">
19+
<li class="nav-item "><a class="nav-link" href="{% url 'ietf.iesg.views.agenda' %}">IESG Agenda</a></li>
20+
<li class="nav-item "><a class="nav-link" href="{% url 'ietf.iesg.views.agenda_documents' %}">Documents on future agendas</a></li>
21+
<li class="nav-item "><a class="nav-link" href="{% url 'ietf.iesg.views.discusses' %}">DISCUSS positions</a></li>
22+
<li class="nav-item"><a class="nav-link active" href="{% url 'ietf.iesg.views.past_documents' %}">Documents on recent agendas</a></li>
23+
<li class="nav-item "><a class="nav-link" href="{% url 'ietf.iesg.views.photos' %}">IESG Photos</a></li>
2424
</ul>
2525

2626

@@ -97,5 +97,4 @@ <h1>Documents on recent agendas <small>in states {% for state in states %}{{stat
9797
}
9898
});
9999
</script>
100-
{% endblock %}
101-
100+
{% endblock %}

‎ietf/templates/iesg/photos.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818

1919
<h1>{{ group_type | upper }} {{ role }} Photos</h1>
2020

21-
<ul class="nav nav-tabs" role="tablist">
22-
<li class=" "><a href="{% url 'ietf.iesg.views.agenda' %}">IESG Agenda</a></li>
23-
<li class=" "><a href="{% url 'ietf.iesg.views.agenda_documents' %}">Documents on future agendas</a></li>
24-
<li class=" "><a href="{% url 'ietf.iesg.views.discusses' %}">DISCUSS positions</a></li>
25-
<li class=" "><a href="{% url 'ietf.iesg.views.past_documents' %}">Documents on recent agendas</a></li>
26-
<li class="active"><a href="{% url 'ietf.iesg.views.photos' %}">IESG Photos</a></li>
21+
<ul class="nav nav-tabs">
22+
<li class="nav-item "><a class="nav-link" href="{% url 'ietf.iesg.views.agenda' %}">IESG Agenda</a></li>
23+
<li class="nav-item "><a class="nav-link" href="{% url 'ietf.iesg.views.agenda_documents' %}">Documents on future agendas</a></li>
24+
<li class="nav-item "><a class="nav-link" href="{% url 'ietf.iesg.views.discusses' %}">DISCUSS positions</a></li>
25+
<li class="nav-item "><a class="nav-link" href="{% url 'ietf.iesg.views.past_documents' %}">Documents on recent agendas</a></li>
26+
<li class="nav-item"><a class="nav-link active" href="{% url 'ietf.iesg.views.photos' %}">IESG Photos</a></li>
2727
</ul>
2828

2929
{% regroup roles by group.acronym as alphabet_blocks %}
@@ -71,4 +71,4 @@ <h1>{{ group_type | upper }} {{ role }} Photos</h1>
7171
{% endfor %}
7272
</ul>
7373
</div>
74-
{% endblock %}
74+
{% endblock %}

‎ietf/templates/ipr/admin_list.html‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@ <h1>IPR Admin - {% for s in states %}{{ s.name }}{% if not forloop.last %}/{% en
1414
<a class="btn btn-default" href="{% url "ietf.ipr.views.showlist" %}">Back to IPR Disclosure Page</a>
1515
</p>
1616

17-
<ul class="nav nav-tabs" role="tablist">
17+
<ul class="nav nav-tabs">
1818
{% for name, link, selected in tabs %}
19-
<li {% if selected %}class="active"{% endif %}><a href="{{ link }}">{{ name }}</a></li>
19+
<li class="nav-item">
20+
<a class="nav-link {% if selected %}active{% endif %}" href="{{ link }}">{{ name }}</a>
21+
</li>
2022
{% endfor %}
2123
</ul>
2224

2325
{% include "ipr/ipr_table.html" %}
2426

25-
{% endblock %}
27+
{% endblock %}

‎ietf/templates/ipr/details_tabs.html‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{# Copyright The IETF Trust 2015, All Rights Reserved #}
22
{% load origin %}{% origin %}
3-
<ul class="nav nav-tabs" role="tablist">
3+
<ul class="nav nav-tabs">
44
{% for name, link, selected in tabs %}
5-
<li {% if selected %}class="active"{% endif %}><a href="{{ link }}">{{ name }}</a></li>
5+
<li class="nav-item">
6+
<a class=nav-item {% if selected %}active{% endif %}" href="{{ link }}">{{ name }}</a>
7+
</li>
68
{% endfor %}
7-
</ul>
9+
</ul>

‎ietf/templates/liaisons/detail_tabs.html‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
<ul class="nav nav-tabs" role="tablist">
1+
<ul class="nav nav-tabs">
22
{% for name, link, selected in tabs %}
3-
<li {% if selected %}class="active"{% endif %}><a href="{{ link }}">{{ name }}</a></li>
3+
<li class="nav-item">
4+
<a class="nav-link {% if selected %}active{% endif %}" href="{{ link }}">{{ name }}</a>
5+
</li>
46
{% endfor %}
5-
</ul>
7+
</ul>

0 commit comments

Comments
 (0)