Skip to content

Commit 126892d

Browse files
larseggertlarseggert
committed
Revamp the menu structure some, and remove a bunch of unneeded files.
Commit ready for merge. - Legacy-Id: 19485
1 parent 962253f commit 126892d

File tree

6 files changed

+29
-99
lines changed

6 files changed

+29
-99
lines changed

‎ietf/doc/templatetags/streams_menu.py‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎ietf/doc/templatetags/wg_menu.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
'ops':'Ops & Mgmt',
4343
'rai':'RAI',
4444
'iab':'IAB',
45+
'art':'Apps & Realtime',
4546
}
4647

4748
parents = Group.objects.filter(
@@ -67,4 +68,4 @@ def wg_menu():
6768
elif p.acronym == 'ietfadminllc':
6869
p.menu_url = "/adm/"
6970

70-
return render_to_string('base/menu_wg.html', { 'parents': parents })
71+
return render_to_string('base/menu_wg.html', { 'parents': parents })

‎ietf/templates/base/menu.html‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{# Copyright The IETF Trust 2015-2019, All Rights Reserved #}{% load origin %}{% origin %}
2-
{% load ietf_filters managed_groups wg_menu streams_menu active_groups_menu group_filters %}
2+
{% load ietf_filters managed_groups wg_menu active_groups_menu group_filters %}
33

44
{% if flavor != "top" %}
55
{% include "base/menu_user.html" %}
@@ -12,16 +12,11 @@
1212
{% if flavor == "top" %}
1313
</a>
1414
<ul class="dropdown-menu" role="menu">
15-
{% endif %}
16-
17-
<li><a href="{% url "ietf.group.views.active_groups" group_type="wg" %}">Active WGs</a></li>
18-
<li><a href="{% url "ietf.group.views.active_groups" group_type="rg" %}">Active RGs</a></li>
19-
<li class="dropdown-submenu group-menu"><a href="{% url "ietf.group.views.active_groups" %}">Other</a>{% active_groups_menu %} </li>
2015

21-
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
22-
<li {%if flavor == "top" %}class="dropdown-header visible-lg-block"{% else %}class="nav-header hidden-nojs"{% endif %}>By area/parent</li>
16+
<li class="dropdown-header visible-lg-block">By area/parent</li>
17+
{% endif %}
2318
{% wg_menu %}
24-
{# <li class="hidden-lg hidden-nojs"><a href="#" data-toggle="modal" data-target="#navmodal">Jump to group</a></li> #}
19+
<li class="dropdown-submenu group-menu"><a href="{% url "ietf.group.views.active_groups" %}">Other</a>{% active_groups_menu %} </li>
2520

2621
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
2722
<li {%if flavor == "top" %}class="dropdown-header hidden-xs"{% else %}class="nav-header"{% endif %}>New work</li>
@@ -88,9 +83,6 @@
8883
<li><a href="{% url "ietf.nomcom.views.private_index" g.nomcom_set.first.year %}">{{ g.acronym|capfirst }}</a></li>
8984
{% endfor %}
9085
{% endif %}
91-
92-
{% else %}
93-
<li><a rel="nofollow" href="/accounts/login/?next={{ request.get_full_path|urlencode }}">Sign in to track docs</a></li>
9486
{% endif %}
9587

9688

@@ -112,16 +104,28 @@
112104
<ul class="dropdown-menu" role="menu">
113105
{% endif %}
114106

107+
108+
{% if flavor == "top" %}
109+
<li class="dropdown-header visible-lg-block">Next meeting</li>
110+
{% endif %}
115111
<li><a href="/meeting/agenda/">Agenda</a></li>
116112
<li><a href="/meeting/materials/">Materials</a></li>
117113
<li><a href="/meeting/floor-plan/">Floor plan</a></li>
118114
<li><a href="https://www.ietf.org/how/meetings/register/">Registration</a></li>
119115
<li><a href="{% url 'ietf.meeting.views.important_dates' %}">Important dates</a></li>
120-
<li><a href="https://www.ietf.org/how/meetings/past/">Proceedings</a></li>
121-
<li><a href="/meeting/upcoming">Upcoming</a></li>
122-
<li><a href="/meeting/past">Past</a></li>
123116
<li><a href="/secr/sreq/">Request a session</a></li>
124117
<li><a href="/meeting/requests">Session requests</a></li>
118+
{% if flavor == "top" %}
119+
<li class="divider hidden-xs"></li>
120+
<li class="dropdown-header visible-lg-block">Upcoming meetings</li>
121+
{% endif %}
122+
<li><a href="/meeting/upcoming">Upcoming meetings</a></li>
123+
{% if flavor == "top" %}
124+
<li class="divider hidden-xs"></li>
125+
<li class="dropdown-header visible-lg-block">Past meetings</li>
126+
{% endif %}
127+
<li><a href="/meeting/past">Past meetings</a></li>
128+
<li><a href="https://www.ietf.org/how/meetings/past/">Meeting proceedings</a></li>
125129
{% if flavor == "top" %}</ul>{% endif %}
126130
</li>
127131

‎ietf/templates/base/menu_wg.html‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
{# Copyright The IETF Trust 2015, All Rights Reserved #}{% load origin %}{% origin %}
22
{% for p in parents %}
33
<li class="hidden-nojs dropdown-submenu group-menu group-parent-{{ p.id }}">
4-
<a href="{{ p.menu_url }}">{{ p.short_name }}</a>
4+
<a href="{{ p.menu_url }}">
5+
{% if p.short_name == "IETF Administration LLC" %}
6+
IETF LLC
7+
{% else %}
8+
{{ p.short_name }}
9+
{% endif %}
10+
</a>
511
</li>
6-
{% endfor %}
12+
{% endfor %}

‎ietf/templates/base/menu_wg_modal.html‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎ietf/templates/base/streams_menu.html‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)