Merge pull request #879 from WildMeOrg/docs-link-updates

Docs and email link updates
WildMeOrg · Nov 7, 2024 · e346ca1 · e346ca1
2 parents c23ccf3 + 56fa162
commit e346ca1
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/devops/deploy/.dockerfiles/tomcat/commonConfiguration.properties b/devops/deploy/.dockerfiles/tomcat/commonConfiguration.properties
@@ -50,8 +50,8 @@ allowAdoptions = false
 
 #email addresses and parameters
 sendEmailNotifications=true
-autoEmailAddress=info@wildbook.org
-newSubmissionEmail=donotreply@wildbook.org
+autoEmailAddress=info@wildme.org
+newSubmissionEmail=donotreply@wildme.org
 mailHost=localhost
 removeEmailString=Do you want to REMOVE your email address from this database? Click the link below to remove it. You will no longer receive updates on your encounters.
 

diff --git a/src/main/java/org/ecocean/ImageProcessor.java b/src/main/java/org/ecocean/ImageProcessor.java
@@ -17,7 +17,6 @@
 public final class ImageProcessor implements Runnable {
     private static Logger log = LoggerFactory.getLogger(ImageProcessor.class);
 
-
     private String context = "context0";
     private String command = null;
     private String imageSourcePath = null;
@@ -95,7 +94,7 @@ public void run() {
             return;
         }
         String comment = CommonConfiguration.getProperty("imageComment", this.context);
-        if (comment == null) comment = "%year All rights reserved. | wildbook.org";
+        if (comment == null) comment = "%year All rights reserved. | wildme.org";
         String cname = ContextConfiguration.getNameForContext(this.context);
         if (cname != null) comment += " | " + cname;
         String maId = "unknown";

diff --git a/src/main/resources/bundles/commonConfiguration.properties b/src/main/resources/bundles/commonConfiguration.properties
@@ -25,8 +25,8 @@ GlobalUniqueIdentifierPrefix=MyGroup:MyStudy:
 
 #email addresses and parameters
 sendEmailNotifications=true
-autoEmailAddress=info@wildbook.org
-newSubmissionEmail=donotreply@wildbook.org
+autoEmailAddress=info@wildme.org
+newSubmissionEmail=donotreply@wildme.org
 mailHost=localhost
 removeEmailString=Do you want to REMOVE your email address from this database? Click the link below to remove it. You will no longer receive updates on your encounters.
 

diff --git a/src/main/resources/emails/en/passwordReset.html b/src/main/resources/emails/en/passwordReset.html
@@ -474,7 +474,7 @@ <h5 style="Margin:0;Margin-bottom:10px;color:inherit;font-family:Helvetica,Arial
 
                             align="center"
 
-                            href="http://www.wildbook.org/">Wildbook.org</a></center>
+                            href="http://www.wildme.org/">wildme.org</a></center>
                           </td>
                         </tr>
                       </tbody>

diff --git a/src/main/resources/servletResponseTemplate.htm b/src/main/resources/servletResponseTemplate.htm
@@ -149,7 +149,7 @@
                   <li><a href="appadmin/admin.jsp">Library Administration</a></li>
                   <li><a href="appadmin/logs.jsp">Logs</a></li>
                   <li><a href="appadmin/kwAdmin.jsp">Photo Keywords</a></li>
-                  <li><a href="product-docs/en/wildbook/introduction/">Software Documentation</a></li>
+                  <li><a href="https://wildbook.docs.wildme.org">Software Documentation</a></li>
                   <li><a href="appadmin/dataIntegrity.jsp">Data Integrity</a></li>
                   <li><a href="imports.jsp">Bulk Import Logs</a></li>
                 </ul>

diff --git a/src/main/webapp/header.jsp b/src/main/webapp/header.jsp
@@ -509,7 +509,7 @@ if(request.getUserPrincipal()!=null){
                           <li><a href="<%=urlLoc %>/appadmin/admin.jsp"><%=props.getProperty("libraryAdministration")%></a></li>
                           <li><a href="<%=urlLoc %>/appadmin/logs.jsp"><%=props.getProperty("logs")%></a></li>
                           <li><a href="<%=urlLoc %>/appadmin/kwAdmin.jsp"><%=props.getProperty("photoKeywords")%></a></li>
-                          <li><a href="<%=urlLoc %>/product-docs/en/wildbook/introduction/"><%=props.getProperty("softwareDocumentation")%></a></li>
+                          <li><a href="https://wildbook.docs.wildme.org"><%=props.getProperty("softwareDocumentation")%></a></li>
                           <li><a href="<%=urlLoc %>/appadmin/dataIntegrity.jsp"><%=props.getProperty("dataIntegrity")%></a></li>
                           <li><a href="<%=urlLoc %>/imports.jsp"><%=props.getProperty("bulkImportLogs")%></a></li>