From 9391985cbbc605149a0bcd0c10c9446b80fc9ed3 Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Thu, 21 Sep 2023 17:20:38 +0300
Subject: [PATCH 1/5] fix: Add link to public pages to private NomCom pages

Fixes #6343

Also fix highlighting of the active tab in the nav tab bar while I'm here.
---
 ietf/nomcom/views.py                          |  49 ++------
 ietf/static/js/ietf.js                        |   2 +-
 .../templates/nomcom/nomcom_private_base.html | 119 ++++++++++--------
 ietf/templates/nomcom/nomcom_public_base.html |  16 ++-
 ietf/templates/nomcom/volunteers.html         |   4 +-
 5 files changed, 91 insertions(+), 99 deletions(-)

diff --git a/ietf/nomcom/views.py b/ietf/nomcom/views.py
index 6bd85dad8..dc3861e15 100644
--- a/ietf/nomcom/views.py
+++ b/ietf/nomcom/views.py
@@ -77,7 +77,6 @@ def year_index(request, year):
     return render(request, 'nomcom/year_index.html',
                               {'nomcom': nomcom,
                                'year': year,
-                               'selected': 'index',
                                'template': template})
 
 def announcements(request):
@@ -182,8 +181,7 @@ def private_key(request, year):
                               {'nomcom': nomcom,
                                'year': year,
                                'back_url': back_url,
-                               'form': form,
-                               'selected': 'private_key'})
+                               'form': form})
 
 
 @role_required("Nomcom")
@@ -280,7 +278,6 @@ def private_index(request, year):
                                'positions': positions,
                                'selected_state': selected_state,
                                'selected_position': selected_position and int(selected_position) or None,
-                               'selected': 'index',
                                'is_chair': is_chair,
                                'mailto': mailto,
                               })
@@ -346,7 +343,6 @@ def send_reminder_mail(request, year, type):
                                'year': year,
                                'nominees': annotated_nominees,
                                'mail_template': mail_template,
-                               'selected': selected_tab,
                                'reminder_description': reminder_description,
                                'state_description': state_description,
                                'is_chair_task' : True,
@@ -373,7 +369,6 @@ def private_merge_person(request, year):
                               {'nomcom': nomcom,
                                'year': year,
                                'form': form,
-                               'selected': 'merge_person',
                                'is_chair_task' : True,
                               })
 
@@ -398,7 +393,6 @@ def private_merge_nominee(request, year):
                               {'nomcom': nomcom,
                                'year': year,
                                'form': form,
-                               'selected': 'merge_nominee',
                                'is_chair_task' : True,
                               })
 
@@ -408,8 +402,7 @@ def requirements(request, year):
     return render(request, 'nomcom/requirements.html',
                               {'nomcom': nomcom,
                                'positions': positions,
-                               'year': year,
-                               'selected': 'requirements'})
+                               'year': year})
 
 
 def questionnaires(request, year):
@@ -418,8 +411,7 @@ def questionnaires(request, year):
     return render(request, 'nomcom/questionnaires.html',
                               {'nomcom': nomcom,
                                'positions': positions,
-                               'year': year,
-                               'selected': 'questionnaires'})
+                               'year': year})
 
 
 @login_required
@@ -453,15 +445,13 @@ def nominate(request, year, public, newperson):
         messages.warning(request, "This Nomcom is not yet accepting nominations")
         return render(request, template,
                               {'nomcom': nomcom,
-                               'year': year,
-                               'selected': 'nominate'})
+                               'year': year})
 
     if nomcom.group.state_id == 'conclude':
         messages.warning(request, "Nominations to this Nomcom are closed.")
         return render(request, template,
                               {'nomcom': nomcom,
-                               'year': year,
-                               'selected': 'nominate'})
+                               'year': year})
 
     if request.method == 'POST':
         if newperson:
@@ -485,8 +475,7 @@ def nominate(request, year, public, newperson):
                               {'form': form,
                                'nomcom': nomcom,
                                'year': year,
-                               'positions': nomcom.position_set.filter(is_open=True),
-                               'selected': 'nominate'})
+                               'positions': nomcom.position_set.filter(is_open=True)})
 
 @login_required
 def public_feedback(request, year):
@@ -550,7 +539,6 @@ def feedback(request, year, public):
             return render(request, 'nomcom/feedback.html', {
                 'nomcom': nomcom,
                 'year': year,
-                'selected': 'feedback',
                 'counts' : counts,
                 'base_template': base_template
             })
@@ -561,7 +549,6 @@ def feedback(request, year, public):
                 'form': None,
                 'nomcom': nomcom,
                 'year': year,
-                'selected': 'feedback',
                 'positions': positions,
                 'topics': topics,
                 'counts' : counts,
@@ -575,7 +562,6 @@ def feedback(request, year, public):
                 'form': None,
                 'nomcom': nomcom,
                 'year': year,
-                'selected': 'feedback',
                 'positions': positions,
                 'topics': topics,
                 'counts' : counts,
@@ -622,7 +608,6 @@ def feedback(request, year, public):
         'year': year,
         'positions': positions,
         'topics': topics,
-        'selected': 'feedback',
         'counts': counts,
         'topic_counts': topic_counts,
         'base_template': base_template
@@ -648,7 +633,6 @@ def private_feedback_email(request, year):
         return render(request, template,
                           {'nomcom': nomcom,
                            'year': year,
-                           'selected': 'feedback_email',
                            'is_chair_task' : True,
                           })
 
@@ -668,8 +652,7 @@ def private_feedback_email(request, year):
     return render(request, template,
                               {'form': form,
                                'nomcom': nomcom,
-                               'year': year,
-                               'selected': 'feedback_email'})
+                               'year': year})
 
 @role_required("Nomcom Chair", "Nomcom Advisor")
 def private_questionnaire(request, year):
@@ -691,7 +674,6 @@ def private_questionnaire(request, year):
         return render(request, template,
                           {'nomcom': nomcom,
                            'year': year,
-                           'selected': 'questionnaire',
                            'is_chair_task' : True,
                           })
 
@@ -710,8 +692,7 @@ def private_questionnaire(request, year):
                               {'form': form,
                                'questionnaire_response': questionnaire_response,
                                'nomcom': nomcom,
-                               'year': year,
-                               'selected': 'questionnaire'})
+                               'year': year})
 
 
 def process_nomination_status(request, year, nominee_position_id, state, date, hash):
@@ -765,7 +746,6 @@ def process_nomination_status(request, year, nominee_position_id, state, date, h
                                'nominee_position': nominee_position,
                                'state': state,
                                'need_confirmation': need_confirmation,
-                               'selected': 'feedback',
                                'form': form })
 
 @role_required("Nomcom")
@@ -830,7 +810,6 @@ def view_feedback(request, year):
 
     return render(request, 'nomcom/view_feedback.html',
                               {'year': year,
-                               'selected': 'view_feedback',
                                'nominees': nominees,
                                'nominee_feedback_types': nominee_feedback_types,
                                'independent_feedback_types': independent_feedback_types,
@@ -927,7 +906,6 @@ def view_feedback_pending(request, year):
             form.set_nomcom(nomcom, request.user)
     return render(request, 'nomcom/view_feedback_pending.html',
                               {'year': year,
-                               'selected': 'feedback_pending',
                                'formset': formset,
                                'extra_step': extra_step,
                                'extra_ids': extra_ids,
@@ -1090,7 +1068,6 @@ def edit_nominee(request, year, nominee_id):
 
     return render(request, 'nomcom/edit_nominee.html',
                               {'year': year,
-                               'selected': 'index',
                                'nominee': nominee,
                                'form': form,
                                'nomcom': nomcom,
@@ -1128,7 +1105,6 @@ def edit_nomcom(request, year):
                                'formset': formset,
                                'nomcom': nomcom,
                                'year': year,
-                               'selected': 'edit_nomcom',
                                'is_chair_task' : True,
                               })
 
@@ -1142,7 +1118,6 @@ def list_templates(request, year):
     return render(request, 'nomcom/list_templates.html',
                               {'template_list': template_list,
                                'year': year,
-                               'selected': 'edit_templates',
                                'nomcom': nomcom,
                                'is_chair_task' : True,
                               })
@@ -1215,7 +1190,6 @@ def list_positions(request, year):
     return render(request, 'nomcom/list_positions.html',
                               {'positions': positions,
                                'year': year,
-                               'selected': 'edit_positions',
                                'nomcom': nomcom,
                                'is_chair_task' : True,
                               })
@@ -1282,7 +1256,6 @@ def list_topics(request, year):
     return render(request, 'nomcom/list_topics.html',
                               {'topics': topics,
                                'year': year,
-                               'selected': 'edit_topics',
                                'nomcom': nomcom,
                                'is_chair_task' : True,
                               })
@@ -1364,8 +1337,7 @@ def edit_members(request, year):
     return render(request, 'nomcom/new_edit_members.html',
                               {'nomcom' : nomcom,
                                'year' : year,
-                               'form': form,
-                              })
+                               'form': form})
 
 @role_required("Nomcom Chair", "Nomcom Advisor")
 def extract_email_lists(request, year):
@@ -1385,8 +1357,7 @@ def extract_email_lists(request, year):
                               'pending': pending,
                               'accepted': accepted,
                               'noresp': noresp,
-                              'bypos': bypos,
-                             })
+                              'bypos': bypos})
 
 @login_required
 def volunteer(request):
diff --git a/ietf/static/js/ietf.js b/ietf/static/js/ietf.js
index 7f7e92415..215d80553 100644
--- a/ietf/static/js/ietf.js
+++ b/ietf/static/js/ietf.js
@@ -57,7 +57,7 @@ $(document)
                 var text = $(this)
                     .text();
                 // insert some <wbr> at strategic places
-                var newtext = text.replace(/([@._])/g, "$1<wbr>");
+                var newtext = text.replace(/([@._+])/g, "$1<wbr>");
                 if (newtext === text) {
                     return;
                 }
diff --git a/ietf/templates/nomcom/nomcom_private_base.html b/ietf/templates/nomcom/nomcom_private_base.html
index 7f7829915..79b5567d4 100644
--- a/ietf/templates/nomcom/nomcom_private_base.html
+++ b/ietf/templates/nomcom/nomcom_private_base.html
@@ -9,6 +9,9 @@
 {% endblock %}
 {% block content %}
     {% origin %}
+    {% with parts=request.path|split:'/' %}
+    {% with l0=parts|slice:'1:'|last l1=parts|slice:'-2:-1'|last %}
+    {% with selected=l0|default:l1 %}
     <h1>
         NomCom {{ year }}
         {% if nomcom.group.state_id == 'conclude' %}<span class="badge rounded-pill text-bg-info">Concluded</span>{% endif %}
@@ -19,127 +22,139 @@
     </h1>
     <ul class="nav nav-tabs my-3">
         <li class="nav-item">
-            <a class="nav-link {% if selected == "index" %}active{% endif %}"
+            <a class="nav-link {% if selected == 'private' %}active{% endif %}"
                href="{% url "ietf.nomcom.views.private_index" year %}">
                 Nominees
             </a>
         </li>
         {% if nomcom|has_publickey %}
             <li class="nav-item">
-                <a class="nav-link {% if selected == "nominate" %}active{% endif %}"
+                <a class="nav-link {% if selected == 'nominate' %}active{% endif %}"
                    href="{% url 'ietf.nomcom.views.private_nominate' year %}">
                     Nominate
                 </a>
             </li>
-            <li class="nav-item">
-                <a class="nav-link {% if selected == "feedback" %}active{% endif %}"
+        {% endif %}
+        <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle {% if selected in "feedback,view-feedback" %}active{% endif %}" data-bs-toggle="dropdown" href="#">Feedback</a>
+            <ul class="dropdown-menu mt-n1" role="menu">
+            {% if nomcom|has_publickey %}
+            <li>
+                <a class="dropdown-item {% if selected == 'feedback' %}active{% endif %}"
                    href="{% url 'ietf.nomcom.views.private_feedback' year %}">
                     Enter feedback
                 </a>
             </li>
-        {% endif %}
-        <li class="nav-item">
-            <a class="nav-link {% if selected == "view_feedback" %}active{% endif %}"
-               href="{% url 'ietf.nomcom.views.view_feedback' year %}">
-                View feedback
-            </a>
+            {% endif %}
+            <li>
+                <a class="dropdown-item {% if selected == 'view-feedback' %}active{% endif %}"
+                   href="{% url 'ietf.nomcom.views.view_feedback' year %}">
+                    View feedback
+                </a>
+            </li>
+            </ul>
         </li>
         <li class="nav-item">
-            <a class="nav-link {% if selected == "private_key" %}active{% endif %}"
+            <a class="nav-link {% if selected == 'key' %}active{% endif %}"
                href="{% url 'ietf.nomcom.views.private_key' year %}">
                 Private key
             </a>
         </li>
         {% if user|is_chair_or_advisor:year %}
             <li class="nav-item">
-                <a class="nav-link {% if selected == "feedback_pending" %}active{% endif %}"
+                <a class="nav-link {% if selected == 'pending' %}active{% endif %}"
                    href="{% url 'ietf.nomcom.views.view_feedback_pending' year %}">
                     Pending emails
                     {% if nomcom.pending_email_count %}<span class="badge rounded-pill text-bg-primary">{{ nomcom.pending_email_count }}</span>{% endif %}
                 </a>
             </li>
             <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">Chair/Advisor Tasks</a>
+                <a class="nav-link dropdown-toggle {% if selected in "feedback-email,questionnaire-response,extract-email-lists,accept,questionnaire,merge-person,merge-nominee,edit-nomcom,templates,position,topic,edit-members,help" %}active{% endif %}" data-bs-toggle="dropdown" href="#">Chair/advisor tasks</a>
                 <ul class="dropdown-menu mt-n1" role="menu">
                     {% if nomcom.group.state_id == 'active' %}
                         <li role="presentation" class="dropdown-header">Feedback Management</li>
-                        <li class="dropdown-item">
-                            <a href="{% url 'ietf.nomcom.views.private_feedback_email' year %}">Enter email feedback</a>
+                        <li>
+                            <a class="dropdown-item {% if selected == 'feedback-email' %}active{% endif %}" href="{% url 'ietf.nomcom.views.private_feedback_email' year %}">Enter email feedback</a>
                         </li>
-                        <li class="dropdown-item">
-                            <a href="{% url 'ietf.nomcom.views.private_questionnaire' year %}">Enter questionnaire response</a>
+                        <li>
+                            <a class="dropdown-item {% if selected == 'questionnaire-response' %}active{% endif %}" href="{% url 'ietf.nomcom.views.private_questionnaire' year %}">Enter questionnaire response</a>
                         </li>
-                        <li class="dropdown-item">
-                            <a href="{% url 'ietf.nomcom.views.extract_email_lists' year %}">Extract email lists</a>
+                        <li>
+                            <a class="dropdown-item {% if selected == 'extract-email-lists' %}active{% endif %}" href="{% url 'ietf.nomcom.views.extract_email_lists' year %}">Extract email lists</a>
                         </li>
-                        <li class="dropdown-item">
-                            <a href="{% url 'ietf.nomcom.views.send_reminder_mail' year "accept" %}">Send accept reminder</a>
+                        <li>
+                            <a class="dropdown-item {% if selected == 'accept' %}active{% endif %}" href="{% url 'ietf.nomcom.views.send_reminder_mail' year "accept" %}">Send accept reminder</a>
                         </li>
-                        <li class="dropdown-item">
-                            <a href="{% url 'ietf.nomcom.views.send_reminder_mail' year "questionnaire" %}">Send questionnaire reminder</a>
+                        <li>
+                            <a class="dropdown-item {% if selected == 'questionnaire' %}active{% endif %}" href="{% url 'ietf.nomcom.views.send_reminder_mail' year "questionnaire" %}">Send questionnaire reminder</a>
                         </li>
-                        <li class="dropdown-item">
-                            <a href="{% url "ietf.nomcom.views.private_merge_person" year %}">Request person record merge</a>
+                        <li>
+                            <a class="dropdown-item {% if selected == 'merge-person' %}active{% endif %}" href="{% url "ietf.nomcom.views.private_merge_person" year %}">Request person record merge</a>
                         </li>
-                        <li class="dropdown-item">
-                            <a href="{% url "ietf.nomcom.views.private_merge_nominee" year %}">Merge nominee records</a>
+                        <li>
+                            <a class="dropdown-item {% if selected == 'merge-nominee' %}active{% endif %}" href="{% url "ietf.nomcom.views.private_merge_nominee" year %}">Merge nominee records</a>
                         </li>
+                        <li><hr class="dropdown-divider"></li>
                     {% endif %}
                     <li role="presentation" class="dropdown-header">NomCom configuration</li>
-                    <li class="dropdown-item">
-                        <a href="{% url 'ietf.nomcom.views.edit_nomcom' year %}">Edit settings</a>
+                    <li>
+                        <a class="dropdown-item {% if selected == 'edit-nomcom' %}active{% endif %}" href="{% url 'ietf.nomcom.views.edit_nomcom' year %}">Edit settings</a>
                     </li>
-                    <li class="dropdown-item">
-                        <a href="{% url 'ietf.nomcom.views.list_templates' year %}">Edit pages</a>
+                    <li>
+                        <a class="dropdown-item {% if selected == 'templates' %}active{% endif %}" href="{% url 'ietf.nomcom.views.list_templates' year %}">Edit pages</a>
                     </li>
-                    <li class="dropdown-item">
-                        <a href="{% url 'ietf.nomcom.views.list_positions' year %}">Edit positions</a>
+                    <li>
+                        <a class="dropdown-item {% if selected == 'position' %}active{% endif %}" href="{% url 'ietf.nomcom.views.list_positions' year %}">Edit positions</a>
                     </li>
-                    <li class="dropdown-item">
-                        <a href="{% url 'ietf.nomcom.views.list_topics' year %}">Edit topics</a>
+                    <li>
+                        <a class="dropdown-item {% if selected == 'topic' %}active{% endif %}" href="{% url 'ietf.nomcom.views.list_topics' year %}">Edit topics</a>
                     </li>
                     {% if nomcom.group.state_id == 'active' %}
-                        <li class="dropdown-item">
-                            <a href="{% url 'ietf.nomcom.views.edit_members' year %}">Edit members</a>
+                        <li>
+                            <a class="dropdown-item {% if selected == 'edit-members' %}active{% endif %}" href="{% url 'ietf.nomcom.views.edit_members' year %}">Edit members</a>
                         </li>
                     {% endif %}
-                    <li class="dropdown-item">
-                        <a href="{% url 'ietf.nomcom.views.configuration_help' year %}">Configuration help</a>
+                    <li>
+                        <a class="dropdown-item {% if selected == 'help' %}active{% endif %}" href="{% url 'ietf.nomcom.views.configuration_help' year %}">Configuration help</a>
                     </li>
+                    <li><hr class="dropdown-divider"></li>
                     <li role="presentation" class="dropdown-header">Other tools</li>
-                    <li class="dropdown-item">
-                        <a href="{% url 'ietf.secr.announcement.views.main' %}">Announcement tool</a>
-                    </li>
-                    <li class="dropdown-item">
-                        <a href="https://www.ietf.org/registration/nomcom_chair/nomcomstaff.py">Secretariat private eligibility checker</a>
-                    </li>
-                    <li class="dropdown-item">
-                        <a href="https://www.ietf.org/registration/nomcom.py">Secretariat public eligibility checker</a>
+                    <li>
+                        <a class="dropdown-item" href="{% url 'ietf.secr.announcement.views.main' %}">Announcement tool</a>
                     </li>
                 </ul>
             </li>
         {% endif %}
         {% if user|is_chair_or_advisor:year or user|has_role:"Secretariat" %}
             <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">
+                <a class="nav-link dropdown-toggle {% if selected in 'eligible,volunteers' %}active{% endif %}" data-bs-toggle="dropdown" href="#">
                     Volunteers
                 </a>
                 <ul class="dropdown-menu mt-n1" role="menu">
-                    <li class="dropdown-item">
-                        <a href="{% url 'ietf.nomcom.views.private_eligible' year %}">
+                    <li>
+                        <a class="dropdown-item {% if selected == 'eligible' %}active{% endif %}" href="{% url 'ietf.nomcom.views.private_eligible' year %}">
                             View eligible
                         </a>
                     </li>
-                    <li class="dropdown-item">
-                        <a href="{% url 'ietf.nomcom.views.private_volunteers' year %}">
+                    <li>
+                        <a class="dropdown-item {% if selected == 'volunteers' %}active{% endif %}" href="{% url 'ietf.nomcom.views.private_volunteers' year %}">
                             View volunteers
                         </a>
                     </li>
                 </ul>
             </li>
         {% endif %}
+        <li class="nav-item">
+            <a class="nav-link"
+               href="/nomcom/{{ nomcom.year }}">
+                Public pages &raquo;
+            </a>
+        </li>
     </ul>
     {% block nomcom_content %}{% endblock %}
+    {% endwith %}
+    {% endwith %}
+    {% endwith %}
 {% endblock %}
 {% block js %}
     <script>
diff --git a/ietf/templates/nomcom/nomcom_public_base.html b/ietf/templates/nomcom/nomcom_public_base.html
index d369b28fc..c9b2e824a 100644
--- a/ietf/templates/nomcom/nomcom_public_base.html
+++ b/ietf/templates/nomcom/nomcom_public_base.html
@@ -9,13 +9,16 @@
 {% endblock %}
 {% block content %}
     {% origin %}
+    {% with parts=request.path|split:'/' %}
+    {% with l0=parts|slice:'1:'|last l1=parts|slice:'-2:-1'|last %}
+    {% with selected=l0|default:l1 %}
     <h1>
         NomCom {{ year }}
         {% if nomcom.group.state_id == 'conclude' %}<span class="badge rounded-pill text-bg-info">Concluded</span>{% endif %}
     </h1>
     <ul class="nav nav-tabs my-3">
         <li class="nav-item">
-            <a class="nav-link {% if selected == "index" %}active{% endif %}"
+            <a class="nav-link {% if selected == year %}active{% endif %}"
                href="{% url 'ietf.nomcom.views.year_index' year %}">
                 Home
             </a>
@@ -35,7 +38,7 @@
             </li>
         {% endif %}
         <li class="nav-item">
-            <a class="nav-link {% if selected == "requirements" %}active{% endif %}"
+            <a class="nav-link {% if selected == "expertise" %}active{% endif %}"
                href="{% url 'ietf.nomcom.views.requirements' year %}">
                 Desired expertise
             </a>
@@ -48,14 +51,14 @@
         </li>
         {% if user|is_chair_or_advisor:year or user|has_role:"Secretariat" %}
             <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">Volunteers</a>
+                <a class="nav-link dropdown-toggle {% if selected in 'eligible,volunteers' %}active{% endif %}" data-bs-toggle="dropdown" href="#">Volunteers</a>
                 <ul class="dropdown-menu mt-n1" role="menu">
                     <li class="nav-item">
-                        <a class="dropdown-item"
+                        <a class="dropdown-item {% if selected == 'eligible' %}active{% endif %}"
                            href="{% url 'ietf.nomcom.views.public_eligible' year %}">View eligible</a>
                     </li>
                     <li class="nav-item">
-                        <a class="dropdown-item"
+                        <a class="dropdown-item {% if selected == 'volunteers' %}active{% endif %}"
                            href="{% url 'ietf.nomcom.views.public_volunteers' year %}">View volunteers</a>
                     </li>
                 </ul>
@@ -63,6 +66,9 @@
         {% endif %}
     </ul>
     {% block nomcom_content %}{% endblock %}
+    {% endwith %}
+    {% endwith %}
+    {% endwith %}
 {% endblock %}
 {% block js %}
     <script>
diff --git a/ietf/templates/nomcom/volunteers.html b/ietf/templates/nomcom/volunteers.html
index 764a055b1..8fc1e41e9 100644
--- a/ietf/templates/nomcom/volunteers.html
+++ b/ietf/templates/nomcom/volunteers.html
@@ -1,7 +1,7 @@
 {% extends public|yesno:"nomcom/nomcom_public_base.html,nomcom/nomcom_private_base.html" %}
 {# Copyright The IETF Trust 2021, All Rights Reserved #}
 {% load origin %}
-{% load django_bootstrap5 textfilters person_filters %}
+{% load django_bootstrap5 textfilters person_filters ietf_filters%}
 {% load static %}
 {% block subtitle %}- Volunteers{% endblock %}
 {% block pagehead %}
@@ -34,7 +34,7 @@
                 {% for v in eligibility_group.list %}
                     <tr>
                         <td>{{ forloop.counter }}</td>
-                        <td>{{ v.person.last_name }}</td>
+                        <td>{{ v.person.last_name|split:'+'|join:'+<wbr>' }}</td>
                         <td>{{ v.person.first_name }}</td>
                         <td>{{ v.person.ascii_name }}</td>
                         <td>{% person_link v.person %}</td>

From e76201103f9c32d32fcc8bbc800a6f9a027e3e40 Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Thu, 21 Sep 2023 18:15:12 +0300
Subject: [PATCH 2/5] Fix pyflake

---
 ietf/nomcom/views.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ietf/nomcom/views.py b/ietf/nomcom/views.py
index dc3861e15..180e68a59 100644
--- a/ietf/nomcom/views.py
+++ b/ietf/nomcom/views.py
@@ -302,13 +302,11 @@ def send_reminder_mail(request, year, type):
         interesting_state = 'pending'
         mail_path = nomcom_template_path + NOMINEE_ACCEPT_REMINDER_TEMPLATE
         reminder_description = 'accept (or decline) a nomination'
-        selected_tab = 'send_accept_reminder'
         state_description = NomineePositionStateName.objects.get(slug=interesting_state).name
     elif type=='questionnaire':
         interesting_state = 'accepted'
         mail_path = nomcom_template_path + NOMINEE_QUESTIONNAIRE_REMINDER_TEMPLATE
         reminder_description = 'complete the questionnaire for a nominated position'
-        selected_tab = 'send_questionnaire_reminder'
         state_description =  NomineePositionStateName.objects.get(slug=interesting_state).name+' but no questionnaire has been received'
     else:
         raise Http404

From 9efcce227d75e69070b89983cc292ad86143d715 Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Mon, 25 Sep 2023 13:42:15 +0300
Subject: [PATCH 3/5] Be less clever

---
 ietf/nomcom/urls.py                           |  4 +--
 .../templates/nomcom/nomcom_private_base.html | 30 ++++++++-----------
 ietf/templates/nomcom/nomcom_public_base.html | 10 ++-----
 3 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/ietf/nomcom/urls.py b/ietf/nomcom/urls.py
index 10b1a2937..a3b0c42d3 100644
--- a/ietf/nomcom/urls.py
+++ b/ietf/nomcom/urls.py
@@ -22,8 +22,8 @@ urlpatterns = [
     url(r'^(?P<year>\d{4})/private/view-feedback/nominee/(?P<nominee_id>\d+)$', views.view_feedback_nominee),
     url(r'^(?P<year>\d{4})/private/view-feedback/topic/(?P<topic_id>\d+)$', views.view_feedback_topic),
     url(r'^(?P<year>\d{4})/private/edit/nominee/(?P<nominee_id>\d+)$', views.edit_nominee),
-    url(r'^(?P<year>\d{4})/private/merge-nominee/?$', views.private_merge_nominee),
-    url(r'^(?P<year>\d{4})/private/merge-person/?$', views.private_merge_person),
+    url(r'^(?P<year>\d{4})/private/merge-nominee/$', views.private_merge_nominee),
+    url(r'^(?P<year>\d{4})/private/merge-person/$', views.private_merge_person),
     url(r'^(?P<year>\d{4})/private/send-reminder-mail/(?P<type>\w+)/$', views.send_reminder_mail),
     url(r'^(?P<year>\d{4})/private/extract-email-lists/$', views.extract_email_lists),
     url(r'^(?P<year>\d{4})/private/edit-members/$', views.edit_members),
diff --git a/ietf/templates/nomcom/nomcom_private_base.html b/ietf/templates/nomcom/nomcom_private_base.html
index 79b5567d4..c64fa1b8f 100644
--- a/ietf/templates/nomcom/nomcom_private_base.html
+++ b/ietf/templates/nomcom/nomcom_private_base.html
@@ -9,9 +9,7 @@
 {% endblock %}
 {% block content %}
     {% origin %}
-    {% with parts=request.path|split:'/' %}
-    {% with l0=parts|slice:'1:'|last l1=parts|slice:'-2:-1'|last %}
-    {% with selected=l0|default:l1 %}
+    {% with selected=request.path|split:'/'|slice:'4:-1'|join:'-' %}
     <h1>
         NomCom {{ year }}
         {% if nomcom.group.state_id == 'conclude' %}<span class="badge rounded-pill text-bg-info">Concluded</span>{% endif %}
@@ -22,7 +20,7 @@
     </h1>
     <ul class="nav nav-tabs my-3">
         <li class="nav-item">
-            <a class="nav-link {% if selected == 'private' %}active{% endif %}"
+            <a class="nav-link {% if selected == '' %}active{% endif %}"
                href="{% url "ietf.nomcom.views.private_index" year %}">
                 Nominees
             </a>
@@ -36,7 +34,7 @@
             </li>
         {% endif %}
         <li class="nav-item dropdown">
-            <a class="nav-link dropdown-toggle {% if selected in "feedback,view-feedback" %}active{% endif %}" data-bs-toggle="dropdown" href="#">Feedback</a>
+            <a class="nav-link dropdown-toggle {% if selected == 'feedback' or selected == 'view-feedback' %}active{% endif %}" data-bs-toggle="dropdown" href="#">Feedback</a>
             <ul class="dropdown-menu mt-n1" role="menu">
             {% if nomcom|has_publickey %}
             <li>
@@ -62,14 +60,14 @@
         </li>
         {% if user|is_chair_or_advisor:year %}
             <li class="nav-item">
-                <a class="nav-link {% if selected == 'pending' %}active{% endif %}"
+                <a class="nav-link {% if selected == 'view-feedback-pending' %}active{% endif %}"
                    href="{% url 'ietf.nomcom.views.view_feedback_pending' year %}">
                     Pending emails
                     {% if nomcom.pending_email_count %}<span class="badge rounded-pill text-bg-primary">{{ nomcom.pending_email_count }}</span>{% endif %}
                 </a>
             </li>
             <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle {% if selected in "feedback-email,questionnaire-response,extract-email-lists,accept,questionnaire,merge-person,merge-nominee,edit-nomcom,templates,position,topic,edit-members,help" %}active{% endif %}" data-bs-toggle="dropdown" href="#">Chair/advisor tasks</a>
+                <a class="nav-link dropdown-toggle {% if selected == 'feedback-email' or selected == 'questionnaire-response' or selected == 'extract-email-lists' or selected == 'send-reminder-mail-accept' or selected == 'send-reminder-mail-questionnaire' or selected == 'merge-person' or selected == 'merge-nominee' or selected == 'edit-nomcom' or selected == 'chair-templates' or selected == 'chair-position' or selected == 'chair-topic' or selected == 'edit-members' or selected == 'help' %}active{% endif %}" data-bs-toggle="dropdown" href="#">Chair/advisor tasks</a>
                 <ul class="dropdown-menu mt-n1" role="menu">
                     {% if nomcom.group.state_id == 'active' %}
                         <li role="presentation" class="dropdown-header">Feedback Management</li>
@@ -83,10 +81,10 @@
                             <a class="dropdown-item {% if selected == 'extract-email-lists' %}active{% endif %}" href="{% url 'ietf.nomcom.views.extract_email_lists' year %}">Extract email lists</a>
                         </li>
                         <li>
-                            <a class="dropdown-item {% if selected == 'accept' %}active{% endif %}" href="{% url 'ietf.nomcom.views.send_reminder_mail' year "accept" %}">Send accept reminder</a>
+                            <a class="dropdown-item {% if selected == 'send-reminder-mail-accept' %}active{% endif %}" href="{% url 'ietf.nomcom.views.send_reminder_mail' year "accept" %}">Send accept reminder</a>
                         </li>
                         <li>
-                            <a class="dropdown-item {% if selected == 'questionnaire' %}active{% endif %}" href="{% url 'ietf.nomcom.views.send_reminder_mail' year "questionnaire" %}">Send questionnaire reminder</a>
+                            <a class="dropdown-item {% if selected == 'send-reminder-mail-questionnaire' %}active{% endif %}" href="{% url 'ietf.nomcom.views.send_reminder_mail' year "questionnaire" %}">Send questionnaire reminder</a>
                         </li>
                         <li>
                             <a class="dropdown-item {% if selected == 'merge-person' %}active{% endif %}" href="{% url "ietf.nomcom.views.private_merge_person" year %}">Request person record merge</a>
@@ -101,13 +99,13 @@
                         <a class="dropdown-item {% if selected == 'edit-nomcom' %}active{% endif %}" href="{% url 'ietf.nomcom.views.edit_nomcom' year %}">Edit settings</a>
                     </li>
                     <li>
-                        <a class="dropdown-item {% if selected == 'templates' %}active{% endif %}" href="{% url 'ietf.nomcom.views.list_templates' year %}">Edit pages</a>
+                        <a class="dropdown-item {% if selected == 'chair-templates' %}active{% endif %}" href="{% url 'ietf.nomcom.views.list_templates' year %}">Edit pages</a>
                     </li>
                     <li>
-                        <a class="dropdown-item {% if selected == 'position' %}active{% endif %}" href="{% url 'ietf.nomcom.views.list_positions' year %}">Edit positions</a>
+                        <a class="dropdown-item {% if selected == 'chair-position' %}active{% endif %}" href="{% url 'ietf.nomcom.views.list_positions' year %}">Edit positions</a>
                     </li>
                     <li>
-                        <a class="dropdown-item {% if selected == 'topic' %}active{% endif %}" href="{% url 'ietf.nomcom.views.list_topics' year %}">Edit topics</a>
+                        <a class="dropdown-item {% if selected == 'chair-topic' %}active{% endif %}" href="{% url 'ietf.nomcom.views.list_topics' year %}">Edit topics</a>
                     </li>
                     {% if nomcom.group.state_id == 'active' %}
                         <li>
@@ -127,17 +125,17 @@
         {% endif %}
         {% if user|is_chair_or_advisor:year or user|has_role:"Secretariat" %}
             <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle {% if selected in 'eligible,volunteers' %}active{% endif %}" data-bs-toggle="dropdown" href="#">
+                <a class="nav-link dropdown-toggle {% if selected == 'chair-eligible' or selected == 'chair-volunteers' %}active{% endif %}" data-bs-toggle="dropdown" href="#">
                     Volunteers
                 </a>
                 <ul class="dropdown-menu mt-n1" role="menu">
                     <li>
-                        <a class="dropdown-item {% if selected == 'eligible' %}active{% endif %}" href="{% url 'ietf.nomcom.views.private_eligible' year %}">
+                        <a class="dropdown-item {% if selected == 'chair-eligible' %}active{% endif %}" href="{% url 'ietf.nomcom.views.private_eligible' year %}">
                             View eligible
                         </a>
                     </li>
                     <li>
-                        <a class="dropdown-item {% if selected == 'volunteers' %}active{% endif %}" href="{% url 'ietf.nomcom.views.private_volunteers' year %}">
+                        <a class="dropdown-item {% if selected == 'chair-volunteers' %}active{% endif %}" href="{% url 'ietf.nomcom.views.private_volunteers' year %}">
                             View volunteers
                         </a>
                     </li>
@@ -153,8 +151,6 @@
     </ul>
     {% block nomcom_content %}{% endblock %}
     {% endwith %}
-    {% endwith %}
-    {% endwith %}
 {% endblock %}
 {% block js %}
     <script>
diff --git a/ietf/templates/nomcom/nomcom_public_base.html b/ietf/templates/nomcom/nomcom_public_base.html
index c9b2e824a..3edc69723 100644
--- a/ietf/templates/nomcom/nomcom_public_base.html
+++ b/ietf/templates/nomcom/nomcom_public_base.html
@@ -9,16 +9,14 @@
 {% endblock %}
 {% block content %}
     {% origin %}
-    {% with parts=request.path|split:'/' %}
-    {% with l0=parts|slice:'1:'|last l1=parts|slice:'-2:-1'|last %}
-    {% with selected=l0|default:l1 %}
+    {% with selected=request.path|split:'/'|slice:'3:-1'|join:'-' %}
     <h1>
         NomCom {{ year }}
         {% if nomcom.group.state_id == 'conclude' %}<span class="badge rounded-pill text-bg-info">Concluded</span>{% endif %}
     </h1>
     <ul class="nav nav-tabs my-3">
         <li class="nav-item">
-            <a class="nav-link {% if selected == year %}active{% endif %}"
+            <a class="nav-link {% if selected == '' %}active{% endif %}"
                href="{% url 'ietf.nomcom.views.year_index' year %}">
                 Home
             </a>
@@ -51,7 +49,7 @@
         </li>
         {% if user|is_chair_or_advisor:year or user|has_role:"Secretariat" %}
             <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle {% if selected in 'eligible,volunteers' %}active{% endif %}" data-bs-toggle="dropdown" href="#">Volunteers</a>
+                <a class="nav-link dropdown-toggle {% if selected == 'eligible' or selected == 'volunteers' %}active{% endif %}" data-bs-toggle="dropdown" href="#">Volunteers</a>
                 <ul class="dropdown-menu mt-n1" role="menu">
                     <li class="nav-item">
                         <a class="dropdown-item {% if selected == 'eligible' %}active{% endif %}"
@@ -67,8 +65,6 @@
     </ul>
     {% block nomcom_content %}{% endblock %}
     {% endwith %}
-    {% endwith %}
-    {% endwith %}
 {% endblock %}
 {% block js %}
     <script>

From a42ef589f363f817cab5457c2ac4c12ce50ea85e Mon Sep 17 00:00:00 2001
From: Lars Eggert <lars@eggert.org>
Date: Mon, 25 Sep 2023 17:41:30 +0300
Subject: [PATCH 4/5] Unsplit conditionals

---
 ietf/templates/nomcom/nomcom_private_base.html | 6 +++---
 ietf/templates/nomcom/nomcom_public_base.html  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ietf/templates/nomcom/nomcom_private_base.html b/ietf/templates/nomcom/nomcom_private_base.html
index c64fa1b8f..b92102e7f 100644
--- a/ietf/templates/nomcom/nomcom_private_base.html
+++ b/ietf/templates/nomcom/nomcom_private_base.html
@@ -34,7 +34,7 @@
             </li>
         {% endif %}
         <li class="nav-item dropdown">
-            <a class="nav-link dropdown-toggle {% if selected == 'feedback' or selected == 'view-feedback' %}active{% endif %}" data-bs-toggle="dropdown" href="#">Feedback</a>
+            <a class="nav-link dropdown-toggle {% if selected in 'feedback,view-feedback'|split:',' %}active{% endif %}" data-bs-toggle="dropdown" href="#">Feedback</a>
             <ul class="dropdown-menu mt-n1" role="menu">
             {% if nomcom|has_publickey %}
             <li>
@@ -67,7 +67,7 @@
                 </a>
             </li>
             <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle {% if selected == 'feedback-email' or selected == 'questionnaire-response' or selected == 'extract-email-lists' or selected == 'send-reminder-mail-accept' or selected == 'send-reminder-mail-questionnaire' or selected == 'merge-person' or selected == 'merge-nominee' or selected == 'edit-nomcom' or selected == 'chair-templates' or selected == 'chair-position' or selected == 'chair-topic' or selected == 'edit-members' or selected == 'help' %}active{% endif %}" data-bs-toggle="dropdown" href="#">Chair/advisor tasks</a>
+                <a class="nav-link dropdown-toggle {% if selected in 'feedback-email,questionnaire-response,extract-email-lists,send-reminder-mail-accept,send-reminder-mail-questionnaire,merge-person,merge-nominee,edit-nomcom,chair-templates,chair-position,chair-topic,edit-members,help'|split:',' %}active{% endif %}" data-bs-toggle="dropdown" href="#">Chair/advisor tasks</a>
                 <ul class="dropdown-menu mt-n1" role="menu">
                     {% if nomcom.group.state_id == 'active' %}
                         <li role="presentation" class="dropdown-header">Feedback Management</li>
@@ -125,7 +125,7 @@
         {% endif %}
         {% if user|is_chair_or_advisor:year or user|has_role:"Secretariat" %}
             <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle {% if selected == 'chair-eligible' or selected == 'chair-volunteers' %}active{% endif %}" data-bs-toggle="dropdown" href="#">
+                <a class="nav-link dropdown-toggle {% if selected in 'chair-eligible,chair-volunteers'|split:',' %}active{% endif %}" data-bs-toggle="dropdown" href="#">
                     Volunteers
                 </a>
                 <ul class="dropdown-menu mt-n1" role="menu">
diff --git a/ietf/templates/nomcom/nomcom_public_base.html b/ietf/templates/nomcom/nomcom_public_base.html
index 3edc69723..45b9b9135 100644
--- a/ietf/templates/nomcom/nomcom_public_base.html
+++ b/ietf/templates/nomcom/nomcom_public_base.html
@@ -49,7 +49,7 @@
         </li>
         {% if user|is_chair_or_advisor:year or user|has_role:"Secretariat" %}
             <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle {% if selected == 'eligible' or selected == 'volunteers' %}active{% endif %}" data-bs-toggle="dropdown" href="#">Volunteers</a>
+                <a class="nav-link dropdown-toggle {% if selected in 'eligibl,volunteers'|split:',' %}active{% endif %}" data-bs-toggle="dropdown" href="#">Volunteers</a>
                 <ul class="dropdown-menu mt-n1" role="menu">
                     <li class="nav-item">
                         <a class="dropdown-item {% if selected == 'eligible' %}active{% endif %}"

From 8f0a0da5a329ec3d2e028da5d601bb3d1216aa43 Mon Sep 17 00:00:00 2001
From: Jennifer Richards <jennifer@staff.ietf.org>
Date: Mon, 25 Sep 2023 12:01:27 -0300
Subject: [PATCH 5/5] fix: Typo

---
 ietf/templates/nomcom/nomcom_public_base.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ietf/templates/nomcom/nomcom_public_base.html b/ietf/templates/nomcom/nomcom_public_base.html
index 45b9b9135..27c34fb77 100644
--- a/ietf/templates/nomcom/nomcom_public_base.html
+++ b/ietf/templates/nomcom/nomcom_public_base.html
@@ -49,7 +49,7 @@
         </li>
         {% if user|is_chair_or_advisor:year or user|has_role:"Secretariat" %}
             <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle {% if selected in 'eligibl,volunteers'|split:',' %}active{% endif %}" data-bs-toggle="dropdown" href="#">Volunteers</a>
+                <a class="nav-link dropdown-toggle {% if selected in 'eligible,volunteers'|split:',' %}active{% endif %}" data-bs-toggle="dropdown" href="#">Volunteers</a>
                 <ul class="dropdown-menu mt-n1" role="menu">
                     <li class="nav-item">
                         <a class="dropdown-item {% if selected == 'eligible' %}active{% endif %}"
@@ -83,4 +83,4 @@
                     });
             });
     </script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}