Update the default Terms of Service and Privacy Policy content (#200)

* Update the default Terms of Service and Privacy Policy content

* Fix tests

* Fix haml identation

* Link opens in new tab

app/views/admin2/general/static_content/index.haml

@@ -9,7 +9,7 @@
     %h2
       = t('admin2.static_content.header')
     %p.ingress
-      = t('admin2.static_content.info_text')
+      = t('admin2.static_content.info_text', url: "#{APP_CONFIG.knowledge_base_url}/en/articles/6642720").html_safe
     .content-card-section-container{style: 'padding: 0; max-width: none;'}
       .table-responsive
         %table.table.table-hover.staticcontent

app/views/infos/_privacy_content.haml

@@ -1,7 +1,5 @@
 - if @community_customization && @community_customization.privacy_page_content
   - content = @community_customization.privacy_page_content.html_safe
-- elsif File.exists?("app/views/infos/localized_privacy_policy/privacy_policy.#{I18n.locale}.haml")
-  - content = render :file => "infos/localized_privacy_policy/privacy_policy.#{I18n.locale}"
 - else
   - content = render :file => "infos/localized_privacy_policy/privacy_policy.en"
 

app/views/infos/_terms_content.haml

@@ -3,8 +3,6 @@
 - content += render :layout => "layouts/mercury_editable_page", :locals => { :content_type => "terms_page_content" } do
   - if @community_customization && @community_customization.terms_page_content
     = @community_customization.terms_page_content.html_safe
-  - elsif File.exists?("app/views/infos/localized_terms/terms.#{I18n.locale}.haml")
-    = render :file => "infos/localized_terms/terms.#{I18n.locale}"
   - else
     = render :file => "infos/localized_terms/terms.en"
 

app/views/infos/localized_privacy_policy/privacy_policy.en.haml

@@ -1,56 +1,6 @@
-%h3
-  Registrar
 %p
-  #{service_name} service: Sharetribe Ltd
-  %br
-  = link_to "www.sharetribe.com", "http://www.sharetribe.com/en"
-  %br
-  info (at) sharetribe.com
-
-%h3
-  Name of the register
+  Privacy Policy for #{service_name}.
 %p
-  User register of the #{service_name} service
-%h3
-  Use of personal details (purpose of register)
-%p
-  Personal details are collected to make communication and use of service possible. Details can be used for communication between service providers and users and also for direct communication between users. Some personal details are visible on the profile page of the user, but those details are voluntary (except name).
-%p
-  The handling of personal details is not outsourced, but the register data is stored on a server that is rented from a third party company.
-%h3
-  Information content of the register
-%p
-  The following information may be stored in the register:
-  %ul
-    %li
-      Personal details: Name, email address, phone number, street address
-    %li
-      Account details: username, password (stored in encrypted format)
-    %li
-      The description text that the user may write about him/herself
-    %li
-      The offers and requests the user has posted to the service
-    %li
-      The given and received feedback and badges
-    %li
-      Statistical data about service usage, e.g. number times the user has logged in
-%h3
-  Regular sources of information
-%p
-  Personal details are given by the user on registration to the service or when using it later.
-%h3
-  Regular handovers of the information
-%p
-  The information may be handed over for research purposes as described in the
-  = link_to t('layouts.infos.terms'), terms_infos_path
-  that the user accepts before starting to use the service. The researchers may not publish any research results so that identifying information would be revealed or that any specific user could be detected.
-%p
-  Information considering users of a single #{service_name} community may be handed over to the client who has founded that community or to the community administrators appointed by that client.
-%h3
-  Transfers of the information outside the EU and the European Economic Area
-%p
-  Information may be stored to a server that may be located inside or outside of the EU and the European Economic Area
-%h3
-  Register protection principles
-%p
-  The information is stored on computers. The access to the information is restricted with passwords and physical access to the computers is restricted by the server hosting company.
+  If you are the owner of #{service_name}, visit
+  = link_to "https://help.sharetribe.com/en/articles/6642720", "https://help.sharetribe.com/en/articles/6642720", :rel => "nofollow", target: :_blank
+  to get started with creating your Privacy Policy.

app/views/infos/localized_terms/terms.en.haml

@@ -1,28 +1,6 @@
-- if service_name != "Sharetribe"
-  %h2 #{service_name} terms of use
-  %p
-    #{service_name} is a web service built on the Sharetribe platform. The general terms of Sharetribe below apply also to the use of #{service_name}
-- else
-  %h2 Sharetribe terms of use
 %p
-  Sharetribe is a social media service that allows its users to change favors and items and communicate with each other. The Sharetribe-service may only be used in accordance with these terms of use. The service provider reserves the right to change these terms of use if required. Valid terms of use can be found from Sharetribe’s website.
-
-%h3 Rights of Content
-
+  Terms of Service for #{service_name}.
 %p
-  The users themselves retain the right to all text, pictures and other content that they create in the service. The users allow others to utilize the content in accordance with the nature of the service and furthermore allow the service provider to file information and data and make changes that are necessary for the service or the study, however other rights are not transferred from the users, unless specifically otherwise agreed. The responsibility of the content lies with the user, who has produced it to the service. The service provider has the right to remove any material when it deems it necessary.
-
-%h3 Disclaimer
-
-%p
-  No guarantees of the functioning of the Sharetribe service are given. The users are themselves responsible for their actions in the service and they should estimate the reliability of other users before dealing with them. The service provider can under no circumstances be liable for damage that is caused to the user. The user may not store any information or data in the service, and expect it to remain there.
-
-%h3 The Removal of a User
-
-%p
-  The service provider has the right to remove any users from Sharetribe and terminate their right of use of the service without any specific reason and without being liable for compensation.
-
-%h3 Applicable Jurisdiction
-
-%p
-  The jurisdiction that is applicable in this service and these terms of use is that of Finland, unless something else is required by binding law.
+  If you are the owner of #{service_name}, visit
+  = link_to "https://help.sharetribe.com/en/articles/6642720", "https://help.sharetribe.com/en/articles/6642720", :rel => "nofollow", target: :_blank
+  to get started with creating your Terms of Service.

config/locales/admin2/en.yml

@@ -1234,7 +1234,7 @@ en:
       email_admins_about_new_transactions: "Send admins an email when a new transaction starts"
     static_content:
       header: "Static content pages"
-      info_text: "Describe how your marketplace works and define your policy and terms (or edit the templates provided). Users can find the pages by clicking the \"About\" link in the top bar."
+      info_text: "The static content pages can be found by users by clicking the \"About\" link in the top bar. On these pages, describe your marketplace and how it works, and define your Terms of Service and Privacy Policy. <a href=\"%{url}\" class=\"external-link\" target=\"_blank\">Get started with creating your Terms of Service and Privacy Policy with our free templates</a>."
       about: About
       how_it_works: "How it works"
       privacy_policy: "Privacy Policy"

features/communities/user_views_terms.feature

@@ -8,7 +8,7 @@ Feature: User views terms
     Given I am not logged in
     And I am on the signup page
     When I follow "Terms of Service"
-    Then I should see "Rights of Content"
+    Then I should see "get started with creating your Terms of Service"
 
 
 

features/infos/user_views_info_about_sharetribe.feature

@@ -24,7 +24,7 @@ Feature: User views info about sharetribe
     And I should not see "About" within ".selected.left-navi-link"
     And I should see "Terms of Service" within ".left-navi"
     And I should see "Privacy" within ".left-navi"
-    And I should see "Rights of Content"
+    And I should see "get started with creating your Terms of Service"
 
   @javascript
   Scenario: User views register details page
@@ -35,4 +35,4 @@ Feature: User views info about sharetribe
     And I should see "About" within ".left-navi"
     And I should see "Terms of Service" within ".left-navi"
     And I should see "Privacy" within ".selected.left-navi-link"
-    And I should see "Name of the register"
+    And I should see "get started with creating your Privacy Policy"