From 28e75b2b1bcd6b08e7a00f2e42a6f0e0c62c2742 Mon Sep 17 00:00:00 2001
From: Ryan Johnson <rjohnson@mozilla.com>
Date: Thu, 29 Aug 2024 14:39:39 -0700
Subject: [PATCH] fix contributor tools menus on mobile

---
 kitsune/sumo/jinja2/includes/common_macros.html      | 7 +------
 kitsune/sumo/static/sumo/js/protocol-details-init.js | 1 -
 kitsune/wiki/jinja2/wiki/new_document.html           | 2 +-
 kitsune/wiki/jinja2/wiki/recent_revisions.html       | 2 +-
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/kitsune/sumo/jinja2/includes/common_macros.html b/kitsune/sumo/jinja2/includes/common_macros.html
index a3d4e8b26..5ee30f4ce 100644
--- a/kitsune/sumo/jinja2/includes/common_macros.html
+++ b/kitsune/sumo/jinja2/includes/common_macros.html
@@ -701,13 +701,11 @@
 </li>
 {% endmacro %}
 
-{% macro for_contributors_sidebar(user, default_language, li_only=False, active=None, menu="contributor-discussions", locale=None, is_collapsible=False) -%}
+{% macro for_contributors_sidebar(user, default_language, active=None, menu="contributor-discussions", locale=None, is_collapsible=False) -%}
 {% if user.is_authenticated %}
 <nav class="sidebar-nav" id="for-contributors-sidebar">
   <span class="details-heading"></span>
-  {% if not li_only %}
     <ul class="sidebar-nav--list">
-  {% endif %}
     {% if menu == "contributor-tools" %}
       <li class="sidebar-subheading sidebar-nav--heading-item hide-on-mobile">{{ _('Contributor tools') }}</li>
       {{ _tools_nav_links(user, default_language, active, context="sidebar-menu", locale=locale, is_collapsible=is_collapsible) }}
@@ -715,10 +713,7 @@
       <li class="sidebar-subheading sidebar-nav--heading-item">{{ _('Contributor discussions') }}</li>
       {{ _discussion_nav_links(user, default_language, active, context="sidebar-menu") }}
     {% endif %}
-
-  {% if not li_only %}
     </ul>
-  {% endif %}
 </nav>
 {% endif %}
 {%- endmacro %}
diff --git a/kitsune/sumo/static/sumo/js/protocol-details-init.js b/kitsune/sumo/static/sumo/js/protocol-details-init.js
index 9d9753afc..56b072770 100644
--- a/kitsune/sumo/static/sumo/js/protocol-details-init.js
+++ b/kitsune/sumo/static/sumo/js/protocol-details-init.js
@@ -40,7 +40,6 @@ export default function detailsInit() {
     if (sidebarList && mq.matches) {
       window.Mzp.Details.init('.details-heading');
       swapMobileSubnavText();
-
     } else {
       window.Mzp.Details.destroy('.details-heading');
     }
diff --git a/kitsune/wiki/jinja2/wiki/new_document.html b/kitsune/wiki/jinja2/wiki/new_document.html
index 8d00db062..669112594 100644
--- a/kitsune/wiki/jinja2/wiki/new_document.html
+++ b/kitsune/wiki/jinja2/wiki/new_document.html
@@ -85,7 +85,7 @@
 {% block side_top %}
   <nav id="doc-tools">
     <ul class="sidebar-nav sidebar-folding">
-      {{ for_contributors_sidebar(user, settings.WIKI_DEFAULT_LANGUAGE, True) }}
+      {{ for_contributors_sidebar(user, settings.WIKI_DEFAULT_LANGUAGE) }}
     </ul>
   </nav>
 {% endblock %}
diff --git a/kitsune/wiki/jinja2/wiki/recent_revisions.html b/kitsune/wiki/jinja2/wiki/recent_revisions.html
index 89d5b87e6..7acd2620e 100644
--- a/kitsune/wiki/jinja2/wiki/recent_revisions.html
+++ b/kitsune/wiki/jinja2/wiki/recent_revisions.html
@@ -10,7 +10,7 @@
 {% block side_top %}
   <nav id="doc-tools">
     <ul class="sidebar-nav sidebar-folding">
-      {{ for_contributors_sidebar(user, settings.WIKI_DEFAULT_LANGUAGE, True, menu="contributor-tools", locale=locale, is_collapsible=True, active="wiki.revisions") }}
+      {{ for_contributors_sidebar(user, settings.WIKI_DEFAULT_LANGUAGE, menu="contributor-tools", locale=locale, is_collapsible=True, active="wiki.revisions") }}
     </ul>
   </nav>
 {% endblock %}