From 049bfc15d5edef73b17f5ab746a7e6d5f6419992 Mon Sep 17 00:00:00 2001 From: Dagmara Date: Wed, 21 Sep 2022 18:04:39 +0100 Subject: [PATCH 1/6] feat: add mobile privacy policy --- app/controllers/mobile_controller.rb | 5 +- app/views/mobile/privacy_policy.html.erb | 9 ++-- config/locales/en.yml | 64 ++++++++++++++++++++++-- config/routes.rb | 6 +-- 4 files changed, 70 insertions(+), 14 deletions(-) diff --git a/app/controllers/mobile_controller.rb b/app/controllers/mobile_controller.rb index 67d049ed3..c59cfcadc 100644 --- a/app/controllers/mobile_controller.rb +++ b/app/controllers/mobile_controller.rb @@ -4,7 +4,6 @@ class MobileController < ApplicationController def terms_and_conditions end - # TODO: uncomment when privacy policy content is updated - # def privacy_policy - # end + def privacy_policy + end end diff --git a/app/views/mobile/privacy_policy.html.erb b/app/views/mobile/privacy_policy.html.erb index 395032a7e..e9c558808 100644 --- a/app/views/mobile/privacy_policy.html.erb +++ b/app/views/mobile/privacy_policy.html.erb @@ -1,6 +1,9 @@
+
+

Species+

+

<%= t('mobile.privacy.hero') %>

+
-
- \ No newline at end of file + <%= t('mobile.privacy.body').html_safe %> + \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index 8efef4044..fcc517555 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -94,7 +94,7 @@ en: checklist_url: http://checklist.cites.org disclaimer_left: "

- The CITES Identification Manual is a collection of data sheets designed to help identify various species of fauna and flora with drawings, photographs, maps and concise descriptions. The manual’s sheets were published over a 29 year period, from 1980–2009. All sheets are provided as originally published, and, as such, no warranty of any kind is given as to the completeness or accuracy of their content. Identification materials are not available for every species, and may be absent particularly for species listed in the CITES Appendices after 2009. + The CITES Identification Manual is a collection of data sheets designed to help identify various species of fauna and flora with drawings, photographs, maps and concise descriptions. The manual's sheets were published over a 29 year period, from 1980–2009. All sheets are provided as originally published, and, as such, no warranty of any kind is given as to the completeness or accuracy of their content. Identification materials are not available for every species, and may be absent particularly for species listed in the CITES Appendices after 2009.

Users should note that the CITES listing and taxonomy of taxa described in the materials may have changed since the materials were first published. For current CITES nomenclature and listing information, please refer to the main Checklist of CITES Species site (and dedicated downloads for listings/names) and Species+. @@ -122,8 +122,7 @@ en: copyright_text: 2020 Secretariat of the Convention on International Trade in Endangered Species of Wild Fauna and Flora mobile: - terms: - title: "Terms of Use" + terms: hero: "Terms & Conditions" body: '

@@ -167,7 +166,7 @@ en:

8. No warranty and waiver of liability

-

While UNEP strives to ensure accuracy and keep the Materials up-to-date, the Materials are provided to the User ‘as is’ and no warranty of any kind is given as to its completeness or accuracy . All warranties, representations and conditions, express or implied, are hereby excluded to the fullest extent permitted. The User agrees to download and make use of the Materials entirely at his or her own risk. The User waives and releases UNEP from any liability whatsoever, wherever and howsoever arising in connection with any use of the Materials or Derivative Works. UNEP will not be liable on any grounds (including without limitation negligence, strict liability or under any other legal theory) for any loss or damage (direct or indirect) incurred by the User or any third party as a result of the use of the Materials or any Derivative Works. The User also indemnifies and holds harmless UNEP in respect of any loss or damage (direct or indirect) suffered by any third party as a result of any use by that third party of any Materials or Derivative Works published by the User. Without limitation to the above, any damage occurring to computer systems or loss of data as a result of the use of the Species+/CITES Checklist API or attempts to download Materials is entirely the User’s responsibility.

+

While UNEP strives to ensure accuracy and keep the Materials up-to-date, the Materials are provided to the User ‘as is' and no warranty of any kind is given as to its completeness or accuracy . All warranties, representations and conditions, express or implied, are hereby excluded to the fullest extent permitted. The User agrees to download and make use of the Materials entirely at his or her own risk. The User waives and releases UNEP from any liability whatsoever, wherever and howsoever arising in connection with any use of the Materials or Derivative Works. UNEP will not be liable on any grounds (including without limitation negligence, strict liability or under any other legal theory) for any loss or damage (direct or indirect) incurred by the User or any third party as a result of the use of the Materials or any Derivative Works. The User also indemnifies and holds harmless UNEP in respect of any loss or damage (direct or indirect) suffered by any third party as a result of any use by that third party of any Materials or Derivative Works published by the User. Without limitation to the above, any damage occurring to computer systems or loss of data as a result of the use of the Species+/CITES Checklist API or attempts to download Materials is entirely the User's responsibility.

9. Disclaimer

@@ -189,4 +188,59 @@ en:

13. Communication

Any communication with respect to these Terms and Conditions and any issue arising from them shall be in writing in English and sent by email. The address for communication with the Species+/CITES Checklist API supplier is species@unep-wcmc.org.

- ' \ No newline at end of file + ' + privacy: + hero: "Privacy Policy" + body: ' +
+

Privacy Policy

+

At UNEP-WCMC, we are committed to being transparent about the use of the User's personal data. Species+ and the Species+ app (hereafter also referred to as the Service) are provided by UNEP-WCMC at no cost and is intended for use as is. This page is used to inform visitors of our policies for the collection, use, and disclosure of Users' personal data. If you choose to use Species+ or the Species+ app, you agree to the collection and use of information in relation to this policy. Further information on the terms and conditions of use of Species+ data can be found in our Terms of Use.

+
+
+

Information Collection and Use

+

We take the User's privacy very seriously and only store data where necessary to improve usability of Species+ and the Species+ app, to keep the site/app secure and problem free, and to track impact for ourselves and our partners. The User's data will be stored securely and will not be sold to third parties; data will be deleted after one year.

+

Our web hosting provider keeps logs of connections to the Species+ API so that we can detect and prevent malicious activity. The logs contain your IP address (which can reveal your geographical location), the date and time of your connection, the data you have requested, and the browser you're using (which can reveal the device you're using as well). We make no use of this data on an individual level unless the traffic looks like an attack on the web service, in which case we will block the connection.

+

It's in our interest – and yours – that our site and app is secure and working properly, so this processing of personal data is done based on legitimate interests.

+

‍‍To request that your data is deleted from our servers, please contact us on species@unep-wcmc.org.

+
+
+

Cookies‍

+

We use cookies to help identify your computer so that we can optimise the user experience.

+

This Species+ app does not use these cookies explicitly. The Species+ site uses the following cookies:

+ +

+
+
+

‍‍Service Providers

+

‍We may employ third-party companies and individuals due to the following reasons:

+ +

These third parties will have access to the User's data to perform the tasks assigned to them on our behalf. However, they are obligated not to disclose or use the information for any other purpose.

+
+
+

‍‍Security

+

‍While we strive to protect your personal data, please note that no method of transmission over the internet, or method of electronic storage is 100% secure and reliable, and we cannot guarantee its absolute security.

+
+
+

‍‍Links to Other Sites

+

‍This Site may contain links and references to third-party web sites. The linked sites are not under the control of UNEP or WCMC, and UNEP or WCMC are not responsible for, nor do they endorse, any of their content, privacy policies or practices.

+
+
+

Changes to this Privacy Policy

+

‍We reserve the right to update our Privacy Policy from time to time. Thus, you are advised to review this page periodically for any changes. We will notify you of any changes by posting the new Privacy Policy on this page.

+

This current policy is effective as of 2022-XX-XX.

+
+
+

Contact Us

+

‍If you have any questions about our Privacy Policy, please contact us at species@unep-wcmc.org.

+
+ ' diff --git a/config/routes.rb b/config/routes.rb index 46b82224d..454cfc0d3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,4 @@ SAPI::Application.routes.draw do - get "mobile/terms_and_conditions" - # TODO: uncomment when privacy policy content is updated - # get "mobile/privacy_policy" devise_for :users, :controllers => { :passwords => "passwords", :registrations => "registrations", :sessions => "sessions" } as :user do get 'users/edit' => 'registrations#edit', :as => 'edit_user_registratione' @@ -9,6 +6,9 @@ post 'users' => 'registrations#create', :as => 'user_registration_create' end + get "mobile/terms_and_conditions" + get "mobile/privacy_policy" + get 'about' => 'pages#about' get 'terms-of-use' => 'pages#terms_of_use' get 'eu_legislation' => 'pages#eu_legislation' From ac84077be4d1955b61ebbb1b194a9938f089b98e Mon Sep 17 00:00:00 2001 From: Dagmara Date: Wed, 21 Sep 2022 18:06:32 +0100 Subject: [PATCH 2/6] feat: add hyperlink --- config/locales/en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index fcc517555..50372dbf0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -194,7 +194,7 @@ en: body: '

Privacy Policy

-

At UNEP-WCMC, we are committed to being transparent about the use of the User's personal data. Species+ and the Species+ app (hereafter also referred to as the Service) are provided by UNEP-WCMC at no cost and is intended for use as is. This page is used to inform visitors of our policies for the collection, use, and disclosure of Users' personal data. If you choose to use Species+ or the Species+ app, you agree to the collection and use of information in relation to this policy. Further information on the terms and conditions of use of Species+ data can be found in our Terms of Use.

+

At UNEP-WCMC, we are committed to being transparent about the use of the User's personal data. Species+ and the Species+ app (hereafter also referred to as the Service) are provided by UNEP-WCMC at no cost and is intended for use as is. This page is used to inform visitors of our policies for the collection, use, and disclosure of Users' personal data. If you choose to use Species+ or the Species+ app, you agree to the collection and use of information in relation to this policy. Further information on the terms and conditions of use of Species+ data can be found in our Terms of Use.

Information Collection and Use

@@ -241,6 +241,6 @@ en:

Contact Us

-

‍If you have any questions about our Privacy Policy, please contact us at species@unep-wcmc.org.

+

‍If you have any questions about our Privacy Policy, please contact us at species@unep-wcmc.org.

' From bc86606da7dcd55ea7afa011d3fcb2d91325481b Mon Sep 17 00:00:00 2001 From: Dagmara Date: Wed, 21 Sep 2022 18:11:39 +0100 Subject: [PATCH 3/6] fix: links in markup --- config/locales/en.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 50372dbf0..1ec02ccc1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -127,13 +127,13 @@ en: body: '

1. Introduction

-

Access to the information, data and attribute data provided through the Species+ website and the Species+/CITES Checklist API (the "Materials") is provided to the User on the understanding that the User reads and consents to be bound to the Terms and Conditions set out below. For the purposes of this Agreement Materials comprise all the species lists, checklists and other information made available for download via the API and contained within any part of the Species+ website.

+

Access to the information, data and attribute data provided through the Species+ website and the Species+/CITES Checklist API (the "Materials") is provided to the User on the understanding that the User reads and consents to be bound to the Terms and Conditions set out below. For the purposes of this Agreement Materials comprise all the species lists, checklists and other information made available for download via the API and contained within any part of the Species+ website.

PLEASE READ THESE TERMS AND CONDITIONS CAREFULLY. IF YOU DO NOT AGREE TO ANY OF THE TERMS AND CONDITIONS DO NOT DOWNLOAD DATA OR MAKE USE OF THE SPECIES+/CITES CHECKLIST API. BY DOWNLOADING THE MATERIALS MADE AVAILABLE ON SPECIES+ AND/OR USING THE SPECIES+/CITES CHECKLIST API THE USER ACCEPTS AND AGREES TO COMPLY WITH THE TERMS AND CONDITIONS BELOW.

2. Publishing

- You may publish the Materials in whole or in part including on-line providing (a) the Materials are not downloadable and (b) the proper attribution is clearly visible (see clause 5 below). You must ensure that the most recently available version of the Materials is being used and that the date of download is visible in the published version. Materials published online must provide a clear link to the original on-line source (www.speciesplus.net). We strongly recommend that you have the relevant materials reviewed by UNEP prior to publication via email to species@unep-wcmc.org. We require two electronic copies of all published materials to be provided without cost to UNEP via email to + You may publish the Materials in whole or in part including on-line providing (a) the Materials are not downloadable and (b) the proper attribution is clearly visible (see clause 5 below). You must ensure that the most recently available version of the Materials is being used and that the date of download is visible in the published version. Materials published online must provide a clear link to the original on-line source (www.speciesplus.net). We strongly recommend that you have the relevant materials reviewed by UNEP prior to publication via email to species@unep-wcmc.org. We require two electronic copies of all published materials to be provided without cost to UNEP via email to species@unep-wcmc.org.

@@ -153,7 +153,7 @@ en:

UNEP (2022). The Species+ Website. Nairobi, Kenya.

Compiled by UNEP-WCMC, Cambridge, UK.

-

Available at: www.speciesplus.net.

+

Available at: www.speciesplus.net.

[Accessed (please insert date of download dd/mm/yyyy)].

@@ -194,7 +194,7 @@ en: body: '

Privacy Policy

-

At UNEP-WCMC, we are committed to being transparent about the use of the User's personal data. Species+ and the Species+ app (hereafter also referred to as the Service) are provided by UNEP-WCMC at no cost and is intended for use as is. This page is used to inform visitors of our policies for the collection, use, and disclosure of Users' personal data. If you choose to use Species+ or the Species+ app, you agree to the collection and use of information in relation to this policy. Further information on the terms and conditions of use of Species+ data can be found in our Terms of Use.

+

At UNEP-WCMC, we are committed to being transparent about the use of the User's personal data. Species+ and the Species+ app (hereafter also referred to as the Service) are provided by UNEP-WCMC at no cost and is intended for use as is. This page is used to inform visitors of our policies for the collection, use, and disclosure of Users' personal data. If you choose to use Species+ or the Species+ app, you agree to the collection and use of information in relation to this policy. Further information on the terms and conditions of use of Species+ data can be found in our Terms of Use.

Information Collection and Use

From 712e748ba264c32e0f4f80672ce3d4a51608f322 Mon Sep 17 00:00:00 2001 From: Dagmara Date: Thu, 22 Sep 2022 10:42:21 +0100 Subject: [PATCH 4/6] refactor: move markup structure to a block in .erb tamplates --- app/views/mobile/privacy_policy.html.erb | 5 +- .../mobile/terms_and_conditions.html.erb | 5 +- config/locales/en.yml | 231 +++++++++--------- 3 files changed, 121 insertions(+), 120 deletions(-) diff --git a/app/views/mobile/privacy_policy.html.erb b/app/views/mobile/privacy_policy.html.erb index e9c558808..5c5f49d96 100644 --- a/app/views/mobile/privacy_policy.html.erb +++ b/app/views/mobile/privacy_policy.html.erb @@ -5,5 +5,8 @@
- <%= t('mobile.privacy.body').html_safe %> + <% t('mobile.privacy.body').each do |section| %> +

<%= section[:title]&.html_safe %>

+ <%= section[:description]&.html_safe %> + <% end %>
\ No newline at end of file diff --git a/app/views/mobile/terms_and_conditions.html.erb b/app/views/mobile/terms_and_conditions.html.erb index 348e82ec3..c544b9518 100644 --- a/app/views/mobile/terms_and_conditions.html.erb +++ b/app/views/mobile/terms_and_conditions.html.erb @@ -5,5 +5,8 @@
- <%= t('mobile.terms.body').html_safe %> + <% t('mobile.privacy.body').each do |section| %> +

<%= section[:title]&.html_safe %>

+ <%= section[:description]&.html_safe %> + <% end %>
\ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index 1ec02ccc1..8a642cd5b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -124,123 +124,118 @@ en: mobile: terms: hero: "Terms & Conditions" - body: ' -
-

1. Introduction

-

Access to the information, data and attribute data provided through the Species+ website and the Species+/CITES Checklist API (the "Materials") is provided to the User on the understanding that the User reads and consents to be bound to the Terms and Conditions set out below. For the purposes of this Agreement Materials comprise all the species lists, checklists and other information made available for download via the API and contained within any part of the Species+ website.

-

PLEASE READ THESE TERMS AND CONDITIONS CAREFULLY. IF YOU DO NOT AGREE TO ANY OF THE TERMS AND CONDITIONS DO NOT DOWNLOAD DATA OR MAKE USE OF THE SPECIES+/CITES CHECKLIST API. BY DOWNLOADING THE MATERIALS MADE AVAILABLE ON SPECIES+ AND/OR USING THE SPECIES+/CITES CHECKLIST API THE USER ACCEPTS AND AGREES TO COMPLY WITH THE TERMS AND CONDITIONS BELOW.

-
-
-

2. Publishing

-

- You may publish the Materials in whole or in part including on-line providing (a) the Materials are not downloadable and (b) the proper attribution is clearly visible (see clause 5 below). You must ensure that the most recently available version of the Materials is being used and that the date of download is visible in the published version. Materials published online must provide a clear link to the original on-line source (www.speciesplus.net). We strongly recommend that you have the relevant materials reviewed by UNEP prior to publication via email to species@unep-wcmc.org. We require two electronic copies of all published materials to be provided without cost to UNEP via email to - species@unep-wcmc.org. -

-
-
-

3. No sub-licensing or redistribution

-

The Materials may not be sub-licensed in whole or in part including within Derivative Works without the prior written permission of UNEP. You may not redistribute the Materials in whole or in part by any means including (but not limited to) electronic formats such as web downloads, through web services or through file transfer protocols. You may not use the Materials for any application that replicates or attempts to replace the essential user experience of Speciesplus.net. You may not attempt to cloak or conceal your identity or your application's identity when requesting authorization to use the Species+/CITES Checklist API.

-

If you know of others who wish to use the Materials or if you wish to provide a service through which the Materials are downloadable or otherwise made available for redistribution you must contact species@unep-wcmc.org for permission and further guidance.

-
-
-

4. No commercial use

-

Neither (a) the Materials nor (b) any work derived from or based upon the Materials (“Derivative Works”) may be put to Commercial Use without the prior written permission of UNEP. For the purposes of these Terms and Conditions “Commercial Use” means a) any use for profit or to generate revenue, or b) any use by an individual or entity operating within or on behalf of or to the benefit of or to assist the activities of any entity other than a not-for-profit organisation.

-

To apply for permission for Commercial Use of the Materials please send an email to species@unep-wcmc.org outlining your needs.

-
-
-

5. Attribution

-

Neither (a) the Materials nor (b) any work derived from or You must ensure that the citation set out below is always clearly reproduced in any publication or analysis involving the Species+ data, in any derived form or format:

-
-

UNEP (2022). The Species+ Website. Nairobi, Kenya.

-

Compiled by UNEP-WCMC, Cambridge, UK.

-

Available at: www.speciesplus.net.

-

[Accessed (please insert date of download dd/mm/yyyy)].

-
-
-

6. No grant of intellectual property rights

-

No rights in the Materials are granted to the User by virtue of these Terms and Conditions or as a result of any use of the Materials.

-
-
-

7. Access restriction

-

UNEP reserves the right to disable access to the Materials including the Species+/CITES Checklist API at any time without prior notice.

-
-
-

8. No warranty and waiver of liability

-

While UNEP strives to ensure accuracy and keep the Materials up-to-date, the Materials are provided to the User ‘as is' and no warranty of any kind is given as to its completeness or accuracy . All warranties, representations and conditions, express or implied, are hereby excluded to the fullest extent permitted. The User agrees to download and make use of the Materials entirely at his or her own risk. The User waives and releases UNEP from any liability whatsoever, wherever and howsoever arising in connection with any use of the Materials or Derivative Works. UNEP will not be liable on any grounds (including without limitation negligence, strict liability or under any other legal theory) for any loss or damage (direct or indirect) incurred by the User or any third party as a result of the use of the Materials or any Derivative Works. The User also indemnifies and holds harmless UNEP in respect of any loss or damage (direct or indirect) suffered by any third party as a result of any use by that third party of any Materials or Derivative Works published by the User. Without limitation to the above, any damage occurring to computer systems or loss of data as a result of the use of the Species+/CITES Checklist API or attempts to download Materials is entirely the User's responsibility.

-
-
-

9. Disclaimer

-

The contents of this website do not necessarily reflect the views or policies of UNEP, contributory organisations or editors. The designations employed and the presentation of material on this map do not imply the expression of any opinion whatsoever on the part of UNEP, the CITES and CMS Secretariats and the Secretariat of the United Nations concerning the legal status of any country, territory, city or area or of its authorities, or concerning the delimitation of its frontiers or boundaries.

-
-
-

10. Feedback

-

The User agrees to provide feedback on the quality, reliability and accuracy of the Materials where these may become apparent.

-
-
-

11. Changes to these terms and conditions

-

UNEP reserves the right to vary these Terms and Conditions from time to time without notice. Therefore please ensure that you read these Terms and Conditions each time you download Materials or implement the Species+/CITES Checklist API in an application. By downloading Materials or using the Species+/CITES Checklist API you signify your acceptance of the most recent version of these Terms and Conditions in full.

-
-
-

12. Dispute resolution

-

Any dispute arising out of or in connection with any use of the Materials shall be settled by amicable negotiation with the Species+/CITES Checklist API supplier. Should attempts at amicable negotiation fail any such dispute shall, upon request by either the User or UNEP, be referred to arbitration in accordance with the UNCITRAL arbitration rules then prevailing.

-
-
-

13. Communication

-

Any communication with respect to these Terms and Conditions and any issue arising from them shall be in writing in English and sent by email. The address for communication with the Species+/CITES Checklist API supplier is species@unep-wcmc.org.

-
- ' + body: + - + title: '1. Introduction' + description: ' +

Access to the information, data and attribute data provided through the Species+ website and the Species+/CITES Checklist API (the "Materials") is provided to the User on the understanding that the User reads and consents to be bound to the Terms and Conditions set out below. For the purposes of this Agreement Materials comprise all the species lists, checklists and other information made available for download via the API and contained within any part of the Species+ website.

+

PLEASE READ THESE TERMS AND CONDITIONS CAREFULLY. IF YOU DO NOT AGREE TO ANY OF THE TERMS AND CONDITIONS DO NOT DOWNLOAD DATA OR MAKE USE OF THE SPECIES+/CITES CHECKLIST API. BY DOWNLOADING THE MATERIALS MADE AVAILABLE ON SPECIES+ AND/OR USING THE SPECIES+/CITES CHECKLIST API THE USER ACCEPTS AND AGREES TO COMPLY WITH THE TERMS AND CONDITIONS BELOW.

+ ' + - + title: '2. Publishing' + description: ' +

+ You may publish the Materials in whole or in part including on-line providing (a) the Materials are not downloadable and (b) the proper attribution is clearly visible (see clause 5 below). You must ensure that the most recently available version of the Materials is being used and that the date of download is visible in the published version. Materials published online must provide a clear link to the original on-line source (www.speciesplus.net). We strongly recommend that you have the relevant materials reviewed by UNEP prior to publication via email to species@unep-wcmc.org. We require two electronic copies of all published materials to be provided without cost to UNEP via email to + species@unep-wcmc.org. +

+ ' + - + title: '3. No sub-licensing or redistribution' + description: ' +

The Materials may not be sub-licensed in whole or in part including within Derivative Works without the prior written permission of UNEP. You may not redistribute the Materials in whole or in part by any means including (but not limited to) electronic formats such as web downloads, through web services or through file transfer protocols. You may not use the Materials for any application that replicates or attempts to replace the essential user experience of Speciesplus.net. You may not attempt to cloak or conceal your identity or your application's identity when requesting authorization to use the Species+/CITES Checklist API.

+

If you know of others who wish to use the Materials or if you wish to provide a service through which the Materials are downloadable or otherwise made available for redistribution you must contact species@unep-wcmc.org for permission and further guidance.

+ ' + - + title: '4. No commercial use' + description: ' +

Neither (a) the Materials nor (b) any work derived from or based upon the Materials (“Derivative Works”) may be put to Commercial Use without the prior written permission of UNEP. For the purposes of these Terms and Conditions “Commercial Use” means a) any use for profit or to generate revenue, or b) any use by an individual or entity operating within or on behalf of or to the benefit of or to assist the activities of any entity other than a not-for-profit organisation.

+

To apply for permission for Commercial Use of the Materials please send an email to species@unep-wcmc.org outlining your needs.

+ ' + - + title: '5. Attribution' + description: ' +

Neither (a) the Materials nor (b) any work derived from or You must ensure that the citation set out below is always clearly reproduced in any publication or analysis involving the Species+ data, in any derived form or format:

+
+

UNEP (2022). The Species+ Website. Nairobi, Kenya.

+

Compiled by UNEP-WCMC, Cambridge, UK.

+

Available at: www.speciesplus.net.

+

[Accessed (please insert date of download dd/mm/yyyy)].

+ ' + - + title: '6. No grant of intellectual property rights' + description: '

No rights in the Materials are granted to the User by virtue of these Terms and Conditions or as a result of any use of the Materials.

' + - + title: '7. Access restriction' + description: '

UNEP reserves the right to disable access to the Materials including the Species+/CITES Checklist API at any time without prior notice.

' + - + title: '8. No warranty and waiver of liability' + description: '

While UNEP strives to ensure accuracy and keep the Materials up-to-date, the Materials are provided to the User ‘as is' and no warranty of any kind is given as to its completeness or accuracy . All warranties, representations and conditions, express or implied, are hereby excluded to the fullest extent permitted. The User agrees to download and make use of the Materials entirely at his or her own risk. The User waives and releases UNEP from any liability whatsoever, wherever and howsoever arising in connection with any use of the Materials or Derivative Works. UNEP will not be liable on any grounds (including without limitation negligence, strict liability or under any other legal theory) for any loss or damage (direct or indirect) incurred by the User or any third party as a result of the use of the Materials or any Derivative Works. The User also indemnifies and holds harmless UNEP in respect of any loss or damage (direct or indirect) suffered by any third party as a result of any use by that third party of any Materials or Derivative Works published by the User. Without limitation to the above, any damage occurring to computer systems or loss of data as a result of the use of the Species+/CITES Checklist API or attempts to download Materials is entirely the User's responsibility.

' + - + title: '9. Disclaimer' + description: '

The contents of this website do not necessarily reflect the views or policies of UNEP, contributory organisations or editors. The designations employed and the presentation of material on this map do not imply the expression of any opinion whatsoever on the part of UNEP, the CITES and CMS Secretariats and the Secretariat of the United Nations concerning the legal status of any country, territory, city or area or of its authorities, or concerning the delimitation of its frontiers or boundaries.

' + - + title: '10. Feedback' + description: '

The User agrees to provide feedback on the quality, reliability and accuracy of the Materials where these may become apparent.

' + - + title: '11. Changes to these terms and conditions' + description: '

UNEP reserves the right to vary these Terms and Conditions from time to time without notice. Therefore please ensure that you read these Terms and Conditions each time you download Materials or implement the Species+/CITES Checklist API in an application. By downloading Materials or using the Species+/CITES Checklist API you signify your acceptance of the most recent version of these Terms and Conditions in full.

' + - + title: '12. Dispute resolution' + description: '

Any dispute arising out of or in connection with any use of the Materials shall be settled by amicable negotiation with the Species+/CITES Checklist API supplier. Should attempts at amicable negotiation fail any such dispute shall, upon request by either the User or UNEP, be referred to arbitration in accordance with the UNCITRAL arbitration rules then prevailing.

' + - + title: '13. Communication' + description: '

Any communication with respect to these Terms and Conditions and any issue arising from them shall be in writing in English and sent by email. The address for communication with the Species+/CITES Checklist API supplier is species@unep-wcmc.org.

' + privacy: hero: "Privacy Policy" - body: ' -
-

Privacy Policy

-

At UNEP-WCMC, we are committed to being transparent about the use of the User's personal data. Species+ and the Species+ app (hereafter also referred to as the Service) are provided by UNEP-WCMC at no cost and is intended for use as is. This page is used to inform visitors of our policies for the collection, use, and disclosure of Users' personal data. If you choose to use Species+ or the Species+ app, you agree to the collection and use of information in relation to this policy. Further information on the terms and conditions of use of Species+ data can be found in our Terms of Use.

-
-
-

Information Collection and Use

-

We take the User's privacy very seriously and only store data where necessary to improve usability of Species+ and the Species+ app, to keep the site/app secure and problem free, and to track impact for ourselves and our partners. The User's data will be stored securely and will not be sold to third parties; data will be deleted after one year.

-

Our web hosting provider keeps logs of connections to the Species+ API so that we can detect and prevent malicious activity. The logs contain your IP address (which can reveal your geographical location), the date and time of your connection, the data you have requested, and the browser you're using (which can reveal the device you're using as well). We make no use of this data on an individual level unless the traffic looks like an attack on the web service, in which case we will block the connection.

-

It's in our interest – and yours – that our site and app is secure and working properly, so this processing of personal data is done based on legitimate interests.

-

‍‍To request that your data is deleted from our servers, please contact us on species@unep-wcmc.org.

-
-
-

Cookies‍

-

We use cookies to help identify your computer so that we can optimise the user experience.

-

This Species+ app does not use these cookies explicitly. The Species+ site uses the following cookies:

-
    -
  • -

    Third-party Cookies, which include but are not limited to:

    -

    Google Analytics - we use Google Analytics to collect data about the website's usage. This data will track the pages the User visits and record other User data such as how long you spend on each page. It does not include personal information. You can view the Google Privacy Policy here: https://policies.google.com/privacy.

    -
    • -
-

-
-
-

‍‍Service Providers

-

‍We may employ third-party companies and individuals due to the following reasons:

-
    -
  • To facilitate our Service;
    • -
  • To provide the Service on our behalf;
    • -
  • To perform Service-related services; or
    • -
  • To assist us in analyzing how our Service is used.
    • -
-

These third parties will have access to the User's data to perform the tasks assigned to them on our behalf. However, they are obligated not to disclose or use the information for any other purpose.

-
-
-

‍‍Security

-

‍While we strive to protect your personal data, please note that no method of transmission over the internet, or method of electronic storage is 100% secure and reliable, and we cannot guarantee its absolute security.

-
-
-

‍‍Links to Other Sites

-

‍This Site may contain links and references to third-party web sites. The linked sites are not under the control of UNEP or WCMC, and UNEP or WCMC are not responsible for, nor do they endorse, any of their content, privacy policies or practices.

-
-
-

Changes to this Privacy Policy

-

‍We reserve the right to update our Privacy Policy from time to time. Thus, you are advised to review this page periodically for any changes. We will notify you of any changes by posting the new Privacy Policy on this page.

-

This current policy is effective as of 2022-XX-XX.

-
-
-

Contact Us

-

‍If you have any questions about our Privacy Policy, please contact us at species@unep-wcmc.org.

-
- ' + body: + - + title: 'Privacy Policy' + description: '

At UNEP-WCMC, we are committed to being transparent about the use of the User's personal data. Species+ and the Species+ app (hereafter also referred to as the Service) are provided by UNEP-WCMC at no cost and is intended for use as is. This page is used to inform visitors of our policies for the collection, use, and disclosure of Users' personal data. If you choose to use Species+ or the Species+ app, you agree to the collection and use of information in relation to this policy. Further information on the terms and conditions of use of Species+ data can be found in our Terms of Use.

' + - + title: 'Information Collection and Use' + description: ' +

We take the User's privacy very seriously and only store data where necessary to improve usability of Species+ and the Species+ app, to keep th e site/app secure and problem free, and to track impact for ourselves and our partners. The User's data will be stored securely and will not be sold to third parties; data will be deleted after one year.

+

Our web hosting provider keeps logs of connections to the Species+ API so that we can detect and prevent malicious activity. The logs contain your IP address (which can reveal your geographical location), the date and time of your connection, the data you have requested, and the browser you're using (which can reveal the device you're using as well). We make no use of this data on an individual level unless the traffic looks like an attack on the web service, in which case we will block the connection.

+

It's in our interest – and yours – that our site and app is secure and working properly, so this processing of personal data is done based on legitimate interests.

+

‍‍To request that your data is deleted from our servers, please contact us on species@unep-wcmc.org.

+ ' + - + title: 'Cookies‍' + description: ' +

We use cookies to help identify your computer so that we can optimise the user experience.

+

This Species+ app does not use these cookies explicitly. The Species+ site uses the following cookies:

+
    +
  • +

    Third-party Cookies, which include but are not limited to:

    +

    Google Analytics - we use Google Analytics to collect data about the website's usage. This data will track the pages the User visits and record other User data such as how long you spend on each page. It does not include personal information. You can view the Google Privacy Policy here: https://policies.google.com/privacy.

    +
    • +
+ ' + - + title: '‍Service Providers' + description: ' +

‍We may employ third-party companies and individuals due to the following reasons:

+
    +
  • To facilitate our Service;
    • +
  • To provide the Service on our behalf;
    • +
  • To perform Service-related services; or
    • +
  • To assist us in analyzing how our Service is used.
    • +
+

These third parties will have access to the User's data to perform the tasks assigned to them on our behalf. However, they are obligated not to disclose or use the information for any other purpose.

+ ' + - + title: '‍Security' + description: '

‍While we strive to protect your personal data, please note that no method of transmission over the internet, or method of electronic storage is 100% secure and reliable, and we cannot guarantee its absolute security.

' + - + title: '‍‍Links to Other Sites' + description: '

‍This Site may contain links and references to third-party web sites. The linked sites are not under the control of UNEP or WCMC, and UNEP or WCMC are not responsible for, nor do they endorse, any of their content, privacy policies or practices.

' + - + title: 'Changes to this Privacy Policy' + description: ' +

‍We reserve the right to update our Privacy Policy from time to time. Thus, you are advised to review this page periodically for any changes. We will notify you of any changes by posting the new Privacy Policy on this page.

+

This current policy is effective as of 2022-XX-XX.

+ ' + - + title: 'Contact Us' + description: '

‍If you have any questions about our Privacy Policy, please contact us at species@unep-wcmc.org.

' From daf63e1bbbfb2d1b7adefcb682a20c3eb1329905 Mon Sep 17 00:00:00 2001 From: Dagmara Date: Thu, 22 Sep 2022 10:43:18 +0100 Subject: [PATCH 5/6] fix: copy paste error --- app/views/mobile/terms_and_conditions.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/mobile/terms_and_conditions.html.erb b/app/views/mobile/terms_and_conditions.html.erb index c544b9518..347f4fdec 100644 --- a/app/views/mobile/terms_and_conditions.html.erb +++ b/app/views/mobile/terms_and_conditions.html.erb @@ -5,7 +5,7 @@
- <% t('mobile.privacy.body').each do |section| %> + <% t('mobile.terms.body').each do |section| %>

<%= section[:title]&.html_safe %>

<%= section[:description]&.html_safe %> <% end %> From af19c650fe42cdaac537e5abcea9ce45baae4616 Mon Sep 17 00:00:00 2001 From: Dagmara Date: Thu, 22 Sep 2022 11:34:18 +0100 Subject: [PATCH 6/6] refactor: add shared template --- app/controllers/mobile_controller.rb | 8 +++++++- app/views/mobile/privacy_policy.html.erb | 12 ------------ .../_mobile.html.erb} | 4 ++-- config/routes.rb | 4 ++-- 4 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 app/views/mobile/privacy_policy.html.erb rename app/views/{mobile/terms_and_conditions.html.erb => shared/_mobile.html.erb} (73%) diff --git a/app/controllers/mobile_controller.rb b/app/controllers/mobile_controller.rb index c59cfcadc..1bebc670f 100644 --- a/app/controllers/mobile_controller.rb +++ b/app/controllers/mobile_controller.rb @@ -1,9 +1,15 @@ class MobileController < ApplicationController layout 'mobile' - + def terms_and_conditions + @hero = t('mobile.terms.hero') + @body = t('mobile.terms.body') + render 'shared/_mobile' end def privacy_policy + @hero = t('mobile.privacy.hero') + @body = t('mobile.privacy.body') + render 'shared/_mobile' end end diff --git a/app/views/mobile/privacy_policy.html.erb b/app/views/mobile/privacy_policy.html.erb deleted file mode 100644 index 5c5f49d96..000000000 --- a/app/views/mobile/privacy_policy.html.erb +++ /dev/null @@ -1,12 +0,0 @@ -
-
-

Species+

-

<%= t('mobile.privacy.hero') %>

-
-
-
- <% t('mobile.privacy.body').each do |section| %> -

<%= section[:title]&.html_safe %>

- <%= section[:description]&.html_safe %> - <% end %> -
\ No newline at end of file diff --git a/app/views/mobile/terms_and_conditions.html.erb b/app/views/shared/_mobile.html.erb similarity index 73% rename from app/views/mobile/terms_and_conditions.html.erb rename to app/views/shared/_mobile.html.erb index 347f4fdec..0be754d9f 100644 --- a/app/views/mobile/terms_and_conditions.html.erb +++ b/app/views/shared/_mobile.html.erb @@ -1,11 +1,11 @@

Species+

-

<%= t('mobile.terms.hero') %>

+

<%= @hero %>

- <% t('mobile.terms.body').each do |section| %> + <% @body.each do |section| %>

<%= section[:title]&.html_safe %>

<%= section[:description]&.html_safe %> <% end %> diff --git a/config/routes.rb b/config/routes.rb index 454cfc0d3..56b8afd3e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,8 +6,8 @@ post 'users' => 'registrations#create', :as => 'user_registration_create' end - get "mobile/terms_and_conditions" - get "mobile/privacy_policy" + get 'mobile/terms_and_conditions' => 'mobile#terms_and_conditions' + get 'mobile/privacy_policy' => 'mobile#privacy_policy' get 'about' => 'pages#about' get 'terms-of-use' => 'pages#terms_of_use'