Skip to content

Commit

Permalink
Added legal disclosure text. Renamed "impressum" to "legal disclosure…
Browse files Browse the repository at this point in the history
…" in code.
  • Loading branch information
SarahW91 committed Aug 16, 2022
1 parent 590cc7c commit a7142d9
Show file tree
Hide file tree
Showing 7 changed files with 60 additions and 20 deletions.
4 changes: 2 additions & 2 deletions app/controllers/homes_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/models/ability.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 0 additions & 11 deletions app/views/homes/impressum.html.erb

This file was deleted.

51 changes: 51 additions & 0 deletions app/views/homes/legal_disclosure.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<div class="panel panel-default" style="opacity: 0.7;">

<div class="panel-heading">
<h3 class="panel-title">Legal disclosure</h3>
</div>

<div class="panel-body">
<p>Web application written by and responsible for this website in accordance with § 5 Telemediengesetz and § 55 Staatsvertrag für Rundfunk und Telemedien:</p>
<p>
Kai Müller<br>
Hüfferstr. 1, 48149 Münster<br>
Telefon: +49 251 83-21645<br>
E-Mail: <a href="mailto:[email protected]">[email protected]</a>
</p>

<br>

<p>Co-author:</p>
<p>
Sarah Wiechers<br>
Hüfferstr. 1, 48149 Münster<br>
Telefon: +49 251 83-21099<br>
E-Mail: <a href="mailto:[email protected]">[email protected]</a>
</p>

<br>

<p><strong>Organisation</strong></p>
<p>
Evolution and Biodiversity of Plants<br>
<a href="http://ieb.uni-muenster.de/">Institute for Evolution and Biodiversity</a><br>
<a href="https://www.uni-muenster.de/en/">Westfälische Wilhelms-Universität Münster</a><br>
(Statutory body and an institution of the state of North Rhine-Westphalia)
Hüfferstraße 1<br>
48149 Münster<br>
Germany<br>
</p>
<p><b>Tax ID number:</b> DE 126118759</p>

<br>

<p><strong>Inspecting authority</strong></p>
<p>
<a href="http://www.wissenschaft.nrw.de/ministerium/">Ministry for innovation, science and research of North Rhine-Westphalia</a><br />
(Ministerium f&uuml;r Innovation, Wissenschaft und Forschung des Landes Nordrhein-Westfalen)<br />
V&ouml;lklinger Stra&szlig;e 49<br />
40221 D&uuml;sseldorf<br />
Germany
</p>
</div>
</div>
2 changes: 1 addition & 1 deletion app/views/layouts/_footer.html.erb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="panel-footer" style="opacity: 0.7;">
<div class="text-right"><%= link_to 'Legal disclosure', impressum_path %> | <%= link_to 'Privacy policy', privacy_policy_path %></div>
<div class="text-right"><%= link_to 'Legal disclosure', legal_disclosure_path %> | <%= link_to 'Privacy policy', privacy_policy_path %></div>
</div>
2 changes: 1 addition & 1 deletion config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 4 additions & 4 deletions spec/features/static_page_visibility_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down

0 comments on commit a7142d9

Please sign in to comment.