From a7142d998a91e1a9a6568fd6165075cfacbbf0c5 Mon Sep 17 00:00:00 2001 From: Sarah Wiechers Date: Tue, 16 Aug 2022 11:19:04 +0200 Subject: [PATCH] Added legal disclosure text. Renamed "impressum" to "legal disclosure" in code. --- app/controllers/homes_controller.rb | 4 +- app/models/ability.rb | 2 +- app/views/homes/impressum.html.erb | 11 ----- app/views/homes/legal_disclosure.html.erb | 51 ++++++++++++++++++++ app/views/layouts/_footer.html.erb | 2 +- config/routes.rb | 2 +- spec/features/static_page_visibility_spec.rb | 8 +-- 7 files changed, 60 insertions(+), 20 deletions(-) delete mode 100644 app/views/homes/impressum.html.erb create mode 100644 app/views/homes/legal_disclosure.html.erb diff --git a/app/controllers/homes_controller.rb b/app/controllers/homes_controller.rb index 8b867678..f0e1b4c3 100644 --- a/app/controllers/homes_controller.rb +++ b/app/controllers/homes_controller.rb @@ -45,9 +45,9 @@ def documentation authorize! :documentation, :home end - def impressum + def legal_disclosure @about_page = true - authorize! :impressum, :home + authorize! :legal_disclosure, :home end def privacy_policy diff --git a/app/models/ability.rb b/app/models/ability.rb index cc350b71..187d48f0 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -31,7 +31,7 @@ def initialize(user) # https://github.com/CanCanCommunity/cancancan/wiki/Defining-Abilities # Permissions for every user, even if not logged in - can %i[about progress documentation impressum privacy_policy multisearch_app], :home + can %i[about progress documentation legal_disclosure privacy_policy multisearch_app], :home can :manage, :progress_overview can %i[edit index filter taxonomy_tree associated_specimen find_ancestry show_individuals show_children], Taxon diff --git a/app/views/homes/impressum.html.erb b/app/views/homes/impressum.html.erb deleted file mode 100644 index c137f2e1..00000000 --- a/app/views/homes/impressum.html.erb +++ /dev/null @@ -1,11 +0,0 @@ -
- -
-

Legal disclosure

-
- -
- Under construction! - -
-
diff --git a/app/views/homes/legal_disclosure.html.erb b/app/views/homes/legal_disclosure.html.erb new file mode 100644 index 00000000..0c3f73af --- /dev/null +++ b/app/views/homes/legal_disclosure.html.erb @@ -0,0 +1,51 @@ +
+ +
+

Legal disclosure

+
+ +
+

Web application written by and responsible for this website in accordance with § 5 Telemediengesetz and § 55 Staatsvertrag für Rundfunk und Telemedien:

+

+ Kai Müller
+ Hüfferstr. 1, 48149 Münster
+ Telefon: +49 251 83-21645
+ E-Mail: kaimueller@uni-muenster.de +

+ +
+ +

Co-author:

+

+ Sarah Wiechers
+ Hüfferstr. 1, 48149 Münster
+ Telefon: +49 251 83-21099
+ E-Mail: sarah.wiechers@uni-muenster.de +

+ +
+ +

Organisation

+

+ Evolution and Biodiversity of Plants
+ Institute for Evolution and Biodiversity
+ Westfälische Wilhelms-Universität Münster
+ (Statutory body and an institution of the state of North Rhine-Westphalia) + Hüfferstraße 1
+ 48149 Münster
+ Germany
+

+

Tax ID number: DE 126118759

+ +
+ +

Inspecting authority

+

+ Ministry for innovation, science and research of North Rhine-Westphalia
+ (Ministerium für Innovation, Wissenschaft und Forschung des Landes Nordrhein-Westfalen)
+ Völklinger Straße 49
+ 40221 Düsseldorf
+ Germany +

+
+
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index a0cf8d03..e66957a4 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -1,3 +1,3 @@
-
<%= link_to 'Legal disclosure', impressum_path %> | <%= link_to 'Privacy policy', privacy_policy_path %>
+
<%= link_to 'Legal disclosure', legal_disclosure_path %> | <%= link_to 'Privacy policy', privacy_policy_path %>
diff --git a/config/routes.rb b/config/routes.rb index be1154bb..f7c7e707 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,7 +5,7 @@ match 'about', to: 'homes#about', via: 'get' match 'documentation', to: 'homes#documentation', via: 'get' - match 'impressum', to: 'homes#impressum', via: 'get' + match 'legal_disclosure', to: 'homes#legal_disclosure', via: 'get' match 'privacy_policy', to: 'homes#privacy_policy', via: 'get' match 'progress', to: 'homes#progress', via: 'get' diff --git a/spec/features/static_page_visibility_spec.rb b/spec/features/static_page_visibility_spec.rb index b0722645..32a1f86c 100644 --- a/spec/features/static_page_visibility_spec.rb +++ b/spec/features/static_page_visibility_spec.rb @@ -27,15 +27,15 @@ visit root_path within "h1" do - expect(page).to have_content "GBOL5" + expect(page).to have_content "BarKeeper" end - have_link("Legal disclosure", :href => impressum_url) + have_link("Legal disclosure", :href => legal_disclosure_url) have_link("Privacy policy", :href => privacy_policy_url) end scenario "visitor sees legal disclosure" do - visit impressum_path + visit legal_disclosure_path within "h3" do expect(page).to have_content "Legal disclosure" @@ -54,7 +54,7 @@ expect(page).to have_content "1 Collection and processing of personal data" expect(page).to have_content "5 Sharing and disclosure of personal data to third parties" - expect(page).to have_content "10 Right of appeal at the regulating authority" + expect(page).to have_content "9 Right of appeal at the regulating authority" end scenario "visitor sees overview page" do