From d3a75ed402f6ee660d9cd7233b896cd44c5a0ce6 Mon Sep 17 00:00:00 2001 From: Jon Van Oast Date: Wed, 25 Sep 2024 12:56:19 -0600 Subject: [PATCH 01/20] web.xml --- src/main/webapp/WEB-INF/web.xml | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 82b8f5729d..7a5914bdbd 100755 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -252,11 +252,6 @@ /EncounterAddImage = authc, roles[researcher] /KeywordHandler = authc, roles[researcher] - /AdoptionAction = authc, roles[admin] - /AdoptionForm = authc, roles[admin] - /DeleteAdoption = authc, roles[admin] - /ResurrectDeletedAdoption = authc, roles[admin] - /EncounterSetState = authc, roles[researcher] /EncounterDelete = authc, roles[researcher] @@ -370,7 +365,6 @@ /EncounterSetLocation = authc, roles[researcher] /EncounterSetLocationID = authc, roles[researcher] /CRCExportReport = authc, roles[researcher] - /DeleteAdoption = authc, roles[adoption] /IndividualSetSex = authc, roles[researcher] /EncounterSetSex = authc, roles[researcher] @@ -458,9 +452,6 @@ /iaResultsSetID.jsp = authc, roles[researcher] - /adoptions/** = authc, roles[admin] - /AdoptionAction = authc, roles[admin] - /TranslationsGet = authc /ImportIA = authc, roles[researcher] /UpdateStandard = authc, roles[researcher] @@ -475,8 +466,6 @@ /GetCurrentIAInfo = authc /error_generic.jsp = authc /myCollabLog.jsp = authc - /adoptions/allAdoptions.jsp = authc, roles[admin] - /adoptions/editSuccess.jsp = authc, roles[admin] /submitSurvey.jsp = authc, roles[researcher] /dl.jsp = authc /projects/editProject.jsp = authc, roles[researcher] @@ -971,11 +960,6 @@ org.ecocean.servlet.EncounterAddSpotFile - - AdoptionAction - org.ecocean.servlet.AdoptionAction - - ResumableUpload @@ -1387,11 +1371,6 @@ --> - - DeleteAdoption - org.ecocean.servlet.DeleteAdoption - - MassSetLocationCodeFromLocationString org.ecocean.servlet.MassSetLocationCodeFromLocationString @@ -2632,16 +2611,6 @@ - - DeleteAdoption - /DeleteAdoption - - - - AdoptionAction - /AdoptionAction - - - - - -
- <% - List adoptions = adoptShepherd.getAllAdoptionsForMarkedIndividual(name,context); - int numAdoptions = adoptions.size(); - int ia = 0; - for (ia = 0; ia < numAdoptions; ia++) { - Adoption ad = adoptions.get(ia); - %> -
- - - - - - - <% - if ((ad.getAdopterImage() != null) && (!ad.getAdopterImage().trim().equals(""))) { - %> - - - - <% - } - %> - - - - - - - - - <% - if ((ad.getAdopterQuote() != null) && (!ad.getAdopterQuote().trim().equals(""))) { - %> - - - - - - <% - } - - if (request.getUserPrincipal()!=null) { - %> - - - - - - - - - - - - - - - - - - - - - - <% - } - %> - - - - <% - if (ia > 0) { - %> - - - - - - - <% - } - %> -
-
-
-
<%=ad.getAdopterName()%> -
-
 
"<%=ad.getAdopterQuote()%>"
 
Adoption type:
<%=ad.getAdoptionType()%> -
Adoption start:
<%=ad.getAdoptionStartDate()%> -
Adoption end:
<%=ad.getAdoptionEndDate()%> -
 
[edit - this adoption]
 
 
-
- - <% - } -%> -
-
- -
-

 

- - -<% - } - catch (Exception e) { - } - adoptShepherd.rollbackDBTransaction(); - adoptShepherd.closeDBTransaction(); - adoptShepherd = null; - -%> diff --git a/src/main/webapp/individuals.jsp b/src/main/webapp/individuals.jsp index beec69adba..ba0828e776 100755 --- a/src/main/webapp/individuals.jsp +++ b/src/main/webapp/individuals.jsp @@ -498,12 +498,6 @@ $(document).ready(function() { %>

<%=myNickname%> - <% - if(CommonConfiguration.allowAdoptions(context)){ - %> - - <% - } if (isOwner && CommonConfiguration.isCatalogEditable(context)) {%>
@@ -521,12 +515,6 @@ $(document).ready(function() { %>

<%=markedIndividualTypeCaps%> <%=sharky.getDisplayName(request, myShepherd)%> <% - if(CommonConfiguration.allowAdoptions(context)){ - %> - - <% - } if (isOwner && CommonConfiguration.isCatalogEditable(context)) {%>
@@ -2406,24 +2394,6 @@ if (sharky.getNames() != null) { %> - <%-- Start Adoption --%> - <% - if (CommonConfiguration.allowAdoptions(context)) { - %> - -

<%=props.getProperty("meetAdopters") %>

-
- - - - -
- - <% - } - %> - <%-- End Adoption --%> -
<%-- Start Collaborators --%>
From 55ec9c513b850aca5d5b9efd1ef234ee2668157b Mon Sep 17 00:00:00 2001 From: Jon Van Oast Date: Thu, 26 Sep 2024 11:45:16 -0600 Subject: [PATCH 11/20] encounterAdoptionEmbed removal --- src/main/webapp/encounters/encounter.jsp | 40 ---- .../encounters/encounterAdoptionEmbed.jsp | 186 ------------------ 2 files changed, 226 deletions(-) delete mode 100755 src/main/webapp/encounters/encounterAdoptionEmbed.jsp diff --git a/src/main/webapp/encounters/encounter.jsp b/src/main/webapp/encounters/encounter.jsp index b4c39e5fcf..08ce9fd345 100755 --- a/src/main/webapp/encounters/encounter.jsp +++ b/src/main/webapp/encounters/encounter.jsp @@ -328,35 +328,6 @@ label.item-checked { color: #000000 } - table.adopter { - border-width: 1px 1px 1px 1px; - border-spacing: 0px; - border-style: solid solid solid solid; - border-color: black black black black; - border-collapse: separate; - background-color: white; - } - - table.adopter td { - border-width: 1px 1px 1px 1px; - padding: 3px 3px 3px 3px; - border-style: none none none none; - border-color: gray gray gray gray; - background-color: white; - -moz-border-radius: 0px 0px 0px 0px; - font-size: 12px; - color: #330099; - } - - table.adopter td.name { - font-size: 12px; - text-align: center; - } - - table.adopter td.image { - padding: 0px 0px 0px 0px; - } - div.scroll { height: 200px; overflow: auto; @@ -5276,17 +5247,6 @@ if(!isOwner){isOwnerValue="false";} -<% - if (CommonConfiguration.allowAdoptions(context)) { -%> -
- - - -
-<% - } -%> diff --git a/src/main/webapp/encounters/encounterAdoptionEmbed.jsp b/src/main/webapp/encounters/encounterAdoptionEmbed.jsp deleted file mode 100755 index b73573415e..0000000000 --- a/src/main/webapp/encounters/encounterAdoptionEmbed.jsp +++ /dev/null @@ -1,186 +0,0 @@ -<%@ page contentType="text/html; charset=utf-8" language="java" - import="org.ecocean.servlet.ServletUtilities,org.ecocean.Adoption,org.ecocean.CommonConfiguration,org.ecocean.Shepherd,java.util.ArrayList,java.util.List" %> - - - -<% -String context="context0"; -context=ServletUtilities.getContext(request); - Shepherd adoptShepherd = new Shepherd(context); - adoptShepherd.setAction("encounterAdoptionEmbed.jsp"); - String num = request.getParameter("encounterNumber"); - - try { - - -%> - -
-

Adopters

- - -<% - adoptShepherd.beginDBTransaction(); - List adoptions = adoptShepherd.getAllAdoptionsForEncounter(num); - int numAdoptions = adoptions.size(); - if(numAdoptions>0){ - for (int ia = 0; ia < numAdoptions; ia++) { - Adoption ad = adoptions.get(ia); -%> - - <% - if ((ad.getAdopterImage() != null) && (!ad.getAdopterImage().trim().equals(""))) { - %> - - - - <% - } - %> - - - - - <% - if ((ad.getAdopterQuote() != null) && (!ad.getAdopterQuote().trim().equals(""))) { - %> - - - - - - - - - <% - } - - if (request.getUserPrincipal()!=null) { - %> - - - - - - - - - - - - - - - - - - - - - - <% - } - %> -
- - - - -
<%=ad.getAdopterName()%> -
-
Why are research and conservation important for this - species? -
"<%=ad.getAdopterQuote()%>"
 
Adoption type:
<%=ad.getAdoptionType()%> -
Adoption start:
<%=ad.getAdoptionStartDate()%> -
Adoption end:
<%=ad.getAdoptionEndDate()%> -
 
[edit - this adoption]
 
-

 

-<% - } - } - else { - %> -

No adoptions defined.

-<% - } - - - - //add adoption - if (request.getUserPrincipal()!=null) { -%> -

[+] - Add adoption

-<% - } -%> - - -<% - } - catch (Exception e) { - e.printStackTrace(); - } - adoptShepherd.rollbackDBTransaction(); - adoptShepherd.closeDBTransaction(); - adoptShepherd = null; - -%> \ No newline at end of file From 78b410228cc59279671d7bb14089c0cf61eb8dee Mon Sep 17 00:00:00 2001 From: Jon Van Oast Date: Thu, 26 Sep 2024 12:26:08 -0600 Subject: [PATCH 12/20] culling adoption references --- src/main/webapp/encounters/encounterCR.jsp | 29 ---------- src/main/webapp/gallery.jsp | 63 +--------------------- src/main/webapp/index.jsp | 58 -------------------- 3 files changed, 2 insertions(+), 148 deletions(-) diff --git a/src/main/webapp/encounters/encounterCR.jsp b/src/main/webapp/encounters/encounterCR.jsp index 5ce231eb6b..df762588b6 100755 --- a/src/main/webapp/encounters/encounterCR.jsp +++ b/src/main/webapp/encounters/encounterCR.jsp @@ -99,35 +99,6 @@ if (request.getParameter("number")!=null) { color: #000000 } - table.adopter { - border-width: 1px 1px 1px 1px; - border-spacing: 0px; - border-style: solid solid solid solid; - border-color: black black black black; - border-collapse: separate; - background-color: white; - } - - table.adopter td { - border-width: 1px 1px 1px 1px; - padding: 3px 3px 3px 3px; - border-style: none none none none; - border-color: gray gray gray gray; - background-color: white; - -moz-border-radius: 0px 0px 0px 0px; - font-size: 12px; - color: #330099; - } - - table.adopter td.name { - font-size: 12px; - text-align: center; - } - - table.adopter td.image { - padding: 0px 0px 0px 0px; - } - div.scroll { height: 200px; overflow: auto; diff --git a/src/main/webapp/gallery.jsp b/src/main/webapp/gallery.jsp index 68c0cf966e..04d2237c33 100755 --- a/src/main/webapp/gallery.jsp +++ b/src/main/webapp/gallery.jsp @@ -111,24 +111,8 @@ Vector rIndividuals = new Vector(); myShepherd.beginDBTransaction(); try{ - int count = myShepherd.getNumAdoptions(); int allSharks = myShepherd.getNumMarkedIndividuals(); - int countAdoptable = allSharks - count; - - if(request.getParameter("adoptableSharks")!=null){ - //get current time minus two years - Long twoYears=new Long("63072000000"); - long currentDate=System.currentTimeMillis()-twoYears.longValue(); - String filter="SELECT FROM org.ecocean.MarkedIndividual WHERE names.valuesAsString.toLowerCase().indexOf(\"nickname\") == -1"; - Query query=myShepherd.getPM().newQuery(filter); - query.setOrdering("numberEncounters descending"); - query.setRange(startNum, endNum); - Collection c = (Collection) (query.execute()); - rIndividuals=new Vector(c); - query.closeAll(); - if(rIndividuals==null){rIndividuals=new Vector();} - } - else{ + String order ="nickName ASC NULLS LAST"; request.setAttribute("rangeStart", startNum); @@ -140,8 +124,6 @@ try{ //handle any null errors better if((rIndividuals==null)||(result.getResult()==null)){rIndividuals=new Vector();} - } - // security if((CommonConfiguration.getProperty("collaborationSecurityEnabled", context)!=null)&&(CommonConfiguration.getProperty("collaborationSecurityEnabled", context).equals("true"))){ HiddenIndividualReporter hiddenData = new HiddenIndividualReporter(rIndividuals, request, myShepherd); @@ -310,25 +292,12 @@ try{ - <% - if(CommonConfiguration.allowAdoptions(context)){ - %> - - <% - } - %> -
- <% if (request.getParameter("adoptableSharks")!=null) { %> -

<%=props.getProperty("numAdoptable").replaceAll("%NUM%", (new Integer(countAdoptable)).toString()) %>

-

<%=props.getProperty("adoptOne") %> <%=props.getProperty("learnMore") %>

- <% } %> - <% if(request.getParameter("locationCodeField")!=null) {%> - - - - - - - - - - - -
- - <% - if ((request.getParameter("number") != null)&&(myShepherd.getAdoption(request.getParameter("number").trim())!=null)) { - Adoption tempAD = myShepherd.getAdoption(request.getParameter("number")); - edit = true; - //servletURL = "/editAdoption"; - id = tempAD.getID(); - adopterName = tempAD.getAdopterName(); - adopterAddress = tempAD.getAdopterAddress(); - adopterEmail = tempAD.getAdopterEmail(); - if((tempAD.getAdopterImage()!=null)&&(!tempAD.getAdopterImage().trim().equals(""))){ - adopterImage = tempAD.getAdopterImage(); - } - adoptionStartDate = tempAD.getAdoptionStartDate(); - adoptionEndDate = tempAD.getAdoptionEndDate(); - adopterQuote = tempAD.getAdopterQuote(); - adoptionManager = tempAD.getAdoptionManager(); - sharkForm = tempAD.getMarkedIndividual(); - if (tempAD.getEncounter() != null) { - encounterForm = tempAD.getEncounter(); - } - notes = tempAD.getNotes(); - adoptionType = tempAD.getAdoptionType(); - if(tempAD.getStripeCustomerId()!=null){ - stripeID=tempAD.getStripeCustomerId(); - } - } - %> - - -

Adoption Editing

- - - <% - String shark = ""; - if (request.getParameter("individual") != null) { - shark = request.getParameter("individual"); - } - %> - - - - - - -
- <% - if (request.getParameter("number") != null) { - %> -

Edit adoption <%=request.getParameter("number")%> -

- <% - } else { - %> - -

Create adoption

- <% - } - - if (isOwner) { - %> -
- <% - } - %> - - - - - - - - - - - - - - - - - <% - String adopterImageString=""; - if(adopterImage!=null){ - adopterImageString=adopterImage; - } - %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <% - if (isOwner) { - %> - - - - - - <% - } - %> -
Name:
Email:
- -

Note: Multiple email addresses can be entered for - adopters, using commas as separators.

-
Address:
Image:   - <% - if ((adopterImage != null) && (!adopterImageString.equals(""))) { - %> -   - <% - } - %> -
Adopter quote:Why are research and conservation for this species important?
-
Marked Individual: <%if (!sharkForm.equals("")) { %> - Link <% - } - %> -
Encounter: <%if (!encounterForm.equals("")) { %> - - Link - - <% - } - %> -
Adoption type:
Adoption start date: (e.g. - 2009-05-15)
Adoption end date: (e.g. 2010-05-15)
Adoption manager (user): - <%if (request.getRemoteUser() != null) {%> <%} else {%> - <%}%> -
Adoption notes: - - <% - if (request.getParameter("number") != null) { - %>
- <% - } - - %> -
-
- - <% - if (isOwner) { - %> -
- <% - } - %> -
-
- <% - if (isOwner && request.getParameter("number")!=null) { - %> -

 

- - - - - - - -
-

Delete this adoption

-
-
- - - - - -
-
-
-
- <% - } - - - } - catch(Exception e){e.printStackTrace();} - finally{ - myShepherd.rollbackDBTransaction(); - myShepherd.closeDBTransaction(); - } -%> -
- - diff --git a/src/main/webapp/adoptions/adoptionSuccess.jsp b/src/main/webapp/adoptions/adoptionSuccess.jsp deleted file mode 100755 index b4af1c43a7..0000000000 --- a/src/main/webapp/adoptions/adoptionSuccess.jsp +++ /dev/null @@ -1,133 +0,0 @@ -<%@ page contentType="text/html; charset=utf-8" language="java" - import="org.ecocean.servlet.ServletUtilities,org.ecocean.Adoption, org.ecocean.MarkedIndividual, org.ecocean.CommonConfiguration,org.ecocean.Shepherd,java.awt.*, java.io.File" %> -<%@ taglib uri="http://www.sunwesttek.com/di" prefix="di" %> -<% -String context="context0"; -context=ServletUtilities.getContext(request); - String number = request.getParameter("id"); - Shepherd myShepherd = new Shepherd(context); - myShepherd.setAction("adoptionSuccess.jsp"); - - - //String langCode = "en"; - String langCode=ServletUtilities.getLanguageCode(request); - - - //setup data dir - String rootWebappPath = getServletContext().getRealPath("/"); - File webappsDir = new File(rootWebappPath).getParentFile(); - File shepherdDataDir = new File(webappsDir, CommonConfiguration.getDataDirectoryName(context)); - File adoptionsDir=new File(shepherdDataDir.getAbsolutePath()+"/adoptions"); - if(!adoptionsDir.exists()){adoptionsDir.mkdirs();} - - - File thisAdoptionDir = new File(adoptionsDir.getAbsolutePath()+"/" + request.getParameter("number")); - if(!thisAdoptionDir.exists()){thisAdoptionDir.mkdirs();} - -%> - - - -
- <% - - //get all needed DB reads out of the way in case Dynamic Image fails - String addText = "adopter.jpg"; - String markedIndividual = ""; - boolean hasImages = true; - String shark = ""; - - String thumbLocation = "file-" +adoptionsDir.getAbsolutePath()+"/"+ number + "/thumb.jpg"; - addText = adoptionsDir.getAbsolutePath()+"/" + number + "/" + addText; - - - myShepherd.beginDBTransaction(); - String nickName = ""; - try { - Adoption ad = myShepherd.getAdoption(number); - shark = ad.getMarkedIndividual(); - if (ad.getAdopterImage() != null) { - //addText = ad.getAdopterImage(); - } else { - hasImages = false; - } - if (myShepherd.getMarkedIndividual(shark) != null) { - MarkedIndividual mi = myShepherd.getMarkedIndividual(shark); - nickName = mi.getNickName(); - markedIndividual = mi.getIndividualID(); - } - } - catch (Exception e) { - System.out.println("Error encountered in adoptionSuccess.jsp!"); - e.printStackTrace(); - } - myShepherd.rollbackDBTransaction(); - myShepherd.closeDBTransaction(); - - if(!addText.equals("")){ - - System.out.println("xx thumLoc is: "+thumbLocation); - System.out.println("xx addText is: "+addText); - File file2process = new File(addText); - if(file2process.exists()){ - - - - int intWidth = 190; - int intHeight = 190; - int thumbnailHeight = 190; - int thumbnailWidth = 190; - String height = ""; - String width = ""; - Dimension imageDimensions = org.apache.sanselan.Sanselan.getImageSize(file2process); - - width = Double.toString(imageDimensions.getWidth()); - height = Double.toString(imageDimensions.getHeight()); - - intHeight = ((new Double(height)).intValue()); - intWidth = ((new Double(width)).intValue()); - - if (intWidth > thumbnailWidth) { - double scalingFactor = intWidth / thumbnailWidth; - intWidth = (int) (intWidth / scalingFactor); - intHeight = (int) (intHeight / scalingFactor); - if (intHeight < thumbnailHeight) { - thumbnailHeight = intHeight; - } - } - else { - thumbnailWidth = intWidth; - thumbnailHeight = intHeight; - } - - - - %> - - - - - - - - <% - } - } - %> -

Thank you for your support!

-

You've adopted <%=nickName%> - <%=shark%>

-

- For future reference, your adoption is numbered <%=number%> - . If you have any questions, please reference this number when contacting us. -

-

- You will be receiving an email detailing your adoption shortly. Please retain a copy of this email in the event that you wish to make any changes to your adoption. If you don't see an email, please check your junk folder. -

-

- View your adopted animal's profile. -

-
- diff --git a/src/main/webapp/adoptions/allAdoptions.jsp b/src/main/webapp/adoptions/allAdoptions.jsp deleted file mode 100755 index e663781ca0..0000000000 --- a/src/main/webapp/adoptions/allAdoptions.jsp +++ /dev/null @@ -1,474 +0,0 @@ -<%@ page contentType="text/html; charset=utf-8" language="java" - import="org.ecocean.servlet.ServletUtilities, - org.ecocean.Adoption, - org.ecocean.CommonConfiguration, - org.ecocean.Shepherd, - org.ecocean.ShepherdProperties, - org.ecocean.servlet.ServletUtilities, - org.joda.time.DateTime, - org.joda.time.format.DateTimeFormatter, - org.joda.time.format.ISODateTimeFormat, - javax.jdo.Extent, - javax.jdo.Query, - java.util.Iterator, - org.datanucleus.api.rest.orgjson.JSONArray, - org.json.JSONObject, - java.util.List, - java.util.Collection, - java.util.ArrayList, - java.util.Properties" %> - - -<% -String context="context0"; -context=ServletUtilities.getContext(request); - - - - String langCode=ServletUtilities.getLanguageCode(request); - - Properties props = new Properties(); - props = ShepherdProperties.getProperties("adoption.properties", langCode,context); - - - Shepherd myShepherd = new Shepherd(context); - myShepherd.setAction("allAdoptions.jsp"); - List adoptions = new ArrayList(); - myShepherd.beginDBTransaction(); - - String filter="SELECT FROM org.ecocean.Adoption where id!=null ORDER BY adoptionStartDate"; - Query q=myShepherd.getPM().newQuery(filter); - Collection results = (Collection) q.execute(); - adoptions=new ArrayList(results); - q.closeAll(); - - int count = 0; - JSONArray jsonobj=new JSONArray(); - for(Adoption adopt:adoptions){ - jsonobj.put(adopt.uiJson(request, false)); - } - String indsJson = jsonobj.toString(); - System.out.println(indsJson); - -%> - - - - - - - - - - - - - - - - - - - -
- -

<%=props.getProperty("title")%>

- - - - - -

- " id="filter-text" onChange="return applyFilter()" /> - " /> - " onClick="$('#filter-text').val(''); applyFilter(); return true;" /> - -

- -
-
loading...
-
-
-
- - - - <% - myShepherd.rollbackDBTransaction(); - myShepherd.closeDBTransaction(); - %> - - -
- - diff --git a/src/main/webapp/adoptions/editSuccess.jsp b/src/main/webapp/adoptions/editSuccess.jsp deleted file mode 100755 index 184f7e6c5e..0000000000 --- a/src/main/webapp/adoptions/editSuccess.jsp +++ /dev/null @@ -1,132 +0,0 @@ - <%@ page contentType="text/html; charset=utf-8" language="java" - import="org.ecocean.servlet.ServletUtilities,org.ecocean.Adoption, org.ecocean.MarkedIndividual, org.ecocean.CommonConfiguration,org.ecocean.Shepherd,java.awt.*, java.io.File" %> - <%@ taglib uri="http://www.sunwesttek.com/di" prefix="di" %> - <% - String context="context0"; - context=ServletUtilities.getContext(request); - String number = request.getParameter("id"); - Shepherd myShepherd = new Shepherd(context); - myShepherd.setAction("adoptionSuccess.jsp"); - - - //String langCode = "en"; - String langCode=ServletUtilities.getLanguageCode(request); - - - //setup data dir - String rootWebappPath = getServletContext().getRealPath("/"); - File webappsDir = new File(rootWebappPath).getParentFile(); - File shepherdDataDir = new File(webappsDir, CommonConfiguration.getDataDirectoryName(context)); - File adoptionsDir=new File(shepherdDataDir.getAbsolutePath()+"/adoptions"); - if(!adoptionsDir.exists()){adoptionsDir.mkdirs();} - - - File thisAdoptionDir = new File(adoptionsDir.getAbsolutePath()+"/" + request.getParameter("number")); - if(!thisAdoptionDir.exists()){thisAdoptionDir.mkdirs();} - - %> - - - -
- <% - - //get all needed DB reads out of the way in case Dynamic Image fails - String addText = "adopter.jpg"; - String markedIndividual = ""; - boolean hasImages = true; - String shark = (String)session.getAttribute("sharkID"); - - String thumbLocation = "file-" +adoptionsDir.getAbsolutePath()+"/"+ number + "/thumb.jpg"; - addText = adoptionsDir.getAbsolutePath()+"/" + number + "/" + addText; - - - myShepherd.beginDBTransaction(); - String nickName = ""; - try { - Adoption ad = myShepherd.getAdoption(number); - shark = ad.getMarkedIndividual(); - if (ad.getAdopterImage() != null) { - addText = ad.getAdopterImage(); - } else { - hasImages = false; - } - if (myShepherd.getMarkedIndividual(shark) != null) { - MarkedIndividual mi = myShepherd.getMarkedIndividual(shark); - nickName = mi.getNickName(); - markedIndividual = mi.getIndividualID(); - } - } - catch (Exception e) { - System.out.println("Error encountered in adoptionSuccess.jsp!"); - e.printStackTrace(); - } - myShepherd.rollbackDBTransaction(); - myShepherd.closeDBTransaction(); - - if(!addText.equals("")){ - - - File file2process = new File(addText); - if(file2process.exists()){ - - - - int intWidth = 190; - int intHeight = 190; - int thumbnailHeight = 190; - int thumbnailWidth = 190; - String height = ""; - String width = ""; - Dimension imageDimensions = org.apache.sanselan.Sanselan.getImageSize(file2process); - - width = Double.toString(imageDimensions.getWidth()); - height = Double.toString(imageDimensions.getHeight()); - - intHeight = ((new Double(height)).intValue()); - intWidth = ((new Double(width)).intValue()); - - if (intWidth > thumbnailWidth) { - double scalingFactor = intWidth / thumbnailWidth; - intWidth = (int) (intWidth / scalingFactor); - intHeight = (int) (intHeight / scalingFactor); - if (intHeight < thumbnailHeight) { - thumbnailHeight = intHeight; - } - } - else { - thumbnailWidth = intWidth; - thumbnailHeight = intHeight; - } - - - - %> - - - - - - - - <% - } - } - %> -

Adoption Edit

-

Your adoption was successfully updated.

- - - -

- View your shark's updated profile.

-

Wildbook Home

- .

- - -
- diff --git a/src/main/webapp/adoptions/emailAlterAdoption.jsp b/src/main/webapp/adoptions/emailAlterAdoption.jsp deleted file mode 100755 index 36a8cb5444..0000000000 --- a/src/main/webapp/adoptions/emailAlterAdoption.jsp +++ /dev/null @@ -1,190 +0,0 @@ -<%@ page contentType="text/html; charset=utf-8" language="java" import="org.ecocean.servlet.*, org.ecocean.*, java.util.Properties, java.util.Date, java.util.Enumeration, java.io.FileInputStream, java.io.File, java.io.FileNotFoundException" %> - -<% - -String context="context0"; -context=ServletUtilities.getContext(request); - //handle some cache-related security - response.setHeader("Cache-Control", "no-cache"); //Forces caches to obtain a new copy of the page from the origin server - response.setHeader("Cache-Control", "no-store"); //Directs caches not to store the page under any circumstance - response.setDateHeader("Expires", 0); //Causes the proxy cache to see the page as "stale" - response.setHeader("Pragma", "no-cache"); //HTTP 1.0 backward compatibility - - Shepherd myShepherd = new Shepherd(context); - myShepherd.setAction ("emailAlterAdoption.jsp"); - myShepherd.beginDBTransaction(); - - Properties stripeProps = ShepherdProperties.getProperties("stripeKeys.properties", "", context); - if (stripeProps == null) { - System.out.println("There are no available API keys for Stripe!"); - } - String stripePublicKey = stripeProps.getProperty("publicKey"); - - String id = ""; - String adopterName = ""; - String adopterAddress = ""; - String adopterEmail = ""; - String adopterImage=""; - String adopterQuote = ""; - String adoptionManager = ""; - String sharkForm = ""; - String notes = ""; - String adoptionType = ""; - - // Simple flag to change landing page after form submission. - - session.setAttribute( "emailEdit", true ); - - String number = (String)session.getAttribute("number"); - - String sharkID = ""; - if (request.getParameter("number") != null) { - sharkID = request.getParameter("number"); - session.setAttribute( "sharkID", request.getParameter("number")); - } - - String adoptionID = ""; - if (request.getParameter("adoption") != null) { - adoptionID = request.getParameter("adoption"); - session.setAttribute( "adoptionID", request.getParameter("adoption")); - } - - String stripeID = ""; - if (request.getParameter("stripeID") != null) { - stripeID = request.getParameter("stripeID"); - session.setAttribute( "stripeID", request.getParameter("stripeID")); - } - - %> - - - - - - -
-
-
-

Update Adoption Profile

- -
-
- - -
- Change Adopter Name - -
-
- Change Adopter Email -
-
-
- Change Address - -
-
- Profile Photo - <% - String adopterImageString=""; - if(adopterImage!=null){ - adopterImageString=adopterImage; - } - %> -    - <% - if ((adopterImage != null) && (!adopterImageString.equals(""))) { - %> -   - <% - } - %> -
- - <%-- Recaptcha widget --%> - <%= ServletUtilities.captchaWidget(request) %> - - -
- -
- - <%-- END ADOPTION UPDATE FORM -- BEGIN PAYMENT UPDATE FORM --%> - -
-
-

Financial Information

- -
- -
-
- Name On Card - -
-
- Card Number - -
-
- Expiration - - -
-
- CVC - -
-
- Billing Zip - -
- -
-
- - - - -
- - <% - myShepherd.rollbackDBTransaction(); - myShepherd.closeDBTransaction(); - %> - - - - - - - diff --git a/src/main/webapp/adoptions/emailCancelAdoption.jsp b/src/main/webapp/adoptions/emailCancelAdoption.jsp deleted file mode 100755 index 6ae9effeb7..0000000000 --- a/src/main/webapp/adoptions/emailCancelAdoption.jsp +++ /dev/null @@ -1,79 +0,0 @@ -<%@ page contentType="text/html; charset=utf-8" language="java" - import="org.ecocean.servlet.ServletUtilities,org.ecocean.CommonConfiguration" %> - -<% - -String context="context0"; -context=ServletUtilities.getContext(request); - //handle some cache-related security - response.setHeader("Cache-Control", "no-cache"); //Forces caches to obtain a new copy of the page from the origin server - response.setHeader("Cache-Control", "no-store"); //Directs caches not to store the page under any circumstance - response.setDateHeader("Expires", 0); //Causes the proxy cache to see the page as "stale" - response.setHeader("Pragma", "no-cache"); //HTTP 1.0 backward compatibility - - - String sharkID = ""; - if (request.getParameter("number") != null) { - sharkID = request.getParameter("number"); - } - - String adoptionID = ""; - if (request.getParameter("adoption") != null) { - adoptionID = request.getParameter("adoption"); - } - - String customerID = ""; - if (request.getParameter("stripeID") != null) { - customerID = request.getParameter("stripeID"); - } - - -%> - - - -
- - - - - - - -
-

Cancel your Adoption

- -

You are about to DELETE your adoption from the - database, and cancel the associated recurring payments. - If you choose Permanently delete, all data - contained within this adoption will be removed from the database - and you will need to resubmit the adoption and payment form in order - to recreate the adoption.

-
-

Do you want to cancel this adoption?

- - - - - -
-
- - - - - -
- 		-
> - -
-
-
- -
- - - diff --git a/src/main/webapp/createadoption.jsp b/src/main/webapp/createadoption.jsp deleted file mode 100755 index 6d06cac08b..0000000000 --- a/src/main/webapp/createadoption.jsp +++ /dev/null @@ -1,215 +0,0 @@ -<%@ page contentType="text/html; charset=utf-8" language="java" import="org.ecocean.servlet.*, org.ecocean.*, java.util.Properties, java.util.Date, java.util.Enumeration, java.io.FileInputStream, java.io.File, java.io.FileNotFoundException" %> - -<% - -//handle some cache-related security -response.setHeader("Cache-Control", "no-cache"); -//Forces caches to obtain a new copy of the page from the origin server -response.setHeader("Cache-Control", "no-store"); -//Directs caches not to store the page under any circumstance -response.setDateHeader("Expires", 0); -//Causes the proxy cache to see the page as "stale" -response.setHeader("Pragma", "no-cache"); -//HTTP 1.0 backward compatibility - -String context="context0"; -context=ServletUtilities.getContext(request); - - //language setup - String langCode="en"; - if(session.getAttribute("langCode")!=null){langCode=(String)session.getAttribute("langCode");} - - Properties props=new Properties(); - props.load(getClass().getResourceAsStream("/bundles/"+langCode+"/submit.properties")); - Shepherd myShepherd = new Shepherd(context); - myShepherd.setAction("createadoption.jsp"); - myShepherd.beginDBTransaction(); - try{ - String shark = ""; - if (request.getParameter("number") != null) { - shark = request.getParameter("number"); - } - - // Necessary to persist your selected shark across multiple form submissions. - // Payment status is also stored in session. - if (request.getParameter("number") != null) { - session.setAttribute( "queryShark", request.getParameter("number") ); - } - String sessionShark = null; - if (session.getAttribute( "queryShark") != null) { - sessionShark =((String)session.getAttribute( "queryShark")).trim(); - } - Boolean sessionPaid = false; - if (session.getAttribute( "paid") != null) { - sessionPaid =(Boolean)session.getAttribute( "paid"); - } - - session.setAttribute( "emailEdit", false ); - - boolean hasNickName = true; - String nick = ""; - try { - if ((sessionShark != null)&&(myShepherd.getMarkedIndividual(sessionShark)!=null)) { - MarkedIndividual mi = myShepherd.getMarkedIndividual(sessionShark); - nick = mi.getNickName(); - if (((nick==null) || nick.equals("Unassigned"))||(nick.equals(""))) { - hasNickName = false; - } - } - } - catch (Exception e) { - System.out.println("Error looking up nickname: "+sessionShark); - e.printStackTrace(); - } - - - int count = myShepherd.getNumAdoptions(); - int allSharks = myShepherd.getNumMarkedIndividuals(); - int countAdoptable = allSharks - count; - - boolean isOwner = true; - boolean acceptedPayment = true; - - String id = ""; - String adopterName = ""; - String adopterAddress = ""; - String adopterEmail = ""; - String adopterImage=""; - String adoptionStartDate = ""; - String adoptionEndDate = ""; - String adopterQuote = ""; - String adoptionManager = ""; - String sharkForm = ""; - String encounterForm = ""; - String notes = ""; - String adoptionType = ""; - - String servletURL = "../AdoptionAction"; - -%> - - - - - -
-
-

Thank you for your support!

-

After filling out the financial information, you will be able to create your profile and choose and nickname your animal.

- -

Financial Information

-

- -
- -
- -
- - - <% - } - %> -
- - - -<% - }catch (Exception e){ - e.printStackTrace(); - }finally{ - myShepherd.rollbackDBTransaction(); - myShepherd.closeDBTransaction(); - } -%> - diff --git a/src/main/webapp/oneTimeDonation.jsp b/src/main/webapp/oneTimeDonation.jsp deleted file mode 100755 index 044d7ef0b9..0000000000 --- a/src/main/webapp/oneTimeDonation.jsp +++ /dev/null @@ -1,160 +0,0 @@ -<%@ page contentType="text/html; charset=utf-8" language="java" import="org.ecocean.servlet.*, org.ecocean.*, java.util.Properties, java.util.Date, java.util.Enumeration, java.io.FileInputStream, java.io.File, java.io.FileNotFoundException" %> -<% - -//handle some cache-related security -response.setHeader("Cache-Control", "no-cache"); -//Forces caches to obtain a new copy of the page from the origin server -response.setHeader("Cache-Control", "no-store"); -//Directs caches not to store the page under any circumstance -response.setDateHeader("Expires", 0); -//Causes the proxy cache to see the page as "stale" -response.setHeader("Pragma", "no-cache"); -//HTTP 1.0 backward compatibility - -String context="context0"; -context=ServletUtilities.getContext(request); - - //language setup - String langCode="en"; - if(session.getAttribute("langCode")!=null){langCode=(String)session.getAttribute("langCode");} - - Properties props=new Properties(); - props.load(getClass().getResourceAsStream("/bundles/"+langCode+"/submit.properties")); - - Properties stripeProps = ShepherdProperties.getProperties("stripeKeys.properties", "", context); - if (stripeProps == null) { - System.out.println("There are no available API keys for Stripe!"); - } - String stripePublicKey = stripeProps.getProperty("publicKey"); - - Shepherd myShepherd = new Shepherd(context); - myShepherd.setAction ("oneTimeDonation.jsp"); - myShepherd.beginDBTransaction(); - - String shark = ""; - if (request.getParameter("number") != null) { - shark = request.getParameter("number"); - } - - // Necessary to persist your selected shark across multiple form submissions. - // Payment status is also stored in session. - if (request.getParameter("number") != null) { - session.setAttribute( "queryShark", request.getParameter("number") ); - } - - Boolean sessionPaid = false; - if (session.getAttribute( "paid") != null) { - sessionPaid =(Boolean)session.getAttribute( "paid"); - } - - session.setAttribute( "emailEdit", false ); - - boolean acceptedPayment = true; - - String id = ""; - - -%> - - - -
-
-

Thank you for your support!

-

This donation will go directly to Whaleshark.org.

-
- - <%-- BEGIN STRIPE FORM --%> -
-
-

Financial Information

- -
- -
-
- -
-
- Amount in Dollars - -
-
- Name On Card - -
-
- Card Number - -
-
- Expiration - - -
-
-
-
- CVC - -
-
- Billing Zip - -
-
- Billing Email - -
- -
-
- <%-- END STRIPE FORM - BEGIN ADOPTION FORM--%> - - <% - if (acceptedPayment) { - %> -
- - <% - } - %> - <% - myShepherd.rollbackDBTransaction(); - myShepherd.closeDBTransaction(); - %> -
- - - - - - From fb6e772fb4acd3d918182b4de967a3f1c05270de Mon Sep 17 00:00:00 2001 From: Jon Van Oast Date: Thu, 26 Sep 2024 16:47:43 -0600 Subject: [PATCH 14/20] misc css and jsp bugfix --- src/main/webapp/css/createadoption.css | 117 ------------------ .../cust/mantamatcher/styles/_buttons.less | 11 -- .../cust/mantamatcher/styles/_custom.less | 22 ---- src/main/webapp/individuals.jsp | 1 + 4 files changed, 1 insertion(+), 150 deletions(-) delete mode 100755 src/main/webapp/css/createadoption.css diff --git a/src/main/webapp/css/createadoption.css b/src/main/webapp/css/createadoption.css deleted file mode 100755 index 6e768efb18..0000000000 --- a/src/main/webapp/css/createadoption.css +++ /dev/null @@ -1,117 +0,0 @@ -/*these styles are in createadoption less file but arent compiling. styles from other less files are below too and are signified by comments. some of the files in the less file have compiled previously. if able to get the less files to compile, delete this css file*/ -section.centered{ - margin: 0 auto; - text-align: center; -} - -#payment-form, #adoption-form{ - display: flex; - justify-content: center; - flex-wrap: wrap; -} - -#payment-form.input-col-1, #adoption-form.input-col-2{ - width: 47rem; -} - -#payment-form.form-header, #adoption-form.form-header{ - width: 100%; - margin: 3rem auto 8rem auto; - text-align: center; -} - -#payment-form.form-header img, #adoption-form.form-header img{ - width: 3rem; - margin-top: -.3rem; - margin-bottom: 2rem; -} - -#payment-form.form-header h2, #adoption-form.form-header h2{ - margin-top: 1rem; -} - -#payment-form.input-s-width, #adoption-form.input-s-width{ - width: 10rem; -} - -#payment-form.input-m-width, #adoption-form.input-m-width{ - width: 20rem; -} - -#payment-form.input-l-width, #adoption-form.input-l-width{ - width: 30rem; -} - -#payment-form.input-group, #adoption-form.input-group{ - width: 20%; - margin-bottom: 4rem; -} -@media screen and (min-width: 750px){ - #payment-form.input-group, #adoption-form.input-group{ - margin-bottom: 1rem; - } -} - -#adoption-form textarea{ - height: 10rem; - width: 30rem; -} - -/*style from buttons less file*/ -#individualSocialButtons{ - display: flex; - align-items: center; -} -#individualSocialButtons div, #individualSocialButtons iframe, #individualSocialButtons a{ - margin-right: 1rem; -} - -/*adoptashark - styles are in less file too*/ -.adopters-featured{ - margin-top: 6rem;} -.adopters-featured h2{ - color: @h1Colour; - } -.adopter-feature-gallery{ - display: flex; - justify-content: space-between; - flex-wrap: wrap; - margin-top: 3rem; - } - .adopter{ - width: 48%; - margin-bottom: 1rem; - border: 1px solid #a7a7a7; - } - .adopter-details{ - display: flex; - justify-content: center; - align-items: center; - flex-direction: column; - } - .adopter-details p{ - width: 85%; - margin-bottom: 3rem; - } - .adopter-details p:first-of-type{ - text-align: center; - margin: 1rem 0; - font-weight: 400; - } - .adopter-header{ - margin: 0; - background-color: #005589; - color: white; - text-align: center; - line-height: 4rem; - } - .adopter-header p{margin: 0;} - @media screen and (min-width: 600px){ - .adopter{ - width: 24%; - } - } - - body{ - font-family: 'Open Sans', sans-serif; - } diff --git a/src/main/webapp/cust/mantamatcher/styles/_buttons.less b/src/main/webapp/cust/mantamatcher/styles/_buttons.less index 2f9c7085fc..1cc026b0c8 100644 --- a/src/main/webapp/cust/mantamatcher/styles/_buttons.less +++ b/src/main/webapp/cust/mantamatcher/styles/_buttons.less @@ -26,17 +26,6 @@ button.contrast, html input[type="button"].contrast, input[type="reset"].contrast, input[type="submit"].contrast { background-color: @brand-contrast; } -button.adopt { - margin-top:0; - text-align:center; - padding:0 10px; - margin-bottom: .5rem; - @media screen and (min-width: 400px){ - float:left; - margin-bottom: 0; - } -} - button.light, html input[type="button"].light, input[type="reset"].light, input[type="submit"].light { background-color: @brand-secondary; } diff --git a/src/main/webapp/cust/mantamatcher/styles/_custom.less b/src/main/webapp/cust/mantamatcher/styles/_custom.less index daedc0d0f9..c03431c016 100644 --- a/src/main/webapp/cust/mantamatcher/styles/_custom.less +++ b/src/main/webapp/cust/mantamatcher/styles/_custom.less @@ -522,28 +522,6 @@ form table td, form table th { .encounter-list span { display: block; } -.adopter-badge {} - - .adopter-badge h2 small { - display: block; - color: @mainColor; - } - - .adopter-badge blockquote { - border-left: 0; - padding-left: 0; - padding-top: 0; - padding-bottom: 0; - margin-bottom: 0; - font-size: 1em; - line-height: 1.5em; - } - - .adopter-badge img { - margin-top: 25px; - width: 168px; - max-width: 168px; - } /* Submit encounter page */ .social-media-btn { diff --git a/src/main/webapp/individuals.jsp b/src/main/webapp/individuals.jsp index ba0828e776..e0775a40c0 100755 --- a/src/main/webapp/individuals.jsp +++ b/src/main/webapp/individuals.jsp @@ -498,6 +498,7 @@ $(document).ready(function() { %>

<%=myNickname%> + <% if (isOwner && CommonConfiguration.isCatalogEditable(context)) {%>
From d6ef676c790e25dfa2cfe7956d19ee16677c9193 Mon Sep 17 00:00:00 2001 From: Jon Van Oast Date: Thu, 26 Sep 2024 17:00:51 -0600 Subject: [PATCH 15/20] remove adoption resources --- .../emails/en/adoptionConfirmation.html | 697 ------------------ .../emails/en/adoptionConfirmation.txt | 14 - .../resources/emails/en/adoptionSpotting.html | 1 - .../en/individualAddEncounter-adopter.txt | 11 - .../src/pages/adoptionConfirmation.html | 75 -- .../src/pages/adoptionSpotting.html | 27 - .../src/partials/adopt-an-animal.html | 20 - .../old emails/adoptionConfirmation.html | 18 - .../individualAddEncounter-adopter.html | 14 - 9 files changed, 877 deletions(-) delete mode 100755 src/main/resources/emails/en/adoptionConfirmation.html delete mode 100755 src/main/resources/emails/en/adoptionConfirmation.txt delete mode 100755 src/main/resources/emails/en/adoptionSpotting.html delete mode 100755 src/main/resources/emails/en/individualAddEncounter-adopter.txt delete mode 100755 src/main/resources/emails/foundation-emails/src/pages/adoptionConfirmation.html delete mode 100755 src/main/resources/emails/foundation-emails/src/pages/adoptionSpotting.html delete mode 100755 src/main/resources/emails/foundation-emails/src/partials/adopt-an-animal.html delete mode 100755 src/main/resources/emails/old emails/adoptionConfirmation.html delete mode 100755 src/main/resources/emails/old emails/individualAddEncounter-adopter.html diff --git a/src/main/resources/emails/en/adoptionConfirmation.html b/src/main/resources/emails/en/adoptionConfirmation.html deleted file mode 100755 index aa0812596b..0000000000 --- a/src/main/resources/emails/en/adoptionConfirmation.html +++ /dev/null @@ -1,697 +0,0 @@ - - - - - - Animal Adopted, Flukebook - - - - - - - - - -
-
- - - - - - -
- - - - - - -
- - - - - - - -
- - - - - - -
- 		- - - - - - -

-
-
-
-
- - - - - - - -
 
- - - - - - -
- - - - - - -
- - - - - - -
 
- - - - - - -
- - - - - - - -
-

@ADOPTER_NAME@

-

Whale Shark - Adopter

-
-
-
- - - - - - -
 
- - - - - - - - -
- - - - - - -

-
- 		- - - - - - -
- - - - - - - -
-

@ADOPTER_QUOTE@

-
-
- 		- - - - - - -

-
-
- - - - - - - - -
- - - - - - -

-
- 		- - - - - - -
-

@ADOPTER_NAME@ - adopted @INDIVIDUAL_NICKNAME@ - the whale on - @ADOPTION_START@.

-
- 		- - - - - - -

-
-
- - - - - - - - -
- - - - - - -

-
- 		- - - - - - -
- 		- - - - - - -
- - - -
-
- - - - - - -
 
-
- - - - - - -
- - - - - - -
 
-
- - - - - - - -
- - - - - - -
 
- - - - - - -
- - - - - - - -
-

Thank - you for your support - @ADOPTER_NAME@. We hope to spot - @INDIVIDUAL_NICKNAME@ again - soon. You'll be the first to - know when we do. If you would - ever like to discontinue your - support, please RETAIN - THIS EMAIL and click - the link below to stop you - contributions.

- - - - - - -
 
-

Many - thanks,

-

The - Flukebook Family

- - - - - - -
 
-

Adoption - Details:

- -
-
- - - - - - -
 
-
-
- - - - - - -
- - - - - - -
- - - - - - -
 
- - - - - - - -
- - - - - - -
-
Connect - With Us:
- - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - -
-
flukebook.org
-
-
-
- 		- - - - - - -

-
-
- - - - - - -
- - - - - - - -
- - - - - - -
 
-

LEGAL - STATEMENT

-

Wildbook - is copyrighted 2024 by Conservation X Labs. - Individual contributors to - Wildbook retain copyrights for - submitted images. No - reproduction or usage of - material in this library is - permitted without the express - permission of the copyright - holders.

- - - - - - -
 
-

Click - here - if you no longer wish to receive - updates from Wildbook for Whale - Sharks.

-
-
-
-
-
-
- -
  -                                                          
- - diff --git a/src/main/resources/emails/en/adoptionConfirmation.txt b/src/main/resources/emails/en/adoptionConfirmation.txt deleted file mode 100755 index cc320d8efb..0000000000 --- a/src/main/resources/emails/en/adoptionConfirmation.txt +++ /dev/null @@ -1,14 +0,0 @@ -SUBJECT: Adoption Started! @INDIVIDUAL_NICKNAME@ - @INDIVIDUAL_ID@ -Hello! - -This is a confirmation email for your recent adoption of a @INDIVIDUAL_NICKNAME@. -Thank you for contributing to our efforts in mark-recapture for these -amazing animals. - -@ADOPTION_STRIPE_CUSTOMER_ID@ - -Thanks again for your critical help and support! - -To cancel your adoption, retain this email and click on the link below. - -@ADOPTION_CANCELLATION_LINK@ diff --git a/src/main/resources/emails/en/adoptionSpotting.html b/src/main/resources/emails/en/adoptionSpotting.html deleted file mode 100755 index 8e9bb843fe..0000000000 --- a/src/main/resources/emails/en/adoptionSpotting.html +++ /dev/null @@ -1 +0,0 @@ -Whale Shark Spotted, Flukebook
 
 
 

Great News @ADOPTER_NAME@,

 

We've spotted @INDIVIDUAL_NICKNAME@! Have a look - @TEXT_CONTENT@

 

Thank you for your continued support,

The Flukebook

 
 
Connect With Us:
flukebook.org
 

LEGAL STATEMENT

Wildbook is copyrighted 2024 by Conservation X Labs. Individual contributors to Wildbook retain copyrights for submitted images. No reproduction or usage of material in this library is permitted without the express permission of the copyright holders.

 

Click here if you no longer wish to receive updates from Flukebook.

                                                           
\ No newline at end of file diff --git a/src/main/resources/emails/en/individualAddEncounter-adopter.txt b/src/main/resources/emails/en/individualAddEncounter-adopter.txt deleted file mode 100755 index a4b4199df3..0000000000 --- a/src/main/resources/emails/en/individualAddEncounter-adopter.txt +++ /dev/null @@ -1,11 +0,0 @@ -SUBJECT: Sighting update: @INDIVIDUAL_ID@ -Hello! - -Just a quick email to let you know that a cetacean that you adopted has been -seen again and positively identified in the Flukebook photo-identification -library. -Follow the link below to learn more. - -@TEXT_CONTENT@ - -Thanks again for your critical help and support! diff --git a/src/main/resources/emails/foundation-emails/src/pages/adoptionConfirmation.html b/src/main/resources/emails/foundation-emails/src/pages/adoptionConfirmation.html deleted file mode 100755 index e2bdcfe972..0000000000 --- a/src/main/resources/emails/foundation-emails/src/pages/adoptionConfirmation.html +++ /dev/null @@ -1,75 +0,0 @@ ---- -subject: Animal Adopted, Wildbook for Whale Sharks ---- - - - - - - - - -

@ADOPTER_NAME@

-

Whale Shark Adopter

-
- -
- - - - - - - -

@ADOPTER_QUOTE@

- - - - - - - -

- @ADOPTER_NAME@ adopted @INDIVIDUAL_NICKNAME@ the whale shark on @ADOPTION_START@. -

- - - - - - - - - - - - - - - - - - - - - - - - -

Thank you for your support @ADOPTER_NAME@. We hope to spot @INDIVIDUAL_NICKNAME@ again soon. You'll be the first to know when we do. If you would ever like to discontinue your support, please RETAIN THIS EMAIL and click the link below to stop you contributions.

- -

Many thanks,

- -

The Wildbook for Whale Sharks Family

- -

Adoption Details:

- - - - - - diff --git a/src/main/resources/emails/foundation-emails/src/pages/adoptionSpotting.html b/src/main/resources/emails/foundation-emails/src/pages/adoptionSpotting.html deleted file mode 100755 index 2302c2e7c4..0000000000 --- a/src/main/resources/emails/foundation-emails/src/pages/adoptionSpotting.html +++ /dev/null @@ -1,27 +0,0 @@ ---- -subject: Whale Shark Spotted, Wildbook for Whale Sharks ---- - - - - - - - - -
- -
- -

Great News @ADOPTER_NAME@,

- -

We've spotted @INDIVIDUAL_NICKNAME@! Have a look - @TEXT_CONTENT@

- -

Thank you for your continued support,

- -

The Wildbook for Whale Sharks

- - - - - diff --git a/src/main/resources/emails/foundation-emails/src/partials/adopt-an-animal.html b/src/main/resources/emails/foundation-emails/src/partials/adopt-an-animal.html deleted file mode 100755 index d76e1250d0..0000000000 --- a/src/main/resources/emails/foundation-emails/src/partials/adopt-an-animal.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - -
Whale sharks for everyone!
-

- Can you help researchers study and protect whale sharks? -

-

- Wild Me is a lab under Conservation X Labs, a 501(c)(3) non-profit that develops the cutting edge technology for a global community of wildlife researchers. Are you interested in further supporting our mission? -

- - - - - diff --git a/src/main/resources/emails/old emails/adoptionConfirmation.html b/src/main/resources/emails/old emails/adoptionConfirmation.html deleted file mode 100755 index a2ba496911..0000000000 --- a/src/main/resources/emails/old emails/adoptionConfirmation.html +++ /dev/null @@ -1,18 +0,0 @@ -

Hello @ADOPTER_NAME@!

- -

This is a confirmation email for your recent adoption of @INDIVIDUAL_NICKNAME@. -Thank you for contributing to our efforts in mark-recapture for these -amazing animals.

- -

Make sure you save this email! It contains the links for changing you information, and -cancellation.

- - -
- @ADOPTION_STRIPE_CUSTOMER_ID@ -
- - -

To cancel your adoption at any time, retain this email and click on the link below.

- -Cancel Here at Any Time diff --git a/src/main/resources/emails/old emails/individualAddEncounter-adopter.html b/src/main/resources/emails/old emails/individualAddEncounter-adopter.html deleted file mode 100755 index 644fc1c19b..0000000000 --- a/src/main/resources/emails/old emails/individualAddEncounter-adopter.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - - -

Hello!

-

Just a quick email to let you know that a marine mammal that you adopted - has been seen again and positively identified in the Flukebook - photo-identification library.
- Follow the link below to learn more.

-
@TEXT_CONTENT@
-

Thanks again for your critical help and support!

- - From d1199cc3b79f3ca94ebe79284b4fd7094699ed2d Mon Sep 17 00:00:00 2001 From: Jon Van Oast Date: Thu, 26 Sep 2024 17:32:02 -0600 Subject: [PATCH 16/20] remove adoption text/links from existing mail templates --- .../emails/en/collaborationInvite.html | 12 ----------- .../emails/en/individualAddEncounter.html | 20 ++----------------- .../emails/en/individualAddEncounter.txt | 4 +--- .../resources/emails/en/individualCreate.html | 20 ++----------------- .../resources/emails/en/individualCreate.txt | 4 +--- .../resources/emails/en/individualUpdate.html | 12 ----------- .../resources/emails/en/individualUpdate.txt | 4 +--- .../resources/emails/en/newSubmission.html | 7 ------- .../src/layouts/default.html | 3 --- .../src/pages/individualAddEncounter.html | 2 +- .../src/pages/individualCreate.html | 2 +- .../resources/servletResponseTemplate.htm | 3 +-- 12 files changed, 10 insertions(+), 83 deletions(-) diff --git a/src/main/resources/emails/en/collaborationInvite.html b/src/main/resources/emails/en/collaborationInvite.html index 80a8052fa7..91593ba000 100755 --- a/src/main/resources/emails/en/collaborationInvite.html +++ b/src/main/resources/emails/en/collaborationInvite.html @@ -232,18 +232,6 @@
-
Adopt - a whale
diff --git a/src/main/resources/emails/en/individualAddEncounter.html b/src/main/resources/emails/en/individualAddEncounter.html index 7e877e67ad..e648e762d3 100755 --- a/src/main/resources/emails/en/individualAddEncounter.html +++ b/src/main/resources/emails/en/individualAddEncounter.html @@ -149,12 +149,8 @@


@ENCOUNTER_LINK@

Thanks - again for your critical help! If - you're interested in supporting - our research to understand and - protect animals like yours, - please adopt and nickname your - whales!

+ again for your critical help! +

-
Adopt - a whale
diff --git a/src/main/resources/emails/en/individualAddEncounter.txt b/src/main/resources/emails/en/individualAddEncounter.txt index 6b2539703b..0e97e665d3 100755 --- a/src/main/resources/emails/en/individualAddEncounter.txt +++ b/src/main/resources/emails/en/individualAddEncounter.txt @@ -12,8 +12,6 @@ Previously identified record: @INDIVIDUAL_ID@ (Alternate ID: @INDIVIDUAL_ALT_ID@ New encounter: @ENCOUNTER_ID@ @ENCOUNTER_LINK@ -Thanks again for your critical help! If you're interested in supporting our -research to understand and protect animals like yours, please adopt and -nickname your animal +Thanks again for your critical help! diff --git a/src/main/resources/emails/en/individualCreate.html b/src/main/resources/emails/en/individualCreate.html index 7c02ebdb71..fedb631a49 100755 --- a/src/main/resources/emails/en/individualCreate.html +++ b/src/main/resources/emails/en/individualCreate.html @@ -148,12 +148,8 @@

@ENCOUNTER_LINK@

Thanks - again for your critical help! If - you're interested in supporting - our research to understand and - protect animals like yours, - please adopt and nickname your - animal!

+ again for your critical help! +

-
Adopt - a whale
diff --git a/src/main/resources/emails/en/individualCreate.txt b/src/main/resources/emails/en/individualCreate.txt index e84309889a..d8f2910758 100755 --- a/src/main/resources/emails/en/individualCreate.txt +++ b/src/main/resources/emails/en/individualCreate.txt @@ -12,8 +12,6 @@ Newly marked: @INDIVIDUAL_ID@ Encounter: @ENCOUNTER_ID@ @ENCOUNTER_LINK@ -Thanks again for your critical help! If you're interested in supporting our -research to understand and protect animals like yours, please adopt and -nickname your animal: +Thanks again for your critical help! diff --git a/src/main/resources/emails/en/individualUpdate.html b/src/main/resources/emails/en/individualUpdate.html index 4fa77e7222..5a38b77c71 100755 --- a/src/main/resources/emails/en/individualUpdate.html +++ b/src/main/resources/emails/en/individualUpdate.html @@ -273,18 +273,6 @@

-
Adopt - a whale
diff --git a/src/main/resources/emails/en/individualUpdate.txt b/src/main/resources/emails/en/individualUpdate.txt index db4cab9f21..78008aab6a 100755 --- a/src/main/resources/emails/en/individualUpdate.txt +++ b/src/main/resources/emails/en/individualUpdate.txt @@ -10,8 +10,6 @@ Resighted individual: @INDIVIDUAL_ID@ Encounter: @ENCOUNTER_ID@ @ENCOUNTER_LINK@ -Thanks again for your critical help! If you're interested in supporting our -research to understand and protect animals like yours, please adopt and -nickname your animal. +Thanks again for your critical help! diff --git a/src/main/resources/emails/en/newSubmission.html b/src/main/resources/emails/en/newSubmission.html index 4c9a3df946..b4760695f8 100755 --- a/src/main/resources/emails/en/newSubmission.html +++ b/src/main/resources/emails/en/newSubmission.html @@ -284,13 +284,6 @@
-
Adopt - a whale
diff --git a/src/main/resources/emails/foundation-emails/src/layouts/default.html b/src/main/resources/emails/foundation-emails/src/layouts/default.html index c5948bc138..63c2517fd6 100755 --- a/src/main/resources/emails/foundation-emails/src/layouts/default.html +++ b/src/main/resources/emails/foundation-emails/src/layouts/default.html @@ -19,9 +19,6 @@
{{> header}} {{> body}} - {{#unlesspage 'adoptionConfirmation' 'adoptionSpotting' 'oneTimeDonation'}} - {{> adopt-an-animal}} - {{/unlesspage}} {{> footer}}
diff --git a/src/main/resources/emails/foundation-emails/src/pages/individualAddEncounter.html b/src/main/resources/emails/foundation-emails/src/pages/individualAddEncounter.html index 5943d6d0d3..296989b0fa 100755 --- a/src/main/resources/emails/foundation-emails/src/pages/individualAddEncounter.html +++ b/src/main/resources/emails/foundation-emails/src/pages/individualAddEncounter.html @@ -13,7 +13,7 @@

Hello!

Follow these links to find out more:

Previously identified record: @INDIVIDUAL_ID@ (Alternate ID: @INDIVIDUAL_ALT_ID@) @INDIVIDUAL_LINK@

New encounter: @ENCOUNTER_ID@@ENCOUNTER_LINK@

-

Thanks again for your critical help! If you're interested in supporting our research to understand and protect animals like yours, please adopt and nickname your sharks!

+

Thanks again for your critical help!

diff --git a/src/main/resources/emails/foundation-emails/src/pages/individualCreate.html b/src/main/resources/emails/foundation-emails/src/pages/individualCreate.html index af4835d3f7..756282ee8b 100755 --- a/src/main/resources/emails/foundation-emails/src/pages/individualCreate.html +++ b/src/main/resources/emails/foundation-emails/src/pages/individualCreate.html @@ -13,7 +13,7 @@

Hello!

You discovered a new animal for science!

Newly marked whale shark: @INDIVIDUAL_ID@@INDIVIDUAL_LINK@

Encounter: @ENCOUNTER_ID@@ENCOUNTER_LINK@

-

Thanks again for your critical help! If you're interested in supporting our research to understand and protect animals like yours, please adopt and nickname your animal!

+

Thanks again for your critical help!

diff --git a/src/main/resources/servletResponseTemplate.htm b/src/main/resources/servletResponseTemplate.htm index f916e06b2e..0c415d4d75 100755 --- a/src/main/resources/servletResponseTemplate.htm +++ b/src/main/resources/servletResponseTemplate.htm @@ -18,7 +18,6 @@ - @@ -331,4 +330,4 @@

Action results

- \ No newline at end of file + From 8e262a62a2f08defa570d28e7ac71289828a3374 Mon Sep 17 00:00:00 2001 From: Jon Van Oast Date: Fri, 27 Sep 2024 10:26:56 -0600 Subject: [PATCH 17/20] remove donorbox cruft --- src/main/webapp/gallery.jsp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/main/webapp/gallery.jsp b/src/main/webapp/gallery.jsp index 04d2237c33..599281c1a8 100755 --- a/src/main/webapp/gallery.jsp +++ b/src/main/webapp/gallery.jsp @@ -51,14 +51,6 @@ if(request.getParameter("locationCodeField")!=null){ locationCodeFieldString="&locationCodeField="+request.getParameter("locationCodeField"); } -//params from donorbox -String donorboxId = Util.getRequestParamIfExists(request, "id"); -String donorboxFirstName = Util.getRequestParamIfExists(request, "first_name"); -String donorboxLastName = Util.getRequestParamIfExists(request, "last_name"); -String donorboxAmnt = Util.getRequestParamIfExists(request, "amount"); -String donorboxCurrency = Util.getRequestParamIfExists(request, "currency"); -String donorboxDuration = Util.getRequestParamIfExists(request, "duration"); - //props.load(getClass().getResourceAsStream("/bundles/" + langCode + "/individualSearchResults.properties")); // range of the images being displayed From fb8f1e3d3781297ffea33a4cb34d5755f1e80eeb Mon Sep 17 00:00:00 2001 From: TanyaStere42 Date: Fri, 27 Sep 2024 13:34:33 -0700 Subject: [PATCH 18/20] added a request for donation to replace removed request to adopt --- src/main/resources/emails/en/individualAddEncounter.html | 2 +- src/main/resources/emails/en/individualAddEncounter.txt | 2 +- src/main/resources/emails/en/individualCreate.html | 2 +- src/main/resources/emails/en/individualCreate.txt | 2 +- src/main/resources/emails/en/individualUpdate.html | 3 ++- src/main/resources/emails/en/individualUpdate.txt | 2 +- .../emails/foundation-emails/src/pages/individualCreate.html | 2 +- .../emails/foundation-emails/src/pages/individualUpdate.html | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/resources/emails/en/individualAddEncounter.html b/src/main/resources/emails/en/individualAddEncounter.html index e648e762d3..444654f884 100755 --- a/src/main/resources/emails/en/individualAddEncounter.html +++ b/src/main/resources/emails/en/individualAddEncounter.html @@ -149,7 +149,7 @@


@ENCOUNTER_LINK@

Thanks - again for your critical help! + again for your critical help! To keep this project alive, consider donating.

@ENCOUNTER_LINK@

Thanks - again for your critical help! + again for your critical help! To keep this project alive, consider donating.

@ENCOUNTER_LINK@

Thanks - again for your critical help!

+ again for your critical help! To keep this project alive, consider donating. +

Hello!

You discovered a new animal for science!

Newly marked whale shark: @INDIVIDUAL_ID@@INDIVIDUAL_LINK@

Encounter: @ENCOUNTER_ID@@ENCOUNTER_LINK@

-

Thanks again for your critical help!

+

Thanks again for your critical help! To keep this project alive, consider donating.

diff --git a/src/main/resources/emails/foundation-emails/src/pages/individualUpdate.html b/src/main/resources/emails/foundation-emails/src/pages/individualUpdate.html index dbfd5037d1..9e5a5b759c 100755 --- a/src/main/resources/emails/foundation-emails/src/pages/individualUpdate.html +++ b/src/main/resources/emails/foundation-emails/src/pages/individualUpdate.html @@ -12,7 +12,7 @@

Hello!

Just a quick e-mail to let you know that a whale shark that you sent us encounter data for has been seen again and positively identified. Follow the links below to learn more.

Previously identified shark: @INDIVIDUAL_ID@ (Alternate ID: @INDIVIDUAL_ALT_ID@) @INDIVIDUAL_LINK@

New encounter: @ENCOUNTER_ID@@ENCOUNTER_LINK@

-

Thanks again for your critical help!

+

Thanks again for your critical help! To keep this project alive, consider donating.

From c56af20d90676395de569def09f4be05693cd6ff Mon Sep 17 00:00:00 2001 From: Jon Van Oast Date: Fri, 27 Sep 2024 14:50:52 -0600 Subject: [PATCH 19/20] remove superfluous comment --- .../java/org/ecocean/servlet/importer/FixStandardImport.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/org/ecocean/servlet/importer/FixStandardImport.java b/src/main/java/org/ecocean/servlet/importer/FixStandardImport.java index f0730e0834..c42f39fc2f 100644 --- a/src/main/java/org/ecocean/servlet/importer/FixStandardImport.java +++ b/src/main/java/org/ecocean/servlet/importer/FixStandardImport.java @@ -475,8 +475,6 @@ public MarkedIndividual loadIndividual(Row row, Encounter enc) { String nickname = getString(row, "MarkedIndividual.nickname"); if (nickname == null) nickname = getString(row, "MarkedIndividual.nickName"); if (nickname != null) mark.setNickName(nickname); - // String nicknamer = getString(row, "MarkedIndividual.nickNamer"); // no longer supported via issue 283 - // if (nicknamer != null) mark.setNickNamer(nicknamer); String alternateID = getString(row, "MarkedIndividual.alternateID"); if (alternateID != null) mark.setAlternateID(alternateID); String genus = getString(row, "Encounter.genus"); From 2dd9ff5be5c23847c2ccb48d2f7835bc1b9c2dee Mon Sep 17 00:00:00 2001 From: Jon Van Oast Date: Fri, 27 Sep 2024 14:52:42 -0600 Subject: [PATCH 20/20] these emails are old; remove them --- .../old emails/collaborationInvite.html | 7 ------- .../old emails/encounterDataUpdate.html | 12 ----------- .../old emails/individualAddEncounter.html | 20 ------------------- .../emails/old emails/individualCreate.html | 14 ------------- .../old emails/individualDataUpdate.html | 12 ----------- .../emails/old emails/individualUpdate.html | 11 ---------- .../emails/old emails/newSubmission.html | 8 -------- .../emails/old emails/passwordReset.html | 10 ---------- 8 files changed, 94 deletions(-) delete mode 100755 src/main/resources/emails/old emails/collaborationInvite.html delete mode 100755 src/main/resources/emails/old emails/encounterDataUpdate.html delete mode 100755 src/main/resources/emails/old emails/individualAddEncounter.html delete mode 100755 src/main/resources/emails/old emails/individualCreate.html delete mode 100755 src/main/resources/emails/old emails/individualDataUpdate.html delete mode 100755 src/main/resources/emails/old emails/individualUpdate.html delete mode 100755 src/main/resources/emails/old emails/newSubmission.html delete mode 100755 src/main/resources/emails/old emails/passwordReset.html diff --git a/src/main/resources/emails/old emails/collaborationInvite.html b/src/main/resources/emails/old emails/collaborationInvite.html deleted file mode 100755 index 58c28ca91d..0000000000 --- a/src/main/resources/emails/old emails/collaborationInvite.html +++ /dev/null @@ -1,7 +0,0 @@ -

You have a request to collaborate on @CONTEXT_NAME@ from @SENDER@.

- -

Please see: @LINK@

- -
- @TEXT_CONTENT@ -
diff --git a/src/main/resources/emails/old emails/encounterDataUpdate.html b/src/main/resources/emails/old emails/encounterDataUpdate.html deleted file mode 100755 index 40f718fbd5..0000000000 --- a/src/main/resources/emails/old emails/encounterDataUpdate.html +++ /dev/null @@ -1,12 +0,0 @@ -

Hello!

- -

Just a quick email to let you know of a change in data for a whale shark encounter that you have marked for tracking. See the text below to learn more.

- -

Encounter: @ENCOUNTER_ID@
- @ENCOUNTER_LINK@

- -

Change:

- -
- @TEXT_CONTENT@ -
diff --git a/src/main/resources/emails/old emails/individualAddEncounter.html b/src/main/resources/emails/old emails/individualAddEncounter.html deleted file mode 100755 index 268fa84688..0000000000 --- a/src/main/resources/emails/old emails/individualAddEncounter.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - -

Hello!

-

Just a quick email to let you know that the whale shark encounter that - you submitted has been matched to a shark - in the Wildbook for Whale Sharks photo-identification library.
- Follow these links to find out more:

-

Previously identified record: @INDIVIDUAL_ID@ (Alternate ID: - @INDIVIDUAL_ALT_ID@)
- @INDIVIDUAL_LINK@

-

New encounter: @ENCOUNTER_ID@
- @ENCOUNTER_LINK@

-

Thanks again for your critical help! If you're interested in supporting - our research to understand and protect animals like yours, please adopt - and nickname your sharks!

- - diff --git a/src/main/resources/emails/old emails/individualCreate.html b/src/main/resources/emails/old emails/individualCreate.html deleted file mode 100755 index e9eefafc59..0000000000 --- a/src/main/resources/emails/old emails/individualCreate.html +++ /dev/null @@ -1,14 +0,0 @@ - -

Hello!

-

Just a quick e-mail to let you know that the encounter that you submitted - has been added as a new, - previously unidentified whale shark!

-

You discovered a new animal for science!

-

Newly marked whale shark: @INDIVIDUAL_ID@
- @INDIVIDUAL_LINK@

-

Encounter: @ENCOUNTER_ID@
- @ENCOUNTER_LINK@

-

Thanks again for your critical help! If you're interested in supporting - our research to understand and protect animals like yours, please adopt - and nickname your animal!

- diff --git a/src/main/resources/emails/old emails/individualDataUpdate.html b/src/main/resources/emails/old emails/individualDataUpdate.html deleted file mode 100755 index c842661eac..0000000000 --- a/src/main/resources/emails/old emails/individualDataUpdate.html +++ /dev/null @@ -1,12 +0,0 @@ -

Hello!

- -

Just a quick email to let you know of a change in data for a whale shark that you have marked for tracking. See the text below to learn more.

- -

Individual: @INDIVIDUAL_ID@
- @INDIVIDUAL_LINK@

- -

Change:

- -
- @TEXT_CONTENT@ -
diff --git a/src/main/resources/emails/old emails/individualUpdate.html b/src/main/resources/emails/old emails/individualUpdate.html deleted file mode 100755 index d24147c7b9..0000000000 --- a/src/main/resources/emails/old emails/individualUpdate.html +++ /dev/null @@ -1,11 +0,0 @@ -

Hello!

-

Just a quick e-mail to let you know that a whale shark that you sent us encounter data for has been seen again and positively identified. Follow the links below to learn more. -

-

Previously identified shark: @INDIVIDUAL_ID@ (Alternate ID: - @INDIVIDUAL_ALT_ID@)
- @INDIVIDUAL_LINK@

-

New encounter: @ENCOUNTER_ID@
- @ENCOUNTER_LINK@

-

Thanks again for your critical help! If you're interested in supporting - our research to understand and protect animals like yours, please click here to adopt - and nickname your animal!

diff --git a/src/main/resources/emails/old emails/newSubmission.html b/src/main/resources/emails/old emails/newSubmission.html deleted file mode 100755 index adca692603..0000000000 --- a/src/main/resources/emails/old emails/newSubmission.html +++ /dev/null @@ -1,8 +0,0 @@ -

Thanks for participating in our whale shark research!

- -

Thank you for reporting your whale shark sighting! We will use your information to assist a global community of researchers and citizen scientists working to better understand and protect the world's biggest fish.

- -

Your encouner link:
- @ENCOUNTER_LINK@

- -

The information that you have submitted represents an "encounter" that we track. Each encounter is assigned a unique number, and you can view that encounter at any time using the link above or by going to Wildbook for Whale Sharks. We will keep you informed of any changes to your submitted encounter and email you if the shark is matched to another one within this Wildbook database. We will also let you know if/when and where your animal is resighted by other community members.

diff --git a/src/main/resources/emails/old emails/passwordReset.html b/src/main/resources/emails/old emails/passwordReset.html deleted file mode 100755 index 3857234385..0000000000 --- a/src/main/resources/emails/old emails/passwordReset.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - -

Do you need to reset your password? Please follow this - link to reset it.

- - -