git: f595e3118e - main - search: Duckduckgo support for multiple sites has changed

[Ceri Davies]

The branch main has been updated by ceri:

URL: https://cgit.FreeBSD.org/doc/commit/?id=f595e3118ea1c5e1e39a14f812b30f12709f1b03

commit f595e3118ea1c5e1e39a14f812b30f12709f1b03
Author:     Ceri Davies <ceri at FreeBSD.org>
AuthorDate: 2021-06-23 11:47:03 +0000
Commit:     Ceri Davies <ceri at FreeBSD.org>
CommitDate: 2021-06-23 11:47:03 +0000

    search: Duckduckgo support for multiple sites has changed
    
    Drop back to a single site: entry which catches all the old content.
    
    Reviewed by:    allanjude, ygy, dbaio
    Differential Revision:  https://reviews.freebsd.org/D30867
---
 website/content/en/cgi/cgi-style.pl                             | 2 +-
 website/themes/beastie/layouts/partials/site-header.html        | 2 +-
 website/themes/beastie/layouts/shortcodes/form-search-mail.html | 2 +-
 website/themes/beastie/layouts/shortcodes/form-search-site.html | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/website/content/en/cgi/cgi-style.pl b/website/content/en/cgi/cgi-style.pl
index 2d02151496..a1b22f84b6 100644
--- a/website/content/en/cgi/cgi-style.pl
+++ b/website/content/en/cgi/cgi-style.pl
@@ -83,7 +83,7 @@ $i_topbar = qq`
               <div id="search">
 		<form method="get" id="search-form" action="https://duckduckgo.com/">
 		  <h2 class="blockhide"><label for="words">Search</label></h2>
-		  <input type="hidden" name="sites" value="www.FreeBSD.org,docs.FreeBSD.org,lists.FreeBSD.org,wiki.FreeBSD.org,forums.FreeBSD.org" />
+		  <input type="hidden" name="sites" value="FreeBSD.org" />
 		  <input type="hidden" name="ka" value="v" />
 		  <input type="hidden" name="kt" value="v" />
 		  <input type="hidden" name="kh" value="1" />
diff --git a/website/themes/beastie/layouts/partials/site-header.html b/website/themes/beastie/layouts/partials/site-header.html
index ef2782909f..2f7109049a 100755
--- a/website/themes/beastie/layouts/partials/site-header.html
+++ b/website/themes/beastie/layouts/partials/site-header.html
@@ -9,7 +9,7 @@
       <a href="https://www.FreeBSDFoundation.org/donate/" title={{ i18n "donate" }}>{{ i18n "donate" }}</a>
     </div>
     <div id="search">
-      <form method="get" id="search-form" action="https://duckduckgo.com/" onsubmit="document.getElementById('words').value+=' (site:www.FreeBSD.org OR site:docs.FreeBSD.org OR site:lists.FreeBSD.org OR site:wiki.FreeBSD.org OR site:forums.FreeBSD.org)'">
+      <form method="get" id="search-form" action="https://duckduckgo.com/" onsubmit="document.getElementById('words').value+=' site:FreeBSD.org'">
         <input type="hidden" name="ka" value="v">
         <input type="hidden" name="kt" value="v">
         <input type="hidden" name="kh" value="1">
diff --git a/website/themes/beastie/layouts/shortcodes/form-search-mail.html b/website/themes/beastie/layouts/shortcodes/form-search-mail.html
index aa61122cba..f8e0267478 100644
--- a/website/themes/beastie/layouts/shortcodes/form-search-mail.html
+++ b/website/themes/beastie/layouts/shortcodes/form-search-mail.html
@@ -1,6 +1,6 @@
 <form action="https://duckduckgo.com/" method="get">
   <h2 class="blockhide"><label for="mlwords">Search</label></h2>
-  <input type="hidden" name="sites" value="docs.FreeBSD.org/mail,lists.FreeBSD.org/pipermail" />
+  <input type="hidden" name="sites" value="FreeBSD.org" />
   <input type="hidden" name="ka" value="v" />
   <input type="hidden" name="kt" value="v" />
   <input type="hidden" name="kh" value="1" />
diff --git a/website/themes/beastie/layouts/shortcodes/form-search-site.html b/website/themes/beastie/layouts/shortcodes/form-search-site.html
index 9b7faddbd3..eb5ddb12e0 100644
--- a/website/themes/beastie/layouts/shortcodes/form-search-site.html
+++ b/website/themes/beastie/layouts/shortcodes/form-search-site.html
@@ -1,5 +1,5 @@
 <form action="https://duckduckgo.com/" method="get"
-        onsubmit="document.getElementById('words2').value+=' (site:www.FreeBSD.org OR site:docs.FreeBSD.org OR site:lists.FreeBSD.org OR site:wiki.FreeBSD.org OR site:forums.FreeBSD.org)'">
+        onsubmit="document.getElementById('words2').value+=' site:FreeBSD.org '">
       <h2 class="blockhide"><label for="words2">Search</label></h2>
       <input type="hidden" name="ka" value="v" />
       <input type="hidden" name="kt" value="v" />