From ca69870d9186b4043bb13bcf26c7faf245dd27f7 Mon Sep 17 00:00:00 2001 From: erinz2020 Date: Fri, 17 May 2024 19:42:55 +0000 Subject: [PATCH 01/14] change background color --- src/main/webapp/css/header.css | 4 ++++ src/main/webapp/header.jsp | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 src/main/webapp/css/header.css diff --git a/src/main/webapp/css/header.css b/src/main/webapp/css/header.css new file mode 100644 index 0000000000..a17be29d2b --- /dev/null +++ b/src/main/webapp/css/header.css @@ -0,0 +1,4 @@ + +.navbar .dropdown-menu { + font-size: 24px; /* Set font size to 24px */ + } \ No newline at end of file diff --git a/src/main/webapp/header.jsp b/src/main/webapp/header.jsp index 160e36a3b9..75038b0e88 100755 --- a/src/main/webapp/header.jsp +++ b/src/main/webapp/header.jsp @@ -138,6 +138,8 @@ if(request.getUserPrincipal()!=null){ href="<%=CommonConfiguration.getHTMLShortcutIcon(context) %>"/> + + <% if (indocetUser) { @@ -147,9 +149,7 @@ if(request.getUserPrincipal()!=null){ - - - + <% if((CommonConfiguration.getProperty("allowSocialMediaLogin", context)!=null)&&(CommonConfiguration.getProperty("allowSocialMediaLogin", context).equals("true"))){ %> @@ -554,7 +554,7 @@ if(request.getUserPrincipal()!=null){ -
+
+
--%> + + + + +
    <% - if(user != null && !loggingOut){ - try { - String fullname=request.getUserPrincipal().toString(); + if(user != null && !loggingOut){ + try { + String fullname=request.getUserPrincipal().toString(); if (user.getFullName()!=null) fullname=user.getFullName(); - %> + %> -
  • " style="border-radius: 3px;border:1px solid #ffffff;margin-top: -7px;" width="*" height="32px" src="<%=profilePhotoURL %>" />
    • -
  • <%=props.getProperty("logout") %>
    • +
  • " style="border-radius: 3px;border:1px solid #ffffff;margin-top: -7px;" width="*" height="32px" src="<%=profilePhotoURL %>" />
    • +
  • <%=props.getProperty("logout") %>
    • - <% - } - catch(Exception e){e.printStackTrace();} - } - else{ - %> + <% + } + catch(Exception e){e.printStackTrace();} + } + else{ + %>
  • <%= props.getProperty("login") %>
    • - <% - } + <% + } %> @@ -418,7 +580,7 @@ if(request.getUserPrincipal()!=null){ - List contextNames=ContextConfiguration.getContextNames(); + List contextNames=ContextConfiguration.getContextNames(); int numContexts=contextNames.size(); if(numContexts>1){ %> @@ -471,7 +633,47 @@ if(request.getUserPrincipal()!=null){ if(numSupportedLanguages>1){ %> -
  • +
  • 123
    • +
  • + +
    • + <%--
  • <% @@ -505,7 +707,7 @@ if(request.getUserPrincipal()!=null){ } %> -
    • + --%> <% } %> @@ -516,7 +718,7 @@ if(request.getUserPrincipal()!=null){
- +<%-- - --%> - - - <%--
- -
--%>
<% if(user != null && !loggingOut){ try { String fullname=request.getUserPrincipal().toString(); if (user.getFullName()!=null) fullname=user.getFullName(); - - %> - - - -
+
    @@ -811,119 +675,21 @@ if(request.getUserPrincipal()!=null){
- - - <% } catch(Exception e){e.printStackTrace();} } else{ %> - <%= props.getProperty("login") %> <% } %> -
- -
- - +
+
- - From 4e7ee891f061117df0180aaa63f3429a5429ee03 Mon Sep 17 00:00:00 2001 From: erinz2020 Date: Mon, 10 Jun 2024 17:06:11 +0000 Subject: [PATCH 11/14] linting? --- src/main/java/org/ecocean/servlet/ServletUtilities.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/ecocean/servlet/ServletUtilities.java b/src/main/java/org/ecocean/servlet/ServletUtilities.java index 880abda4c0..e695ddab36 100644 --- a/src/main/java/org/ecocean/servlet/ServletUtilities.java +++ b/src/main/java/org/ecocean/servlet/ServletUtilities.java @@ -71,7 +71,6 @@ public static String getHeader(HttpServletRequest request) { // we use this arg bc we can only log out *after* including the header on // logout.jsp. this way we can still show the logged-out view in the header boolean loggingOut = Util.requestHasVal(request, "loggedOut"); - String notifications = ""; // check if user is logged in and has pending notifications if (request.getUserPrincipal() != null) { From 2eb505f9f377ecf7c54cf1e39cad19a3cda6750c Mon Sep 17 00:00:00 2001 From: erinz2020 Date: Mon, 10 Jun 2024 19:49:40 +0000 Subject: [PATCH 12/14] update sitename --- frontend/src/components/svg/Logo.jsx | 13 +- .../org/ecocean/servlet/ServletUtilities.java | 38 +++- .../resources/servletResponseTemplate.htm | 179 +++--------------- .../mantamatcher/img/flukebook_logo_white.svg | 97 ---------- 4 files changed, 70 insertions(+), 257 deletions(-) diff --git a/frontend/src/components/svg/Logo.jsx b/frontend/src/components/svg/Logo.jsx index 3790423736..f53b335da0 100644 --- a/frontend/src/components/svg/Logo.jsx +++ b/frontend/src/components/svg/Logo.jsx @@ -2,10 +2,17 @@ import React from "react"; export default function Logo({ style }) { return ( -
+
"); } String languageString = htmlBuilder.toString(); - String siteName = props.getProperty("siteName"); - System.out.println("sitename: " + siteName); - System.out.println("username: " + username); - + try { FileReader fileReader = new FileReader(findResourceOnFileSystem( "servletResponseTemplate.htm")); @@ -148,15 +168,15 @@ public static String getHeader(HttpServletRequest request) { buffread.close(); templateFile = SBreader.toString(); - String context1 = getContext(request); + String templateContext = getContext(request); // process the CSS string templateFile = templateFile.replaceAll("CSSURL", - CommonConfiguration.getCSSURLLocation(request, context1)); + CommonConfiguration.getCSSURLLocation(request, templateContext)); // set the top header graphic templateFile = templateFile.replaceAll("TOPGRAPHIC", - CommonConfiguration.getURLToMastheadGraphic(context1)); + CommonConfiguration.getURLToMastheadGraphic(templateContext)); templateFile = templateFile.replaceAll("SITE_NAME", siteName); templateFile = templateFile.replaceAll("USER_NAME", username); diff --git a/src/main/resources/servletResponseTemplate.htm b/src/main/resources/servletResponseTemplate.htm index 562db98752..9bdf0549f8 100755 --- a/src/main/resources/servletResponseTemplate.htm +++ b/src/main/resources/servletResponseTemplate.htm @@ -153,87 +153,48 @@
  • Software Documentation
  • Data Integrity
  • Bulk Import Logs
    • - - - -
    - - - + document.querySelectorAll('.navbar .dropdown').forEach(function (dropdown) { + dropdown.addEventListener('mouseenter', function () { + var dropdownMenu = this.querySelector('.dropdown-menu'); + if (dropdownMenu) { + dropdownMenu.style.display = 'block'; + setTimeout(function () { + dropdownMenu.style.opacity = 1; + }, 250); + } + }); - - + + @@ -320,53 +266,6 @@
    - - - -
    @@ -406,22 +305,6 @@

    Action results

    -
    diff --git a/src/main/webapp/cust/mantamatcher/img/flukebook_logo_white.svg b/src/main/webapp/cust/mantamatcher/img/flukebook_logo_white.svg index 757f2f8935..628e922fe2 100644 --- a/src/main/webapp/cust/mantamatcher/img/flukebook_logo_white.svg +++ b/src/main/webapp/cust/mantamatcher/img/flukebook_logo_white.svg @@ -1,103 +1,6 @@ - - - From f724db780d4bbfc1795af51443e114bd8e8dc949 Mon Sep 17 00:00:00 2001 From: erinz2020 Date: Mon, 10 Jun 2024 19:57:59 +0000 Subject: [PATCH 13/14] exception handling for siteName --- .../org/ecocean/servlet/ServletUtilities.java | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/ecocean/servlet/ServletUtilities.java b/src/main/java/org/ecocean/servlet/ServletUtilities.java index e83fd5ce7d..cdb402b41e 100644 --- a/src/main/java/org/ecocean/servlet/ServletUtilities.java +++ b/src/main/java/org/ecocean/servlet/ServletUtilities.java @@ -44,16 +44,16 @@ import javax.servlet.http.Cookie; import org.apache.commons.lang3.StringEscapeUtils; -import org.ecocean.ShepherdProperties; +import org.apache.commons.text.WordUtils; import org.ecocean.CommonConfiguration; -import org.ecocean.Shepherd; -import org.ecocean.Util; +import org.ecocean.ContextConfiguration; import org.ecocean.Organization; +import org.ecocean.servlet.ServletUtilities; +import org.ecocean.Shepherd; +import org.ecocean.ShepherdProperties; import org.ecocean.User; -import org.ecocean.ContextConfiguration; +import org.ecocean.Util; import org.slf4j.Logger; -import org.apache.commons.text.WordUtils; -import org.ecocean.servlet.ServletUtilities; import org.slf4j.LoggerFactory; public class ServletUtilities { @@ -64,24 +64,21 @@ public static String getHeader(HttpServletRequest request) { String langCode = ServletUtilities.getLanguageCode(request); Properties props = new Properties(); props = ShepherdProperties.getProperties("header.properties", langCode, context); - System.out.println("props" + props); + // System.out.println("props" + props); String urlLoc = "//" + CommonConfiguration.getURLLocation(request); String pageTitle = (String)request.getAttribute("pageTitle"); // allows custom override from calling jsp (must - - String siteName = "wildbook"; + String siteName = "wildbook"; try { - System.out.println("getting site name "); + // System.out.println("getting site name "); String name = props.getProperty("siteName"); - System.out.println("site name is " + name); - if(name != null) { + // System.out.println("site name is " + name); + if (name != null) { siteName = name; } } catch (Exception e) { System.out.println("Failed to get siteName property from props:"); e.printStackTrace(); } - - // set BEFORE include:header) if (pageTitle == null) { pageTitle = CommonConfiguration.getHTMLTitle(context); @@ -112,7 +109,6 @@ public static String getHeader(HttpServletRequest request) { } } } catch (Exception e) { - System.out.println("Exception on indocetCheck in header.jsp:"); e.printStackTrace(); myShepherd.closeDBTransaction(); } finally { @@ -154,7 +150,7 @@ public static String getHeader(HttpServletRequest request) { .append("
    "); } String languageString = htmlBuilder.toString(); - + try { FileReader fileReader = new FileReader(findResourceOnFileSystem( "servletResponseTemplate.htm")); From f4612f9f0c2bbf7df73c768d6c8a8cb91f649929 Mon Sep 17 00:00:00 2001 From: erinz2020 Date: Mon, 10 Jun 2024 20:49:51 +0000 Subject: [PATCH 14/14] update all property files --- src/main/resources/bundles/es/header.properties | 2 +- src/main/resources/bundles/fr/header.properties | 2 +- src/main/resources/bundles/it/header.properties | 2 +- src/main/webapp/header.jsp | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/resources/bundles/es/header.properties b/src/main/resources/bundles/es/header.properties index f435bd35eb..7fbfaf53c4 100755 --- a/src/main/resources/bundles/es/header.properties +++ b/src/main/resources/bundles/es/header.properties @@ -1,4 +1,4 @@ - +siteName = Flukebook manageUsers = Administrar mis cuentas searchPlaceholder = Apodo, id, sitio, encuentro... home = Inicio diff --git a/src/main/resources/bundles/fr/header.properties b/src/main/resources/bundles/fr/header.properties index 7aa48fb538..e22fd3c543 100644 --- a/src/main/resources/bundles/fr/header.properties +++ b/src/main/resources/bundles/fr/header.properties @@ -1,4 +1,4 @@ - +siteName = Flukebook manageUsers = Gérer mes comptes searchPlaceholder = surnom, id, site, rencontre, n\u00b0, etc. home = Accueil diff --git a/src/main/resources/bundles/it/header.properties b/src/main/resources/bundles/it/header.properties index f7935c3389..9cd0339a96 100644 --- a/src/main/resources/bundles/it/header.properties +++ b/src/main/resources/bundles/it/header.properties @@ -1,4 +1,4 @@ - +siteName = Flukebook searchPlaceholder = nickname, id, sito, nr. incontro, ecc. home = home learn = scopri diff --git a/src/main/webapp/header.jsp b/src/main/webapp/header.jsp index e56cdc2f7e..37462d0438 100755 --- a/src/main/webapp/header.jsp +++ b/src/main/webapp/header.jsp @@ -419,7 +419,8 @@ if(request.getUserPrincipal()!=null){ Logo - <%=props.getProperty("siteName")%> + <%-- <%=props.getProperty("siteName")%> --%> + <%= props.getProperty("siteName") != null ? props.getProperty("siteName") : "Wildbook" %>