From a26176e618bc4db79a8edbb52bf3f5aac78cd294 Mon Sep 17 00:00:00 2001
From: Paul Selkirk <paul@painless-security.com>
Date: Thu, 22 Feb 2024 18:48:11 -0500
Subject: [PATCH 1/2] refactor: Remove Google from document history search

"Search lists" dropdown menu devolves into a single button
(two buttons for ADs).
---
 ietf/doc/views_doc.py                  | 11 +-----
 ietf/templates/doc/document_draft.html | 55 ++++++++------------------
 2 files changed, 18 insertions(+), 48 deletions(-)

diff --git a/ietf/doc/views_doc.py b/ietf/doc/views_doc.py
index 64f9de4f586..d97ff767cd2 100644
--- a/ietf/doc/views_doc.py
+++ b/ietf/doc/views_doc.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2009-2023, All Rights Reserved
+# Copyright The IETF Trust 2009-2024, All Rights Reserved
 # -*- coding: utf-8 -*-
 #
 # Parts Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
@@ -40,7 +40,6 @@
 import os
 import re
 
-from urllib.parse import quote
 from pathlib import Path
 
 from django.http import HttpResponse, Http404
@@ -476,13 +475,6 @@ def document_main(request, name, rev=None, document_html=False):
             can_submit_unsolicited_review_for_teams = Group.objects.filter(
                 reviewteamsettings__isnull=False, role__person__user=request.user, role__name='secr')
 
-        # mailing list search archive
-        search_archive = "www.ietf.org/mail-archive/web/"
-        if doc.stream_id == "ietf" and group.type_id == "wg" and group.list_archive:
-            search_archive = group.list_archive
-
-        search_archive = quote(search_archive, safe="~")
-
         # conflict reviews
         conflict_reviews = [r.source.name for r in interesting_relations_that.filter(relationship="conflrev")]
 
@@ -701,7 +693,6 @@ def document_main(request, name, rev=None, document_html=False):
                                        iana_experts_comment=iana_experts_comment,
                                        started_iesg_process=started_iesg_process,
                                        shepherd_writeup=shepherd_writeup,
-                                       search_archive=search_archive,
                                        actions=actions,
                                        presentations=presentations,
                                        review_assignments=review_assignments,
diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html
index ccfb23f06af..ccd19f91a88 100644
--- a/ietf/templates/doc/document_draft.html
+++ b/ietf/templates/doc/document_draft.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{# Copyright The IETF Trust 2016-2023, All Rights Reserved #}
+{# Copyright The IETF Trust 2016-2024, All Rights Reserved #}
 {% load origin %}
 {% load static %}
 {% load ietf_filters %}
@@ -658,45 +658,24 @@
                 </i>
                 Nits
             </a>
-            <div class="dropdown inline">
-                <button class="btn btn-primary btn-sm dropdown-toggle"
-                        type="button"
-                        id="ddSearchMenu"
-                        data-bs-toggle="dropdown"
-                        aria-expanded="true">
+            <a class="btn btn-primary btn-sm"
+               href="https://mailarchive.ietf.org/arch/search/?q=%22{{ doc.name }}%22"
+               rel="nofollow"
+               target="_blank">
+                <i class="bi bi-search">
+                </i>
+                Search email archive
+            </a>
+            {% if user|has_role:"Area Director" %}
+                <a class="btn btn-primary btn-sm"
+                   href="https://www.iesg.org/bin/c5i?mid=6&amp;rid=77&amp;target={{ doc.name }}"
+                   rel="nofollow"
+                   target="_blank">
                     <i class="bi bi-search">
                     </i>
-                    Search lists
-                </button>
-                <ul class="dropdown-menu" role="menu">
-                    <li role="presentation">
-                        <a class="dropdown-item"
-                           href="https://mailarchive.ietf.org/arch/search/?q=%22{{ doc.name }}%22"
-                           rel="nofollow"
-                           target="_blank">
-                            IETF Mail Archive
-                        </a>
-                    </li>
-                    <li role="presentation">
-                        <a class="dropdown-item"
-                           href="https://www.google.com/search?as_q={{ doc.name }}&amp;as_sitesearch={{ search_archive }}"
-                           rel="nofollow"
-                           target="_blank">
-                            Google
-                        </a>
-                    </li>
-                    {% if user|has_role:"Area Director" %}
-                        <li role="presentation">
-                            <a class="dropdown-item"
-                               href="https://www.iesg.org/bin/c5i?mid=6&amp;rid=77&amp;target={{ doc.name }}"
-                               rel="nofollow"
-                               target="_blank">
-                                ARO
-                            </a>
-                        </li>
-                    {% endif %}
-                </ul>
-            </div>
+                    Search ARO
+                </a>
+            {% endif %}
             {% if user.is_authenticated %}
                 <a class="btn btn-primary btn-sm track-untrack-doc {% if not doc.tracked_in_personal_community_list %}d-none{% endif %}"
                    href="{% url "ietf.community.views.untrack_document" email_or_name=user.username name=doc.name %}"

From 7612d74b97623f55d49a5d4bec1a5adb3bd40132 Mon Sep 17 00:00:00 2001
From: Paul Selkirk <paul@painless-security.com>
Date: Mon, 26 Feb 2024 14:49:40 -0500
Subject: [PATCH 2/2] refactor: Remove unused ARO search

---
 ietf/templates/doc/document_draft.html | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html
index ccd19f91a88..3831d10165f 100644
--- a/ietf/templates/doc/document_draft.html
+++ b/ietf/templates/doc/document_draft.html
@@ -666,16 +666,6 @@
                 </i>
                 Search email archive
             </a>
-            {% if user|has_role:"Area Director" %}
-                <a class="btn btn-primary btn-sm"
-                   href="https://www.iesg.org/bin/c5i?mid=6&amp;rid=77&amp;target={{ doc.name }}"
-                   rel="nofollow"
-                   target="_blank">
-                    <i class="bi bi-search">
-                    </i>
-                    Search ARO
-                </a>
-            {% endif %}
             {% if user.is_authenticated %}
                 <a class="btn btn-primary btn-sm track-untrack-doc {% if not doc.tracked_in_personal_community_list %}d-none{% endif %}"
                    href="{% url "ietf.community.views.untrack_document" email_or_name=user.username name=doc.name %}"