Skip to content

Commit a0f21d2

Browse files
straleybstraleyb
authored
Merge branch 'master' into bugfix/ReadmeCleanup
2 parents a98611a + b57e00e commit a0f21d2

18 files changed

Lines changed: 78 additions & 47 deletions

File tree

‎.circleci/config.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: 2.1
22
orbs:
3-
browser-tools: circleci/browser-tools@1.4.8
3+
browser-tools: circleci/browser-tools@2.4.2
44
docker: circleci/docker@2.7.1
55
jobs:
66
checkout_code:
@@ -177,9 +177,11 @@ jobs:
177177
name: Wait for Redis
178178
command: dockerize -wait tcp://localhost:6379 -timeout 1m
179179
- run: bundle exec rake db:create db:migrate db:schema:load --trace
180-
- browser-tools/install-chrome:
181-
replace-existing: true
182-
- browser-tools/install-chromedriver
180+
- browser-tools/install_chrome:
181+
replace_existing: true
182+
timeout: 5m
183+
- browser-tools/install_chromedriver:
184+
timeout: 5m
183185
- run:
184186
command: |
185187
google-chrome --version

‎app/models/oai_set.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ def initialize(spec, opts = {})
5757
private
5858

5959
def name_from_spec
60-
collection = Collection.find @spec
61-
return nil if collection.collection_type.to_global_id.to_s != Hyrax::CollectionType.find_by(machine_id: :oai_set).to_global_id.to_s
60+
collection = SolrDocument.find @spec
61+
return nil if collection.collection_type_gid != Hyrax::CollectionType.find_by(machine_id: :oai_set).to_global_id
6262

6363
Hyrax::SolrService.query("id:#{@value}", rows: 1).first['title_tesim'].first
6464
end

‎app/views/_logo.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<a id="logo" class="navbar-brand" href="<%= hyrax.root_path %>" data-no-turbolink="true">
22
<%= image_tag('logo.png', height: '64', width: '64', alt: '', class: 'logo') %>
33
<div class="institution_name"><span class="h1 application-title"><%= application_name %></span>
4-
<span class="tagline d-none d-md-block"><%= 'Unique Cultural Heritage Collections' %></span>
4+
<span class="tagline d-none d-md-block"><%= 'Unique Cultural Heritage Archive' %></span>
55
</div>
66
</a>

‎app/views/hyrax/base/_index_gallery.html.erb‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
<input type="checkbox" name="batch_document_ids[]" id=<%="batch_document_#{document.id}"%> value=<%= document.id %> class="batch_document_selector" aria-label="Select <%= document.title_or_label %> for saving">
66
</p>
77
<% end %>
8+
89
<%= link_to(url_for_document(document), document_link_params(document, :counter => document_counter_with_offset(document_counter))) do |body| %>
9-
<span class="gradient-wrapper"><%= image_tag thumbnail_url(document), alt: "#{document.title_or_label} show page link" %></span>
10+
<span class="gradient-wrapper"><%= image_tag thumbnail_url(document), alt: "#{document.title_or_label} show page link", class: ("blurred-image" if !document.mask_content.blank?) %></span>
1011
<h3>
1112
<%= link_to document.title_or_label.truncate_words(10).html_safe, Rails.application.routes.url_helpers.polymorphic_path(document) %>
1213
</h3>

‎app/views/hyrax/base/show.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
<h2 class='h4'>Administrative Metadata</h2>
187187
<br/><br/>
188188
<ul>
189-
<li><p><span style="font-weight: bold;">Last Indexed Date:</span> <%= @presenter.solr_document['date_modified_dtsi'] %></p></li>
189+
<li><p><span style="font-weight: bold;">Last Indexed Date:</span> <%= Time.at(@presenter.solr_document['_version_'] / 1048576 / 1000) %></p></li>
190190
<li><p><span style="font-weight: bold;">Admin Set:</span> <%= @presenter.admin_set.first %> (<%= link_to(@presenter.solr_document['primarySet_ssim'].first, CGI.unescape(admin_admin_set_url(@presenter.solr_document['primarySet_ssim'].first)), target: "_blank") %>)</p></li>
191191
<li><p><span style="font-weight: bold;">Depositor:</span> <%= link_to(@presenter.depositor, "#{request.base_url}#{admin_workflows_path(f: { depositor_ssim: [@presenter.depositor] }, local: I18n.locale)}", target: "_blank") %></p></li>
192192
<li><p><span style="font-weight: bold;">Bulkrax Importer ID:</span> <%= show_importer_link(@presenter.solr_document, request.base_url) %></p></li>

‎app/views/hyrax/collections/show.html.erb‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,17 @@
134134
<!-- Create render display for the Local Contexts Icon -->
135135
<% if !@collection.local_contexts.blank? %>
136136
<br/>
137-
<h2 class="h4">Explore More about the Collection</h2>
137+
<h2 class="local-context-metadata-header">Explore More about the Collection</h2>
138138
<%= render 'oregon_digital/base/local_contexts', collection_lc: @collection, location_name: 'collection' %>
139139
<br/>
140140
<% end %>
141141

142142
<% unless footer_metadata.empty? %>
143143
<div id="footer-metadata" class="row">
144144
<div class="col-lg-12">
145-
<h2 class="collection-metadata-header">Explore more about the collection</h2>
145+
<% if @collection.local_contexts.blank? %>
146+
<h2 class="collection-metadata-header">Explore more about the collection</h2>
147+
<% end %>
146148
<dl class="work-show lato-p <%= dom_class(@presenter) %>" <%= @presenter.microdata_type_to_html %>>
147149
<%= render 'attribute_rows_footer', presenter: @presenter %>
148150
</dl>

‎app/views/oregon_digital/base/_local_contexts.html.erb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
<div class="row">
33
<div class="col-sm-12">
44
<div class="title-link-local-contexts">
5-
<p><%= link_to 'About Local Contexts', Rails.application.routes.url_helpers.local_contexts_path, 'aria-label': "Read more about Local Contexts", class: 'lato-p' %></p>
5+
<p><%= link_to 'About Local Contexts Notices and Labels', Rails.application.routes.url_helpers.local_contexts_path, 'aria-label': "Read more about Local Contexts", class: 'lato-p' %></p>
66
</div>
7-
7+
88
<%# FETCH: Get the array of the local contexts from work/collection %>
99
<% if location_name.eql?('collection') %>
10-
<h2 class='h6'>Local Contexts</h2>
10+
<h2 class='h6'>Local Contexts Notices and Labels</h2>
1111
<% @lc_labels = OregonDigital::LocalContextsService.new.all_labels(collection_lc.local_contexts) %>
1212
<% @lc_arr = OregonDigital::LocalContextsService.new.parse_labels_for_image(@lc_labels) %>
1313
<% else %>
14-
<h2 class='h4'>Local Contexts</h2>
14+
<h2 class='h4'>Local Contexts Notices and Labels</h2>
1515
<% @lc_labels = work_lc.local_contexts_label %>
1616
<% @lc_arr = OregonDigital::LocalContextsService.new.parse_labels_for_image(@lc_labels) %>
1717
<% end %>

‎config/locales/hyrax.de.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ de:
1212
language_sim: Sprache
1313
publisher_sim: Herausgeber
1414
subject_sim: Fach
15+
local_contexts_label_sim: Lokale Kontextkennzeichnungen und Hinweise
1516
index:
1617
based_near_tesim: Ort
1718
contributor_tesim: Mitwirkender
@@ -64,6 +65,6 @@ de:
6465
simple_form:
6566
labels:
6667
defaults:
67-
local_contexts: Lokale Kontexte
68-
local_contexts_label: Lokale Kontexte
68+
local_contexts: Lokale Kontextkennzeichnungen und Hinweise
69+
local_contexts_label: Lokale Kontextkennzeichnungen und Hinweise
6970
resource_type: Medien

‎config/locales/hyrax.en.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ en:
5656
plss_sim: Public Land Survey System
5757
based_near_label_sim: Location
5858
cultural_context_label_sim: Cultural Context
59-
local_contexts_label_sim: Local Contexts
59+
local_contexts_label_sim: Local Contexts Labels and Notices
6060
ethnographic_term_label_sim: Ethnographic Term
6161
style_or_period_label_sim: Style / Period
6262
form_of_work_label_sim: Form of Work
@@ -360,8 +360,8 @@ en:
360360
collection_type:
361361
facet_configurable: FACET CONFIGURABLE
362362
defaults:
363-
local_contexts: Local Contexts
364-
local_contexts_label: Local Contexts
363+
local_contexts: Local Contexts Labels and Notices
364+
local_contexts_label: Local Contexts Labels and Notices
365365
resource_type: Media
366366
accessibility_copy_form:
367367
name: Your Name

‎config/locales/hyrax.es.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ es:
1212
language_sim: Idioma
1313
publisher_sim: Editor
1414
subject_sim: Tema
15-
local_contexts_label_sim: Local Contexts
15+
local_contexts_label_sim: Etiquetas y avisos de Contextos Locales
1616
identifier_sim: Identificador
1717
workflow_state_name_ssim: Estado del Workflow
1818
index:
@@ -67,6 +67,6 @@ es:
6767
simple_form:
6868
labels:
6969
defaults:
70-
local_contexts: Local Contexts
71-
local_contexts_label: Local Contexts
70+
local_contexts: Etiquetas y avisos de Contextos Locales
71+
local_contexts_label: Etiquetas y avisos de Contextos Locales
7272
resource_type: Medios

0 commit comments

Comments
 (0)