From 5f203d5135a65e7ba9b1cd72843db4c8f744bc31 Mon Sep 17 00:00:00 2001
From: erinz2020 <erinz2020@gmail.com>
Date: Thu, 12 Dec 2024 20:00:07 +0000
Subject: [PATCH 1/7] configurable encounter search page

---
 frontend/src/AuthenticatedSwitch.jsx          |  2 ++
 frontend/src/FrontDesk.jsx                    |  2 ++
 .../src/components/AuthenticatedAppHeader.jsx |  2 ++
 frontend/src/components/header/Menu.jsx       | 12 ++++++++++--
 frontend/src/constants/navMenu.js             | 19 ++++++++++++++++++-
 .../java/org/ecocean/api/SiteSettings.java    |  4 ++++
 .../bundles/commonConfiguration.properties    |  3 +++
 src/main/webapp/header.jsp                    |  4 +++-
 8 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/frontend/src/AuthenticatedSwitch.jsx b/frontend/src/AuthenticatedSwitch.jsx
index eb864a797c..bcdff0f5fc 100644
--- a/frontend/src/AuthenticatedSwitch.jsx
+++ b/frontend/src/AuthenticatedSwitch.jsx
@@ -19,6 +19,7 @@ export default function AuthenticatedSwitch({
   showAlert,
   setShowAlert,
   showclassicsubmit,
+  showClassicEncounterSearch,
 }) {
   const { data } = useGetMe();
   const username = data?.username;
@@ -44,6 +45,7 @@ export default function AuthenticatedSwitch({
           showAlert={showAlert}
           setShowAlert={setShowAlert}
           showclassicsubmit={showclassicsubmit}
+          showClassicEncounterSearch={showClassicEncounterSearch}
         />
       </div>
 
diff --git a/frontend/src/FrontDesk.jsx b/frontend/src/FrontDesk.jsx
index 10094e2a51..4a7d9ed69d 100644
--- a/frontend/src/FrontDesk.jsx
+++ b/frontend/src/FrontDesk.jsx
@@ -28,6 +28,7 @@ export default function FrontDesk() {
   const [loading, setLoading] = useState(true);
   const { data } = useGetSiteSettings();
   const showclassicsubmit = data?.showClassicSubmit;
+  const showClassicEncounterSearch = data?.showClassicEncounterSearch;
 
   const checkLoginStatus = () => {
     axios
@@ -93,6 +94,7 @@ export default function FrontDesk() {
           showAlert={showAlert}
           setShowAlert={setShowAlert}
           showclassicsubmit={showclassicsubmit}
+          showClassicEncounterSearch={showClassicEncounterSearch}
         />
       </AuthContext.Provider>
     );
diff --git a/frontend/src/components/AuthenticatedAppHeader.jsx b/frontend/src/components/AuthenticatedAppHeader.jsx
index 70860a11fd..c00671eb96 100644
--- a/frontend/src/components/AuthenticatedAppHeader.jsx
+++ b/frontend/src/components/AuthenticatedAppHeader.jsx
@@ -13,6 +13,7 @@ export default function AuthenticatedAppHeader({
   username,
   avatar,
   showclassicsubmit,
+  showClassicEncounterSearch,
 }) {
   const { visible } = useContext(FooterVisibilityContext);
 
@@ -74,6 +75,7 @@ export default function AuthenticatedAppHeader({
                 <Menu
                   username={username}
                   showclassicsubmit={showclassicsubmit}
+                  showClassicEncounterSearch={showClassicEncounterSearch}
                 />
               </Nav>
               <NotificationButton
diff --git a/frontend/src/components/header/Menu.jsx b/frontend/src/components/header/Menu.jsx
index f8b5d06a8a..f7af3eaed6 100644
--- a/frontend/src/components/header/Menu.jsx
+++ b/frontend/src/components/header/Menu.jsx
@@ -5,7 +5,11 @@ import DownIcon from "../svg/DownIcon";
 import RightIcon from "../svg/RightIcon";
 import { authenticatedMenu } from "../../constants/navMenu";
 
-export default function Menu({ username, showclassicsubmit }) {
+export default function Menu({
+  username,
+  showclassicsubmit,
+  showClassicEncounterSearch,
+}) {
   const [dropdownColor, setDropdownColor] = useState("transparent");
 
   const [dropdownShows, setDropdownShows] = useState({});
@@ -21,7 +25,11 @@ export default function Menu({ username, showclassicsubmit }) {
 
   return (
     <>
-      {authenticatedMenu(username, showclassicsubmit).map((item, idx) => (
+      {authenticatedMenu(
+        username,
+        showclassicsubmit,
+        showClassicEncounterSearch,
+      ).map((item, idx) => (
         <Nav className="me-auto" key={idx}>
           <NavDropdown
             className="header-dropdown"
diff --git a/frontend/src/constants/navMenu.js b/frontend/src/constants/navMenu.js
index 062edf77c4..8ca272cdd8 100644
--- a/frontend/src/constants/navMenu.js
+++ b/frontend/src/constants/navMenu.js
@@ -1,7 +1,11 @@
 import React from "react";
 import { FormattedMessage } from "react-intl";
 
-const authenticatedMenu = (username, showclassicsubmit) => [
+const authenticatedMenu = (
+  username,
+  showclassicsubmit,
+  showClassicEncounterSearch,
+) => [
   {
     Submit: [
       {
@@ -169,6 +173,19 @@ const authenticatedMenu = (username, showclassicsubmit) => [
         ),
         href: `${process.env.PUBLIC_URL}/encounter-search`,
       },
+      ...(showClassicEncounterSearch
+        ? [
+            {
+              name: (
+                <FormattedMessage
+                  id="MENU_SEARCH_ENCOUNTERS_CLASSIC"
+                  defaultMessage="Encounters(Classic)"
+                />
+              ),
+              href: "/encounters/encounterSearch.jsp",
+            },
+          ]
+        : []),
       {
         name: (
           <FormattedMessage
diff --git a/src/main/java/org/ecocean/api/SiteSettings.java b/src/main/java/org/ecocean/api/SiteSettings.java
index a8ac0b007d..76b9124bb6 100644
--- a/src/main/java/org/ecocean/api/SiteSettings.java
+++ b/src/main/java/org/ecocean/api/SiteSettings.java
@@ -162,6 +162,10 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
         settings.put("showClassicSubmit",
             Util.booleanNotFalse(CommonConfiguration.getProperty("showClassicSubmit", context))
             );
+        
+        settings.put("showClassicEncouners",
+            Util.booleanNotFalse(CommonConfiguration.getProperty("showClassicEncouners", context))
+            );
 
         Properties recaptchaProps = ShepherdProperties.getProperties("recaptcha.properties", "",
             context);
diff --git a/src/main/resources/bundles/commonConfiguration.properties b/src/main/resources/bundles/commonConfiguration.properties
index a6edbf880c..9d44d1b013 100755
--- a/src/main/resources/bundles/commonConfiguration.properties
+++ b/src/main/resources/bundles/commonConfiguration.properties
@@ -108,6 +108,9 @@ showTaxonomy = true
 # show option for "classic" submit page in UI
 showClassicSubmit = true
 
+# show option for "classic" encounter search page in UI
+showClassicEncouners = true
+
 #for multi-species libraries, fill out the genus and species for each supported animal type, starting with genusSpecies0
 genusSpecies0 = Balaenoptera acutorostrata
 
diff --git a/src/main/webapp/header.jsp b/src/main/webapp/header.jsp
index 8923af297e..f6d5b4ff14 100755
--- a/src/main/webapp/header.jsp
+++ b/src/main/webapp/header.jsp
@@ -489,7 +489,9 @@ if(request.getUserPrincipal()!=null){
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><%=props.getProperty("search")%><span class="svg-placeholder"></span> </a>
                         <ul class="dropdown-menu" role="menu">
                           <li><a href="<%=urlLoc %>/react/encounter-search"><%=props.getProperty("encounters")%></a></li>
-
+<% if (Util.booleanNotFalse(CommonConfiguration.getProperty("showClassicEncouners", context))) { %>
+                            <li><a href="<%=urlLoc %>/encounters/encounerSearch.jsp" ><%=props.getProperty("encounters")%></a></li>
+<% } %>
                           <li><a href="<%=urlLoc %>/individualSearch.jsp"><%=props.getProperty("individuals")%></a></li>
                           <li><a href="<%=urlLoc %>/occurrenceSearch.jsp"><%=props.getProperty("sightings")%></a></li>
 

From e7d3663d52b2d14f7f17846ab54c5fd7c19cdf5b Mon Sep 17 00:00:00 2001
From: erinz2020 <erinz2020@gmail.com>
Date: Fri, 13 Dec 2024 16:35:44 +0000
Subject: [PATCH 2/7] update header.jsp and properties

---
 frontend/src/FrontDesk.jsx                      | 2 +-
 frontend/src/components/header/Menu.jsx         | 2 ++
 frontend/src/constants/navMenu.js               | 2 +-
 frontend/src/locale/de.json                     | 1 +
 frontend/src/locale/en.json                     | 1 +
 frontend/src/locale/es.json                     | 1 +
 frontend/src/locale/fr.json                     | 1 +
 frontend/src/locale/it.json                     | 1 +
 src/main/resources/bundles/de/header.properties | 1 +
 src/main/resources/bundles/en/header.properties | 1 +
 src/main/resources/bundles/es/header.properties | 1 +
 src/main/resources/bundles/fr/header.properties | 1 +
 src/main/resources/bundles/it/header.properties | 1 +
 src/main/webapp/header.jsp                      | 2 +-
 14 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/frontend/src/FrontDesk.jsx b/frontend/src/FrontDesk.jsx
index 4a7d9ed69d..ef4f3af45d 100644
--- a/frontend/src/FrontDesk.jsx
+++ b/frontend/src/FrontDesk.jsx
@@ -28,7 +28,7 @@ export default function FrontDesk() {
   const [loading, setLoading] = useState(true);
   const { data } = useGetSiteSettings();
   const showclassicsubmit = data?.showClassicSubmit;
-  const showClassicEncounterSearch = data?.showClassicEncounterSearch;
+  const showClassicEncounterSearch = data?.showClassicEncouners;
 
   const checkLoginStatus = () => {
     axios
diff --git a/frontend/src/components/header/Menu.jsx b/frontend/src/components/header/Menu.jsx
index f7af3eaed6..9a6ad2a616 100644
--- a/frontend/src/components/header/Menu.jsx
+++ b/frontend/src/components/header/Menu.jsx
@@ -15,6 +15,8 @@ export default function Menu({
   const [dropdownShows, setDropdownShows] = useState({});
   const [dropdownBorder, setDropdownBorder] = useState("2px solid transparent");
 
+  console.log("showClassicEncounterSearch", showClassicEncounterSearch);
+
   const handleMouseEnterLeave = (id, isEnter) => {
     setDropdownShows((prev) => ({ ...prev, [id]: isEnter ? true : false }));
     setDropdownBorder((prev) => ({
diff --git a/frontend/src/constants/navMenu.js b/frontend/src/constants/navMenu.js
index 8ca272cdd8..232e0cae75 100644
--- a/frontend/src/constants/navMenu.js
+++ b/frontend/src/constants/navMenu.js
@@ -179,7 +179,7 @@ const authenticatedMenu = (
               name: (
                 <FormattedMessage
                   id="MENU_SEARCH_ENCOUNTERS_CLASSIC"
-                  defaultMessage="Encounters(Classic)"
+                  defaultMessage="Encounters (Classic)"
                 />
               ),
               href: "/encounters/encounterSearch.jsp",
diff --git a/frontend/src/locale/de.json b/frontend/src/locale/de.json
index a88f236384..91da3ec308 100644
--- a/frontend/src/locale/de.json
+++ b/frontend/src/locale/de.json
@@ -30,6 +30,7 @@
     "MENU_LEARN_MYBULKIMPORTS": "Meine Bulk-Importe",
     "MENU_LEARN_MYPROJECTS": "Meine Projekte",
     "MENU_SEARCH_ENCOUNTERS": "Begegnungen",
+    "MENU_SEARCH_ENCOUNTERS_CLASSIC": "Begegnungen (klassisch)",
     "MENU_SEARCH_INDIVIDUALS": "Individuen",
     "MENU_SEARCH_SIGHTINGS": "Sichtungen",
     "MENU_ANIMALS_INDIVIDUALGALLERY": "Individuelle Galerie",
diff --git a/frontend/src/locale/en.json b/frontend/src/locale/en.json
index 8278c718e7..4ad7d7dbe0 100644
--- a/frontend/src/locale/en.json
+++ b/frontend/src/locale/en.json
@@ -30,6 +30,7 @@
     "MENU_LEARN_MYBULKIMPORTS": "My Bulk Imports",
     "MENU_LEARN_MYPROJECTS": "My Projects",
     "MENU_SEARCH_ENCOUNTERS": "Encounters",
+    "MENU_SEARCH_ENCOUNTERS_CLASSIC": "Encounters (Classic)",
     "MENU_SEARCH_INDIVIDUALS": "Individuals",
     "MENU_SEARCH_SIGHTINGS": "Sightings",
     "MENU_ANIMALS_INDIVIDUALGALLERY": "Individual Gallery",
diff --git a/frontend/src/locale/es.json b/frontend/src/locale/es.json
index a6685a690f..792e828b03 100644
--- a/frontend/src/locale/es.json
+++ b/frontend/src/locale/es.json
@@ -30,6 +30,7 @@
     "MENU_LEARN_MYBULKIMPORTS": "Mis importaciones masivas",
     "MENU_LEARN_MYPROJECTS": "Mis proyectos",
     "MENU_SEARCH_ENCOUNTERS": "Encuentros",
+    "MENU_SEARCH_ENCOUNTERS_CLASSIC": "Encuentros (clásico)",
     "MENU_SEARCH_INDIVIDUALS": "Individuos",
     "MENU_SEARCH_SIGHTINGS": "Avistamientos",
     "MENU_ANIMALS_INDIVIDUALGALLERY": "Galería de individuos",
diff --git a/frontend/src/locale/fr.json b/frontend/src/locale/fr.json
index 4f3b72ff64..86ad46c325 100644
--- a/frontend/src/locale/fr.json
+++ b/frontend/src/locale/fr.json
@@ -30,6 +30,7 @@
     "MENU_LEARN_MYBULKIMPORTS": "Mes importations en masse",
     "MENU_LEARN_MYPROJECTS": "Mes projets",
     "MENU_SEARCH_ENCOUNTERS": "Rencontres",
+    "MENU_SEARCH_ENCOUNTERS_CLASSIC": "Rencontres (classique)",
     "MENU_SEARCH_INDIVIDUALS": "Individus",
     "MENU_SEARCH_SIGHTINGS": "Observations",
     "MENU_ANIMALS_INDIVIDUALGALLERY": "Galerie individuelle",
diff --git a/frontend/src/locale/it.json b/frontend/src/locale/it.json
index 3cbfa33cd8..0b10762751 100644
--- a/frontend/src/locale/it.json
+++ b/frontend/src/locale/it.json
@@ -30,6 +30,7 @@
     "MENU_LEARN_MYBULKIMPORTS": "Le mie importazioni in massa",
     "MENU_LEARN_MYPROJECTS": "I miei progetti",
     "MENU_SEARCH_ENCOUNTERS": "Incontri",
+    "MENU_SEARCH_ENCOUNTERS_CLASSIC": "Incontri (Classico)",
     "MENU_SEARCH_INDIVIDUALS": "Individui",
     "MENU_SEARCH_SIGHTINGS": "Avvistamenti",
     "MENU_ANIMALS_INDIVIDUALGALLERY": "Galleria individuale",
diff --git a/src/main/resources/bundles/de/header.properties b/src/main/resources/bundles/de/header.properties
index c4926bac94..eb768df8cc 100755
--- a/src/main/resources/bundles/de/header.properties
+++ b/src/main/resources/bundles/de/header.properties
@@ -11,6 +11,7 @@ reportClassic = Eine Begegnung melden (Klassisch)
 individuals = Einzelpersonen
 viewAll = Alle anzeigen
 encounters = Begegnungen
+encountersClassic = Begegnungen (Klassisch)
 viewEncounters = Begegnungen anzeigen
 viewImages = Bilder anzeigen
 encounterCalendar = Begegnungskalender
diff --git a/src/main/resources/bundles/en/header.properties b/src/main/resources/bundles/en/header.properties
index 37c7ac7ad9..5f2f0ebb93 100755
--- a/src/main/resources/bundles/en/header.properties
+++ b/src/main/resources/bundles/en/header.properties
@@ -11,6 +11,7 @@ reportClassic = Report an encounter (Classic)
 individuals = Individuals
 viewAll = View All
 encounters = Encounters
+encountersClassic = Encounters (Classic)
 viewEncounters = View Encounters
 viewImages = View Images
 encounterCalendar = Encounter Calendar
diff --git a/src/main/resources/bundles/es/header.properties b/src/main/resources/bundles/es/header.properties
index 2434443002..34bfb568cf 100755
--- a/src/main/resources/bundles/es/header.properties
+++ b/src/main/resources/bundles/es/header.properties
@@ -11,6 +11,7 @@ reportClassic = Informar un encuentro (Cl\u00e1sico)
 individuals = Individuos
 viewAll = Ver todos
 encounters = Encuentros
+encountersClassic = Encuentros (Cl\u00e1sico)
 viewEncounters = Ver Encuentros
 viewImages = Ver Im\u00e1genes
 encounterCalendar = Encuentro Calendario
diff --git a/src/main/resources/bundles/fr/header.properties b/src/main/resources/bundles/fr/header.properties
index a6c54ed594..a45ee51abd 100644
--- a/src/main/resources/bundles/fr/header.properties
+++ b/src/main/resources/bundles/fr/header.properties
@@ -11,6 +11,7 @@ reportClassic = Signaler une rencontre (Classique)
 individuals = Individus
 viewAll = Tout voir
 encounters = Rencontres
+encountersClassic = Rencontres (Classique)
 viewEncounters = Voir toutes les rencontres
 viewImages = Voir les images
 encounterCalendar = Calendrier de rencontres
diff --git a/src/main/resources/bundles/it/header.properties b/src/main/resources/bundles/it/header.properties
index aaa2b4f714..6a74703921 100644
--- a/src/main/resources/bundles/it/header.properties
+++ b/src/main/resources/bundles/it/header.properties
@@ -11,6 +11,7 @@ reportClassic = Segnala un incontro (Classico)
 individuals = Gli esemplari
 viewAll = Guarda tutto
 encounters = Incontri
+encountersClassic = Incontri (Classico)
 viewEncounters = Visualizza Incontri
 viewImages = Visualizza le immagini
 encounterCalendar = Calendario degli incontri
diff --git a/src/main/webapp/header.jsp b/src/main/webapp/header.jsp
index f6d5b4ff14..761682fb76 100755
--- a/src/main/webapp/header.jsp
+++ b/src/main/webapp/header.jsp
@@ -490,7 +490,7 @@ if(request.getUserPrincipal()!=null){
                         <ul class="dropdown-menu" role="menu">
                           <li><a href="<%=urlLoc %>/react/encounter-search"><%=props.getProperty("encounters")%></a></li>
 <% if (Util.booleanNotFalse(CommonConfiguration.getProperty("showClassicEncouners", context))) { %>
-                            <li><a href="<%=urlLoc %>/encounters/encounerSearch.jsp" ><%=props.getProperty("encounters")%></a></li>
+                            <li><a href="<%=urlLoc %>/encounters/encounterSearch.jsp" ><%=props.getProperty("encountersClassic")%></a></li>
 <% } %>
                           <li><a href="<%=urlLoc %>/individualSearch.jsp"><%=props.getProperty("individuals")%></a></li>
                           <li><a href="<%=urlLoc %>/occurrenceSearch.jsp"><%=props.getProperty("sightings")%></a></li>

From 5cf54c3363269a16608c1281343bd80c162164ea Mon Sep 17 00:00:00 2001
From: erinz2020 <erinz2020@gmail.com>
Date: Fri, 13 Dec 2024 20:26:12 +0000
Subject: [PATCH 3/7] update copy

---
 frontend/src/locale/de.json                     | 2 +-
 frontend/src/locale/en.json                     | 2 +-
 frontend/src/locale/es.json                     | 2 +-
 frontend/src/locale/fr.json                     | 2 +-
 frontend/src/locale/it.json                     | 2 +-
 src/main/resources/bundles/de/header.properties | 2 +-
 src/main/resources/bundles/en/header.properties | 2 +-
 src/main/resources/bundles/es/header.properties | 2 +-
 src/main/resources/bundles/fr/header.properties | 2 +-
 src/main/resources/bundles/it/header.properties | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frontend/src/locale/de.json b/frontend/src/locale/de.json
index 91da3ec308..ea1e7725e9 100644
--- a/frontend/src/locale/de.json
+++ b/frontend/src/locale/de.json
@@ -30,7 +30,7 @@
     "MENU_LEARN_MYBULKIMPORTS": "Meine Bulk-Importe",
     "MENU_LEARN_MYPROJECTS": "Meine Projekte",
     "MENU_SEARCH_ENCOUNTERS": "Begegnungen",
-    "MENU_SEARCH_ENCOUNTERS_CLASSIC": "Begegnungen (klassisch)",
+    "MENU_SEARCH_ENCOUNTERS_CLASSIC": "Begegnungssuche (Klassisch)",
     "MENU_SEARCH_INDIVIDUALS": "Individuen",
     "MENU_SEARCH_SIGHTINGS": "Sichtungen",
     "MENU_ANIMALS_INDIVIDUALGALLERY": "Individuelle Galerie",
diff --git a/frontend/src/locale/en.json b/frontend/src/locale/en.json
index 4ad7d7dbe0..d51f233bb7 100644
--- a/frontend/src/locale/en.json
+++ b/frontend/src/locale/en.json
@@ -30,7 +30,7 @@
     "MENU_LEARN_MYBULKIMPORTS": "My Bulk Imports",
     "MENU_LEARN_MYPROJECTS": "My Projects",
     "MENU_SEARCH_ENCOUNTERS": "Encounters",
-    "MENU_SEARCH_ENCOUNTERS_CLASSIC": "Encounters (Classic)",
+    "MENU_SEARCH_ENCOUNTERS_CLASSIC": "Encounter Search (Classic)",
     "MENU_SEARCH_INDIVIDUALS": "Individuals",
     "MENU_SEARCH_SIGHTINGS": "Sightings",
     "MENU_ANIMALS_INDIVIDUALGALLERY": "Individual Gallery",
diff --git a/frontend/src/locale/es.json b/frontend/src/locale/es.json
index 792e828b03..d8519fc4eb 100644
--- a/frontend/src/locale/es.json
+++ b/frontend/src/locale/es.json
@@ -30,7 +30,7 @@
     "MENU_LEARN_MYBULKIMPORTS": "Mis importaciones masivas",
     "MENU_LEARN_MYPROJECTS": "Mis proyectos",
     "MENU_SEARCH_ENCOUNTERS": "Encuentros",
-    "MENU_SEARCH_ENCOUNTERS_CLASSIC": "Encuentros (clásico)",
+    "MENU_SEARCH_ENCOUNTERS_CLASSIC": "Búsqueda de Encuentros (Clásico)",
     "MENU_SEARCH_INDIVIDUALS": "Individuos",
     "MENU_SEARCH_SIGHTINGS": "Avistamientos",
     "MENU_ANIMALS_INDIVIDUALGALLERY": "Galería de individuos",
diff --git a/frontend/src/locale/fr.json b/frontend/src/locale/fr.json
index 86ad46c325..6e60f9e960 100644
--- a/frontend/src/locale/fr.json
+++ b/frontend/src/locale/fr.json
@@ -30,7 +30,7 @@
     "MENU_LEARN_MYBULKIMPORTS": "Mes importations en masse",
     "MENU_LEARN_MYPROJECTS": "Mes projets",
     "MENU_SEARCH_ENCOUNTERS": "Rencontres",
-    "MENU_SEARCH_ENCOUNTERS_CLASSIC": "Rencontres (classique)",
+    "MENU_SEARCH_ENCOUNTERS_CLASSIC": "Recherche de Rencontres (Classique)",
     "MENU_SEARCH_INDIVIDUALS": "Individus",
     "MENU_SEARCH_SIGHTINGS": "Observations",
     "MENU_ANIMALS_INDIVIDUALGALLERY": "Galerie individuelle",
diff --git a/frontend/src/locale/it.json b/frontend/src/locale/it.json
index 0b10762751..d0408d387e 100644
--- a/frontend/src/locale/it.json
+++ b/frontend/src/locale/it.json
@@ -30,7 +30,7 @@
     "MENU_LEARN_MYBULKIMPORTS": "Le mie importazioni in massa",
     "MENU_LEARN_MYPROJECTS": "I miei progetti",
     "MENU_SEARCH_ENCOUNTERS": "Incontri",
-    "MENU_SEARCH_ENCOUNTERS_CLASSIC": "Incontri (Classico)",
+    "MENU_SEARCH_ENCOUNTERS_CLASSIC": "Ricerca di Incontri (Classico)",
     "MENU_SEARCH_INDIVIDUALS": "Individui",
     "MENU_SEARCH_SIGHTINGS": "Avvistamenti",
     "MENU_ANIMALS_INDIVIDUALGALLERY": "Galleria individuale",
diff --git a/src/main/resources/bundles/de/header.properties b/src/main/resources/bundles/de/header.properties
index eb768df8cc..02785aa390 100755
--- a/src/main/resources/bundles/de/header.properties
+++ b/src/main/resources/bundles/de/header.properties
@@ -11,7 +11,7 @@ reportClassic = Eine Begegnung melden (Klassisch)
 individuals = Einzelpersonen
 viewAll = Alle anzeigen
 encounters = Begegnungen
-encountersClassic = Begegnungen (Klassisch)
+encountersClassic = Begegnungssuche (Klassisch)
 viewEncounters = Begegnungen anzeigen
 viewImages = Bilder anzeigen
 encounterCalendar = Begegnungskalender
diff --git a/src/main/resources/bundles/en/header.properties b/src/main/resources/bundles/en/header.properties
index 5f2f0ebb93..a750de7d7d 100755
--- a/src/main/resources/bundles/en/header.properties
+++ b/src/main/resources/bundles/en/header.properties
@@ -11,7 +11,7 @@ reportClassic = Report an encounter (Classic)
 individuals = Individuals
 viewAll = View All
 encounters = Encounters
-encountersClassic = Encounters (Classic)
+encountersClassic = Encounter Search (Classic)
 viewEncounters = View Encounters
 viewImages = View Images
 encounterCalendar = Encounter Calendar
diff --git a/src/main/resources/bundles/es/header.properties b/src/main/resources/bundles/es/header.properties
index 34bfb568cf..137e648d71 100755
--- a/src/main/resources/bundles/es/header.properties
+++ b/src/main/resources/bundles/es/header.properties
@@ -11,7 +11,7 @@ reportClassic = Informar un encuentro (Cl\u00e1sico)
 individuals = Individuos
 viewAll = Ver todos
 encounters = Encuentros
-encountersClassic = Encuentros (Cl\u00e1sico)
+encountersClassic = Búsqueda de Encuentros (Cl\u00e1sico)
 viewEncounters = Ver Encuentros
 viewImages = Ver Im\u00e1genes
 encounterCalendar = Encuentro Calendario
diff --git a/src/main/resources/bundles/fr/header.properties b/src/main/resources/bundles/fr/header.properties
index a45ee51abd..1484ecbe0d 100644
--- a/src/main/resources/bundles/fr/header.properties
+++ b/src/main/resources/bundles/fr/header.properties
@@ -11,7 +11,7 @@ reportClassic = Signaler une rencontre (Classique)
 individuals = Individus
 viewAll = Tout voir
 encounters = Rencontres
-encountersClassic = Rencontres (Classique)
+encountersClassic = Recherche de Rencontres (Classique)
 viewEncounters = Voir toutes les rencontres
 viewImages = Voir les images
 encounterCalendar = Calendrier de rencontres
diff --git a/src/main/resources/bundles/it/header.properties b/src/main/resources/bundles/it/header.properties
index 6a74703921..f436668ff8 100644
--- a/src/main/resources/bundles/it/header.properties
+++ b/src/main/resources/bundles/it/header.properties
@@ -11,7 +11,7 @@ reportClassic = Segnala un incontro (Classico)
 individuals = Gli esemplari
 viewAll = Guarda tutto
 encounters = Incontri
-encountersClassic = Incontri (Classico)
+encountersClassic = Ricerca di Incontri (Classico)
 viewEncounters = Visualizza Incontri
 viewImages = Visualizza le immagini
 encounterCalendar = Calendario degli incontri

From 6097bb9a8a81546e7d7c5f52ef9a0a6a5e4c418f Mon Sep 17 00:00:00 2001
From: erinz2020 <erinz2020@gmail.com>
Date: Fri, 13 Dec 2024 20:32:22 +0000
Subject: [PATCH 4/7] remove log

---
 frontend/src/components/header/Menu.jsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/src/components/header/Menu.jsx b/frontend/src/components/header/Menu.jsx
index 9a6ad2a616..f7af3eaed6 100644
--- a/frontend/src/components/header/Menu.jsx
+++ b/frontend/src/components/header/Menu.jsx
@@ -15,8 +15,6 @@ export default function Menu({
   const [dropdownShows, setDropdownShows] = useState({});
   const [dropdownBorder, setDropdownBorder] = useState("2px solid transparent");
 
-  console.log("showClassicEncounterSearch", showClassicEncounterSearch);
-
   const handleMouseEnterLeave = (id, isEnter) => {
     setDropdownShows((prev) => ({ ...prev, [id]: isEnter ? true : false }));
     setDropdownBorder((prev) => ({

From b4c51eddcbc2d3ac494245c822b212c401f7c524 Mon Sep 17 00:00:00 2001
From: erinz2020 <erinz2020@gmail.com>
Date: Fri, 13 Dec 2024 21:04:04 +0000
Subject: [PATCH 5/7] fix typo

---
 frontend/src/FrontDesk.jsx                                | 3 +--
 src/main/java/org/ecocean/api/SiteSettings.java           | 4 ++--
 src/main/resources/bundles/commonConfiguration.properties | 2 +-
 src/main/webapp/header.jsp                                | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/frontend/src/FrontDesk.jsx b/frontend/src/FrontDesk.jsx
index ef4f3af45d..828b832dd9 100644
--- a/frontend/src/FrontDesk.jsx
+++ b/frontend/src/FrontDesk.jsx
@@ -28,8 +28,7 @@ export default function FrontDesk() {
   const [loading, setLoading] = useState(true);
   const { data } = useGetSiteSettings();
   const showclassicsubmit = data?.showClassicSubmit;
-  const showClassicEncounterSearch = data?.showClassicEncouners;
-
+  const showClassicEncounterSearch = data?.showClassicEncounters;
   const checkLoginStatus = () => {
     axios
       .head("/api/v3/user")
diff --git a/src/main/java/org/ecocean/api/SiteSettings.java b/src/main/java/org/ecocean/api/SiteSettings.java
index 76b9124bb6..898e612eb5 100644
--- a/src/main/java/org/ecocean/api/SiteSettings.java
+++ b/src/main/java/org/ecocean/api/SiteSettings.java
@@ -163,8 +163,8 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
             Util.booleanNotFalse(CommonConfiguration.getProperty("showClassicSubmit", context))
             );
         
-        settings.put("showClassicEncouners",
-            Util.booleanNotFalse(CommonConfiguration.getProperty("showClassicEncouners", context))
+        settings.put("showClassicEncounters",
+            Util.booleanNotFalse(CommonConfiguration.getProperty("showClassicEncounters", context))
             );
 
         Properties recaptchaProps = ShepherdProperties.getProperties("recaptcha.properties", "",
diff --git a/src/main/resources/bundles/commonConfiguration.properties b/src/main/resources/bundles/commonConfiguration.properties
index 9d44d1b013..e72ea45da2 100755
--- a/src/main/resources/bundles/commonConfiguration.properties
+++ b/src/main/resources/bundles/commonConfiguration.properties
@@ -109,7 +109,7 @@ showTaxonomy = true
 showClassicSubmit = true
 
 # show option for "classic" encounter search page in UI
-showClassicEncouners = true
+showClassicEncounters = true
 
 #for multi-species libraries, fill out the genus and species for each supported animal type, starting with genusSpecies0
 genusSpecies0 = Balaenoptera acutorostrata
diff --git a/src/main/webapp/header.jsp b/src/main/webapp/header.jsp
index 761682fb76..2089488891 100755
--- a/src/main/webapp/header.jsp
+++ b/src/main/webapp/header.jsp
@@ -489,7 +489,7 @@ if(request.getUserPrincipal()!=null){
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><%=props.getProperty("search")%><span class="svg-placeholder"></span> </a>
                         <ul class="dropdown-menu" role="menu">
                           <li><a href="<%=urlLoc %>/react/encounter-search"><%=props.getProperty("encounters")%></a></li>
-<% if (Util.booleanNotFalse(CommonConfiguration.getProperty("showClassicEncouners", context))) { %>
+<% if (Util.booleanNotFalse(CommonConfiguration.getProperty("showClassicEncounters", context))) { %>
                             <li><a href="<%=urlLoc %>/encounters/encounterSearch.jsp" ><%=props.getProperty("encountersClassic")%></a></li>
 <% } %>
                           <li><a href="<%=urlLoc %>/individualSearch.jsp"><%=props.getProperty("individuals")%></a></li>

From 0406f524c19aaf40efa4ae6eda15d16ba771ab50 Mon Sep 17 00:00:00 2001
From: erinz2020 <erinz2020@gmail.com>
Date: Fri, 13 Dec 2024 21:10:09 +0000
Subject: [PATCH 6/7] super weird, I definitely have updated this file

---
 src/main/resources/servletResponseTemplate.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/servletResponseTemplate.htm b/src/main/resources/servletResponseTemplate.htm
index cf53b85680..dd48ea673c 100755
--- a/src/main/resources/servletResponseTemplate.htm
+++ b/src/main/resources/servletResponseTemplate.htm
@@ -122,7 +122,7 @@
                 </a>
                 <ul class="dropdown-menu" role="menu">
                   <li><a href="/react/encounter-search">Encounters</a></li>
-
+                  <li><a href="encounters/encounterSearch.jsp">Encounters (Classic)</a></li>
                   <li><a href="individualSearch.jsp">Individuals</a></li>
                   <li><a href="occurrenceSearch.jsp">Sightings</a></li>
 

From 879122d97ae8d1e8cdbae28145b172427fd6afdb Mon Sep 17 00:00:00 2001
From: erinz2020 <erinz2020@gmail.com>
Date: Fri, 13 Dec 2024 21:10:59 +0000
Subject: [PATCH 7/7] oops, wrong copy

---
 src/main/resources/servletResponseTemplate.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/servletResponseTemplate.htm b/src/main/resources/servletResponseTemplate.htm
index dd48ea673c..f0322bdc1e 100755
--- a/src/main/resources/servletResponseTemplate.htm
+++ b/src/main/resources/servletResponseTemplate.htm
@@ -122,7 +122,7 @@
                 </a>
                 <ul class="dropdown-menu" role="menu">
                   <li><a href="/react/encounter-search">Encounters</a></li>
-                  <li><a href="encounters/encounterSearch.jsp">Encounters (Classic)</a></li>
+                  <li><a href="encounters/encounterSearch.jsp">Encounter Search (Classic)</a></li>
                   <li><a href="individualSearch.jsp">Individuals</a></li>
                   <li><a href="occurrenceSearch.jsp">Sightings</a></li>