diff --git a/devops/deploy/.dockerfiles/tomcat/commonConfiguration.properties b/devops/deploy/.dockerfiles/tomcat/commonConfiguration.properties index 53d5190711..1a336a9487 100644 --- a/devops/deploy/.dockerfiles/tomcat/commonConfiguration.properties +++ b/devops/deploy/.dockerfiles/tomcat/commonConfiguration.properties @@ -397,8 +397,6 @@ it = italiano #silo security collaborationSecurityEnabled = true - -## Added for ASWN expansion of flukebook behavior0 = breaching behavior1 = feeding @@ -480,3 +478,7 @@ defaultReceiveEmails=true #### Community URL #### wildbookCommunityUrl=https://community.wildme.org + +### for page timeout +sessionCountdownTime = 10 +sessionWarningTime = 20 \ No newline at end of file diff --git a/devops/development/.dockerfiles/tomcat/commonConfiguration.properties b/devops/development/.dockerfiles/tomcat/commonConfiguration.properties index dd8a195357..4a37384b95 100644 --- a/devops/development/.dockerfiles/tomcat/commonConfiguration.properties +++ b/devops/development/.dockerfiles/tomcat/commonConfiguration.properties @@ -397,8 +397,6 @@ it = italiano #silo security collaborationSecurityEnabled = true - -## Added for ASWN expansion of flukebook behavior0 = breaching behavior1 = feeding @@ -480,3 +478,7 @@ defaultReceiveEmails=true #### Community URL #### wildbookCommunityUrl=https://community.wildme.org + +### for page timeout +sessionCountdownTime = 10 +sessionWarningTime = 20 \ No newline at end of file diff --git a/src/main/resources/bundles/commonConfiguration.properties b/src/main/resources/bundles/commonConfiguration.properties index caa301dac1..0682d6704b 100755 --- a/src/main/resources/bundles/commonConfiguration.properties +++ b/src/main/resources/bundles/commonConfiguration.properties @@ -373,8 +373,6 @@ it = italiano #silo security collaborationSecurityEnabled = true - -## Added for ASWN expansion of flukebook behavior0 = breaching behavior1 = feeding @@ -460,3 +458,7 @@ sessionCountdownTime = 10 #### Community URL #### wildbookCommunityUrl=https://community.wildme.org + +### for page timeout +sessionCountdownTime = 10 +sessionWarningTime = 20 \ No newline at end of file diff --git a/src/main/resources/bundles/en/index.properties b/src/main/resources/bundles/en/index.properties index cc6157c97e..2fdd1d76d6 100755 --- a/src/main/resources/bundles/en/index.properties +++ b/src/main/resources/bundles/en/index.properties @@ -1,12 +1,12 @@ reportEncounter = Report Encounter -mainSplash = Flukebook helps you study, identify, and protect cetaceans worldwide +mainSplash = Wildbook helps you study, identify, and protect cetaceans worldwide howItWorksH = Machine Learning & Citizen Science & Conservation Research -howItWorksHDescription = Flukebook applies computer vision algorithms and deep learning to identify and track individual whales and dolphins across hundreds of thousands of photos. We help researchers collaborate with each other and citizen scientists contribute to the effort. A.I. scales and speeds research and conservation. +howItWorksHDescription = Wildbook applies computer vision algorithms and deep learning to identify and track individual animals across hundreds of thousands of photos. We help researchers collaborate with each other and citizen scientists contribute to the effort. A.I. scales and speeds research and conservation. howItWorks1 = Step 1. Deep Learning Finds Animals -howItWorks1Description = We train computer vision to find individual whales and dolphins in photos and identify the species. +howItWorks1Description = We train computer vision to find individual animals in photos and identify the species. howItWorks2 = Step 2. Algorithms and Neural Networks Identify Individuals -howItWorks2Description = When we know where each animal is, we can identify them individually using algorithms that make digital "fingerprints" for each animal, such as identifying them by their unique body coloration or fin edges. We replace hours of human labor with just a few minutes of computer vision, scanning for matches across tens of thousands of photos. +howItWorks2Description = When we know where each animal is, we can identify them individually using algorithms that make digital "fingerprints" for each animal, looking for unique patterns. We replace hours of human labor with just a few minutes of computer vision, scanning for matches across tens of thousands of photos. howItWorks3 = One Platform, Many Species, Many Researchers howItWorks3Description = We can identify individuals of these species using fully automated computer vision: howItWorks4 = Step 3. Population Dynamics Define Conservation Action @@ -22,10 +22,10 @@ carouselMatching = \u0020Matching process carouselResult = \u0020Match result innerPhotoH3 = Photograph the ID area -innerPhotoP = Animals with patterned features can often be identified uniquely, such as by the distinctive shape of their fin or fluke coloration. By taking a picture, you can match that pattern to others already in the database. Your animal might be new to the database, or it might be a new sighting of one we have seen before! +innerPhotoP = Animals with patterned features can often be identified uniquely, such as by the distinctive coloration. By taking a picture, you can match that pattern to others already in the database. Your animal might be new to the database, or it might be a new sighting of one we have seen before! innerSubmitH3 = Submit PhotoID or sighting -innerSubmitP = You can upload files from your computer, or take them directly from your Flickr or Facebook account. Be sure to enter when and where you saw the animal, and add other information, such as species or sex, if you can. You will receive email updates when your animal is processed. +innerSubmitP = You can upload files from your computer. Be sure to enter when and where you saw the animal, and add other information, such as species or sex, if you can. You will receive email updates when your animal is processed. innerVerifyH3 = Researcher verification innerVerifyP = When you submit an identification photo, a local researcher receives a notification. This researcher will double check that the information you submitted is correct (so don't worry if you are unsure about which species you saw!). @@ -58,20 +58,20 @@ worldEncs = Encounters around the world # This is a text dense area, and formatting this way reduces the amount of # variables in props significantly. -adoptionHeader =
If you are not on site, there are still other ways to get engaged
+# adoptionHeader =If you are not on site, there are still other ways to get engaged
-adoptionBody =Donations, including in-kind, large or small, are always welcome. Your support helps the continued development of our project and can support effective, science-based conservation management, and safeguard these animals and their habitat.
Learn more about how to donateEven if a collaborative link has been made between users, Flukebook requests you to contact the data provider(s) for use of any and all data shared in a collaboration if it is to be used in any publication, product, or commercial application.
-By using Flukebook the user agrees to the following: +
Even if a collaborative link has been made between users, Wildbook requests you to contact the data provider(s) + for use of any and all data shared in a collaboration if it is to be used in any publication, product, or + commercial application.
+ +By using any Wildbook the user agrees to the following:
Our records indicate that you have not yet accepted the Usage Agreement. + Acceptance is required to use this resource. Please read the agreement below and click the "Accept" button + to proceed or "Reject" to decline and return to the home page.
+ <% } %> -%> - -Our records indicate that you have not yet accepted the Usage Agreement. Acceptance is required to use this resource. Please read the agreement below and click the "Accept" button to proceed or "Reject" to decline and return to the home page.
- <% - } - %> - -Welcome to Flukebook! Please read this Visitor Agreement. By using this web site, you accept its terms. This Visitor Agreement applies to any web page using the following domains, which are collectively known as the "Flukebook" or in shortened form "Wildbook": -
Welcome to the Wildbook community! Please read this Visitor Agreement. By using this web site, you accept + its terms. This Visitor Agreement applies to any Wildbook site maintained by the Wild Me team.
+The Internet is an evolving medium, and we may change the terms of this Visitor Agreement from time to + time. By continuing to use any Wild Me sites after we post any such changes, you accept the Visitor + Agreement, as modified. We may change, restrict access to, suspend or discontinue any Wildbook, or any + portion of a Wildbook, at any time.
-The Internet is an evolving medium, and we may change the terms of this Visitor Agreement from time to time. By continuing to use any Flukebook sites after we post any such changes, you accept the Visitor Agreement, as modified. We may change, restrict access to, suspend or discontinue Flukebook, or any portion of Flukebook, at any time. -
-- If you disagree with any material you find in Flukebook, we suggest that you respond by noting your disagreement in an email to webmaster at flukebook dot org. We invite you to bring to our attention any material you believe to be factually inaccurate. Please forward a copy of the material to our webmaster along with an explanation of your disagreement. -
-- If you are an owner of intellectual property who believes your intellectual property has been improperly posted or distributed via Flukebook, please notify us immediately by sending email to our webmaster. -
-- A link to another Web site does not constitute an endorsement of that site (nor of any product, service or other material offered on that site) by Flukebook or its participants. -
-No Framing. Without the prior written permission of Flukebook, you may not frame any of the content in Flukebook, or incorporate into another Web site or other service any intellectual property of Flukebook or its data contributors. Requests for permission to frame our content may be sent to: webmaster at flukebook dot org. -
-We work hard to make Flukebook interesting and informative, but we cannot guarantee that our users will always find everything to their liking. Please read this Disclaimer carefully before using Flukebook. -
-YOU AGREE THAT YOUR USE OF Flukebook IS AT YOUR SOLE RISK. BECAUSE OF THE NUMBER OF POSSIBLE SOURCES OF INFORMATION AVAILABLE THROUGHOUT, AND THE INHERENT HAZARDS AND UNCERTAINTIES OF ELECTRONIC DISTRIBUTION, THERE MAY BE DELAYS, OMISSIONS, INACCURACIES OR OTHER PROBLEMS WITH SUCH INFORMATION. IF YOU RELY ON ANY Wildbook MATERIAL, YOU DO SO AT YOUR OWN RISK. YOU UNDERSTAND THAT YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR LOSS OF DATA THAT RESULTS FROM ANY MATERIAL AND/OR DATA DOWNLOADED FROM OR OTHERWISE PROVIDED THROUGH Flukebook. Flukebook IS PROVIDED TO YOU AS IS, WITH ALL FAULTS, AND AS AVAILABLE. UNDER NO CIRCUMSTANCES SHALL THE PARTICIPANTS, PROGRAMMERS, AND CONSULTANTS IN Flukebook BE LIABLE TO YOU OR ANYONE ELSE FOR ANY DAMAGES ARISING OUT OF USE OF Flukebook, INCLUDING, WITHOUT LIMITATION, LIABILITY FOR CONSEQUENTIAL, SPECIAL, INCIDENTAL, INDIRECT OR SIMILAR DAMAGES, EVEN IF WE ARE ADVISED BEFOREHAND OF THE POSSIBILITY OF SUCH DAMAGES. (BECAUSE SOME STATES DO NOT ALLOW THE EXCLUSION OR LIMITATION OF CERTAIN CATEGORIES OF DAMAGES, THE ABOVE LIMITATION MAY NOT APPLY TO YOU. IN SUCH STATES, THE LIABILITY OF WILD ME AND ITS STAFF AND AFFILIATES IS LIMITED TO THE FULLEST EXTENT PERMITTED BY SUCH STATE LAW.) -
-Flukebook staff does its best to ensure that information we post to Flukebook is timely, accurate, and scientifically valuable. To obtain access to certain services of Flukebook, you may be given an opportunity to register with Flukebook. As part of any such registration process, you will be provided an user name and a password. You agree that the information you supply during that registration process will be accurate and complete and that you will not register under the name of, or attempt to enter Flukebook under the name of, another person. You will be responsible for preserving the confidentiality of your password, sharing it with no one else without express permission, and will notify the staff of Flukebook of any known or suspected unauthorized use of your account. You agree to indemnify, defend and hold harmless Wild Me, its affiliates and participants, and their officers, directors, employees, agents, licensors and suppliers, from and against any and all losses, expenses, damages and costs (including reasonable attorneys' fees) resulting from any violation of this Visitor Agreement or any activity related to your account (including negligent or wrongful conduct) by you or any other person accessing Flukebook using your account. -
-In the event that any portion of this Visitor Agreement is found to be invalid or unenforceable for any reason, such invalidity or unenforceability shall not affect the enforceability or validity of any other portion of this Visitor Agreement, which shall remain in full force and effect and be construed as if the invalid or unenforceable portion were not part of the Visitor Agreement. -
-- By using Flukebook, you agree to abide by the terms of this Visitor Agreement. -
-We hope you enjoy using Flukebook, and we welcome suggestions for improvements. -
-- Thanks for your support! -
-Last updated: June 16, 2015 -
- <% - if((request.getParameter("username")!=null)&&(request.getParameter("password")!=null)){ - %> -I HAVE READ AND UNDERSTAND THIS AGREEMENT AND AGREE TO BE BOUND BY ALL OF ITS TERMS.
- <% - } - else{ - %> -YOU WILL BE ASKED TO READ, UNDERSTAND AND AGREE TO BE BOUND BY ALL OF THE TERMS OF THIS AGREEMENT BEFORE BEING ISSUED AN ACCOUNT.
- <% - - - } - %> - -- - | -- |
+ If you disagree with any material you find in a Wildbook, we suggest that you respond by noting your + disagreement in an email to info at wildme dot org. We invite you to bring to our attention any material you + believe to be factually inaccurate. Please forward a copy of the material to our webmaster along with an + explanation of your disagreement.
- <% - } - %> -+ If you are an owner of intellectual property who believes your intellectual property has been improperly + posted or distributed via Wildbook, please notify us immediately by sending email to our webmaster. +
++ A link to another Web site does not constitute an endorsement of that site (nor of any product, service or + other material offered on that site) by this Wildbook or its participants. +
+No Framing. Without the prior written permission of Wild Me or CXL, you may not frame any of the content in + Wildbook, or incorporate into another Web site or other service any intellectual property of Wildbook or its + data contributors. Requests for permission to frame our content may be sent to: info at wildme dot org. +
+We work hard to make Wildbook interesting and informative, but we cannot guarantee that our users will + always find everything to their liking. Please read this Disclaimer carefully before using Wildbook. +
+YOU AGREE THAT YOUR USE OF Wildbook IS AT YOUR SOLE RISK. BECAUSE OF THE NUMBER OF POSSIBLE SOURCES OF + INFORMATION AVAILABLE THROUGHOUT, AND THE INHERENT HAZARDS AND UNCERTAINTIES OF ELECTRONIC DISTRIBUTION, + THERE MAY BE DELAYS, OMISSIONS, INACCURACIES OR OTHER PROBLEMS WITH SUCH INFORMATION. IF YOU RELY ON ANY + Wildbook MATERIAL, YOU DO SO AT YOUR OWN RISK. YOU UNDERSTAND THAT YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE + TO YOUR COMPUTER SYSTEM OR LOSS OF DATA THAT RESULTS FROM ANY MATERIAL AND/OR DATA DOWNLOADED FROM OR + OTHERWISE PROVIDED THROUGH Wildbook. Wildbook IS PROVIDED TO YOU AS IS, WITH ALL FAULTS, AND AS AVAILABLE. + UNDER NO CIRCUMSTANCES SHALL THE PARTICIPANTS, PROGRAMMERS, AND CONSULTANTS IN Wildbook BE LIABLE TO YOU OR + ANYONE ELSE FOR ANY DAMAGES ARISING OUT OF USE OF Wildbook, INCLUDING, WITHOUT LIMITATION, LIABILITY FOR + CONSEQUENTIAL, SPECIAL, INCIDENTAL, INDIRECT OR SIMILAR DAMAGES, EVEN IF WE ARE ADVISED BEFOREHAND OF THE + POSSIBILITY OF SUCH DAMAGES. (BECAUSE SOME STATES DO NOT ALLOW THE EXCLUSION OR LIMITATION OF CERTAIN + CATEGORIES OF DAMAGES, THE ABOVE LIMITATION MAY NOT APPLY TO YOU. IN SUCH STATES, THE LIABILITY OF WILD ME + AND ITS STAFF AND AFFILIATES IS LIMITED TO THE FULLEST EXTENT PERMITTED BY SUCH STATE LAW.) +
+Wild Me staff does its best to ensure that information we post to this Wildbook is timely, accurate, and + scientifically valuable. To obtain access to certain services of Wildbook, you may be given an opportunity + to register with Wildbook. As part of any such registration process, you will be provided an user name and + a password. You agree that the information you supply during that registration process will be accurate and + complete and that you will not register under the name of, or attempt to enter Wildbook under the name of, + another person. You will be responsible for preserving the confidentiality of your password, sharing it with + no one else without express permission, and will notify the staff of Wild Me of any known or suspected + unauthorized use of your account. You agree to indemnify, defend and hold harmless Wild Me, its affiliates + and participants, and their officers, directors, employees, agents, licensors and suppliers, from and + against any and all losses, expenses, damages and costs (including reasonable attorneys' fees) resulting + from any violation of this Visitor Agreement or any activity related to your account (including negligent or + wrongful conduct) by you or any other person accessing Wildbook using your account. +
+In the event that any portion of this Visitor Agreement is found to be invalid or unenforceable for any + reason, such invalidity or unenforceability shall not affect the enforceability or validity of any other + portion of this Visitor Agreement, which shall remain in full force and effect and be construed as if the + invalid or unenforceable portion were not part of the Visitor Agreement. +
++ By using Wildbook, you agree to abide by the terms of this Visitor Agreement. +
+We hope you enjoy using Wildbook, and we welcome suggestions for improvements. +
++ Thanks for your support! +
+Last updated: July 31, 2024 +
+ <% if((request.getParameter("username")!=null)&&(request.getParameter("password")!=null)){ %> +I HAVE READ AND UNDERSTAND THIS AGREEMENT AND AGREE TO BE BOUND BY ALL OF ITS TERMS.
+ <% } else{ %> +YOU WILL BE ASKED TO READ, UNDERSTAND AND AGREE TO BE BOUND BY ALL OF THE TERMS OF THIS + AGREEMENT BEFORE BEING ISSUED AN ACCOUNT.
+ <% } %> + ++
+ + | ++ + | +