Skip to content

Commit

Permalink
Merge pull request #338 from kb-dk/development
Browse files Browse the repository at this point in the history 
Development
  • Loading branch information
@siglun
siglun authored Feb 18, 2022
2 parents 8fbac2b + 17fa3f6 commit 73316fe
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 62 deletions.
6 changes: 4 additions & 2 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ gem 'blacklight', '7.7.0'
gem 'sprockets', '~> 3.7.2'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.4.2'
gem 'rails', '~> 5.2.6.2'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'
gem "actionview", ">= 5.2.4.2"
Expand All @@ -31,10 +31,12 @@ gem 'mini_racer'

gem "activerecord", ">= 5.2.4.5"

gem "activesupport", "~> 5.2.4.5"
gem "activesupport", "~> 5.2.6.2"

gem "rack", ">= 2.2.3"

gem "actionpack", "~> 5.2.6.2"

# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.2'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
Expand Down
115 changes: 56 additions & 59 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.4.6)
actionpack (= 5.2.4.6)
actioncable (5.2.6.2)
actionpack (= 5.2.6.2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.4.6)
actionpack (= 5.2.4.6)
actionview (= 5.2.4.6)
activejob (= 5.2.4.6)
actionmailer (5.2.6.2)
actionpack (= 5.2.6.2)
actionview (= 5.2.6.2)
activejob (= 5.2.6.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.4.6)
actionview (= 5.2.4.6)
activesupport (= 5.2.4.6)
actionpack (5.2.6.2)
actionview (= 5.2.6.2)
activesupport (= 5.2.6.2)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.4.6)
activesupport (= 5.2.4.6)
actionview (5.2.6.2)
activesupport (= 5.2.6.2)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.4.6)
activesupport (= 5.2.4.6)
activejob (5.2.6.2)
activesupport (= 5.2.6.2)
globalid (>= 0.3.6)
activemodel (5.2.4.6)
activesupport (= 5.2.4.6)
activerecord (5.2.4.6)
activemodel (= 5.2.4.6)
activesupport (= 5.2.4.6)
activemodel (5.2.6.2)
activesupport (= 5.2.6.2)
activerecord (5.2.6.2)
activemodel (= 5.2.6.2)
activesupport (= 5.2.6.2)
arel (>= 9.0)
activestorage (5.2.4.6)
actionpack (= 5.2.4.6)
activerecord (= 5.2.4.6)
marcel (~> 0.3.1)
activesupport (5.2.4.6)
activestorage (5.2.6.2)
actionpack (= 5.2.6.2)
activerecord (= 5.2.6.2)
marcel (~> 1.0.0)
activesupport (5.2.6.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
Expand Down Expand Up @@ -124,8 +124,8 @@ GEM
rake
font-awesome-rails (4.7.0.7)
railties (>= 3.2, < 7)
globalid (0.4.2)
activesupport (>= 4.2.0)
globalid (1.0.0)
activesupport (>= 5.0)
high_voltage (3.0.0)
http (5.0.1)
addressable (~> 2.3)
Expand All @@ -135,7 +135,7 @@ GEM
http-cookie (1.0.4)
domain_name (~> 0.5)
http-form_data (2.3.0)
i18n (1.8.10)
i18n (1.10.0)
concurrent-ruby (~> 1.0)
jbuilder (2.11.2)
activesupport (>= 5.0.0)
Expand Down Expand Up @@ -168,28 +168,24 @@ GEM
llhttp-ffi (0.3.1)
ffi-compiler (~> 1.0)
rake (~> 13.0)
loofah (2.10.0)
loofah (2.14.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
marcel (1.0.2)
material_icons (2.2.1)
railties (>= 3.2)
method_source (1.0.0)
mimemagic (0.3.10)
nokogiri (~> 1)
rake
mini_mime (1.1.0)
mini_portile2 (2.6.1)
mini_mime (1.1.2)
mini_portile2 (2.7.1)
mini_racer (0.4.0)
libv8-node (~> 15.14.0.0)
minitest (5.14.4)
minitest (5.15.0)
multipart-post (2.1.1)
nio4r (2.5.8)
nokogiri (1.12.5)
mini_portile2 (~> 2.6.1)
nokogiri (1.13.1)
mini_portile2 (~> 2.7.0)
racc (~> 1.4)
oai (1.1.0)
builder (>= 3.1.0)
Expand All @@ -200,31 +196,31 @@ GEM
public_suffix (4.0.6)
puma (5.6.2)
nio4r (~> 2.0)
racc (1.5.2)
racc (1.6.0)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.4.6)
actioncable (= 5.2.4.6)
actionmailer (= 5.2.4.6)
actionpack (= 5.2.4.6)
actionview (= 5.2.4.6)
activejob (= 5.2.4.6)
activemodel (= 5.2.4.6)
activerecord (= 5.2.4.6)
activestorage (= 5.2.4.6)
activesupport (= 5.2.4.6)
rails (5.2.6.2)
actioncable (= 5.2.6.2)
actionmailer (= 5.2.6.2)
actionpack (= 5.2.6.2)
actionview (= 5.2.6.2)
activejob (= 5.2.6.2)
activemodel (= 5.2.6.2)
activerecord (= 5.2.6.2)
activestorage (= 5.2.6.2)
activesupport (= 5.2.6.2)
bundler (>= 1.3.0)
railties (= 5.2.4.6)
railties (= 5.2.6.2)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
rails-html-sanitizer (1.4.2)
loofah (~> 2.3)
railties (5.2.4.6)
actionpack (= 5.2.4.6)
activesupport (= 5.2.4.6)
railties (5.2.6.2)
actionpack (= 5.2.6.2)
activesupport (= 5.2.6.2)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
Expand Down Expand Up @@ -268,12 +264,12 @@ GEM
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.2)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sqlite3 (1.4.2)
thor (1.1.0)
thor (1.2.1)
thread_safe (0.3.6)
tilt (2.0.10)
tzinfo (1.2.9)
Expand Down Expand Up @@ -305,9 +301,10 @@ PLATFORMS
ruby

DEPENDENCIES
actionpack (~> 5.2.6.2)
actionview (>= 5.2.4.2)
activerecord (>= 5.2.4.5)
activesupport (~> 5.2.4.5)
activesupport (~> 5.2.6.2)
blacklight (= 7.7.0)
blacklight_range_limit (~> 7.7.0)
bootstrap (~> 4.3.1)
Expand All @@ -330,7 +327,7 @@ DEPENDENCIES
oai
puma (>= 4.3.8)
rack (>= 2.2.3)
rails (~> 5.2.4.2)
rails (~> 5.2.6.2)
rsolr (>= 1.0)
sassc-rails (~> 2.1.0)
selenium-webdriver
Expand Down
6 changes: 5 additions & 1 deletion app/controllers/catalog_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,11 @@ def send_pdf(document, type)
pd = '<dt>Ophavsret</dt>' +
'<dd>Materialet er fri af ophavsret. Du kan kopiere, ændre, distribuere eller fremføre værket,
også til kommercielle formål, uden at bede om tilladelse.</dd>' +
'<dd><a rel="license" href="https://creativecommons.org/publicdomain/mark/1.0/deed.da">Læs Public Domain-erklæringen</a>.</dd>'
'<dd><a rel="license" href="https://creativecommons.org/publicdomain/mark/1.0/deed.da">Læs Public Domain-erklæringen</a>.</dd>'
elsif document['subcollection_ssi'] == "adl"
pd = '<!-- dt>Ophavsret</dt>' +
'<dd>Materialet er dedikeret til public domain. Du kan kopiere, ændre, distribuere og fremføre værket, også til kommercielle formål, uden at bede om tilladelse. Husk dog altid at kreditere ophavsmanden.</dd>' +
'<dd><a rel="license" href="https://creativecommons.org/publicdomain/zero/1.0/deed.da">Læs CC0-erklæringen</a>.</dd -->'
else
pd = '<dt>Ophavsret</dt>' +
'<dd>Materialet er dedikeret til public domain. Du kan kopiere, ændre, distribuere og fremføre værket, også til kommercielle formål, uden at bede om tilladelse. Husk dog altid at kreditere ophavsmanden.</dd>' +
Expand Down
6 changes: 6 additions & 0 deletions app/views/catalog/_applied_edition.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@
</a><br />
<a rel="license" href="https://creativecommons.org/publicdomain/mark/1.0/deed.da">Læs Public Domain-erklæringen</a>.
</div>
<% elsif collection == "adl" %>
<div class="col-sm-12">
<!-- strong>Ophavsret</strong><br/>
Materialet er dedikeret til public domain. Du kan kopiere, ændre, distribuere og fremføre værket, også til kommercielle formål, uden at bede om tilladelse. Husk dog altid at kreditere ophavsmanden.<br/ -->
<!-- a href="https://creativecommons.org/publicdomain/zero/1.0/deed.da" target="_blank" style="text-decoration: none" --><!-- %= show_svg('cc-zero.svg') % Læs CC0-erklæringen</a -->
</div>
<% else %>
<div class="col-sm-12">
<strong>Ophavsret</strong><br>
Expand Down

0 comments on commit 73316fe

Please sign in to comment.