From 2bdbfe10cb71f48bd12f9ecc9017a3718a332053 Mon Sep 17 00:00:00 2001 From: Peter Yee Date: Sat, 25 Mar 2023 17:54:53 +0900 Subject: [PATCH] Fix: move meeting management items from base menu Documents tab to Meetings tab (fixes #3897 and #4005) Rearranges elements of the optional Manage block in Documents so that they appear in Meetings instead. This is for things like "xxxx wg meetings". Also, put role restrictions around whether "Request a session" and "Request an interim meeting" appear under the Meetings tab. --- ietf/templates/base/menu.html | 57 ++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/ietf/templates/base/menu.html b/ietf/templates/base/menu.html index 691f1972da..24e5192a07 100644 --- a/ietf/templates/base/menu.html +++ b/ietf/templates/base/menu.html @@ -145,14 +145,6 @@ {% endfor %} - {% for g in user|matman_groups %} -
  • - - {{ g.acronym }} {{ g.type.slug }} meetings - -
  • - {% endfor %} {% endif %} {% if user|has_role:"Review Team Secretary" %} {% if flavor == 'top' %} @@ -270,18 +262,41 @@ Important dates -
  • - - Request a session - -
  • -
  • - - Session requests - -
  • + {% if user|has_role:"WG Chair,WG Secretary,RG Chair,IAB Group Chair,Area Director,Secretariat,Team Chair,IRTF Chair,Program Chair,Program Lead,Program Secretary,EDWG Chair" %} +
  • + + Request a session + +
  • + {% endif %} + {% if user|has_role:"WG Chair,RG Chair" %} +
  • + + Request an interim meeting + +
  • + {% endif %} +
  • + + Session requests + +
  • + {% if user|has_role:"WG Chair,RG Chair" %} + {% if flavor == 'top' %}
  • {% endif %} +
  • Manage
  • + {% for g in user|matman_groups %} +
  • + + {{ g.acronym }} {{ g.type.slug }} meetings + +
  • + {% endfor %} + {% endif %} + {% if flavor == 'top' %} {% if flavor == 'top' %}
  • @@ -432,4 +447,4 @@ {% endif %} {% if flavor == 'top' %} {% include "base/menu_user.html" %} -{% endif %} \ No newline at end of file +{% endif %}