From 126892d8a2e5d935fafcdfe7cc1d7c422faea9dc Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Thu, 28 Oct 2021 14:23:04 +0000 Subject: [PATCH] Revamp the menu structure some, and remove a bunch of unneeded files. Commit ready for merge. - Legacy-Id: 19485 --- ietf/doc/templatetags/streams_menu.py | 30 ------------------ ietf/doc/templatetags/wg_menu.py | 3 +- ietf/templates/base/menu.html | 34 +++++++++++--------- ietf/templates/base/menu_wg.html | 10 ++++-- ietf/templates/base/menu_wg_modal.html | 43 -------------------------- ietf/templates/base/streams_menu.html | 8 ----- 6 files changed, 29 insertions(+), 99 deletions(-) delete mode 100644 ietf/doc/templatetags/streams_menu.py delete mode 100644 ietf/templates/base/menu_wg_modal.html delete mode 100644 ietf/templates/base/streams_menu.html diff --git a/ietf/doc/templatetags/streams_menu.py b/ietf/doc/templatetags/streams_menu.py deleted file mode 100644 index 1dd80ca1fd..0000000000 --- a/ietf/doc/templatetags/streams_menu.py +++ /dev/null @@ -1,30 +0,0 @@ -from django import template -from django.contrib.auth.models import AnonymousUser - -from ietf.ietfauth.utils import has_role -from ietf.group.models import Group -from ietf.name.models import StreamName - -register = template.Library() - -@register.inclusion_tag('base/streams_menu.html', takes_context=True) -def streams_menu(context): - editable_streams = [] - - user = context["request"].user if "request" in context else AnonymousUser() - - if user.is_authenticated: - streams = StreamName.objects.exclude(slug="legacy") - - if has_role(user, "Secretariat"): - editable_streams.extend(streams) - else: - acronyms = Group.objects.filter(acronym__in=(s.slug for s in streams), - role__name="chair", - role__person__user=user).distinct().values_list("acronym", flat=True) - - for s in streams: - if s.slug in acronyms: - editable_streams.append(s) - - return { 'editable_streams': editable_streams } diff --git a/ietf/doc/templatetags/wg_menu.py b/ietf/doc/templatetags/wg_menu.py index 742e0479e5..76460912ae 100644 --- a/ietf/doc/templatetags/wg_menu.py +++ b/ietf/doc/templatetags/wg_menu.py @@ -42,6 +42,7 @@ 'ops':'Ops & Mgmt', 'rai':'RAI', 'iab':'IAB', + 'art':'Apps & Realtime', } parents = Group.objects.filter( @@ -67,4 +68,4 @@ def wg_menu(): elif p.acronym == 'ietfadminllc': p.menu_url = "/adm/" - return render_to_string('base/menu_wg.html', { 'parents': parents }) + return render_to_string('base/menu_wg.html', { 'parents': parents }) \ No newline at end of file diff --git a/ietf/templates/base/menu.html b/ietf/templates/base/menu.html index 6337f1d00c..98e1c46bb1 100644 --- a/ietf/templates/base/menu.html +++ b/ietf/templates/base/menu.html @@ -1,5 +1,5 @@ {# Copyright The IETF Trust 2015-2019, All Rights Reserved #}{% load origin %}{% origin %} -{% load ietf_filters managed_groups wg_menu streams_menu active_groups_menu group_filters %} +{% load ietf_filters managed_groups wg_menu active_groups_menu group_filters %} {% if flavor != "top" %} {% include "base/menu_user.html" %} @@ -12,16 +12,11 @@ {% if flavor == "top" %}