From 13864ffdeea1ad29b2f4e6870815d5e52c1e2a01 Mon Sep 17 00:00:00 2001 From: Randall Floyd Date: Thu, 4 Jan 2024 15:13:17 -0500 Subject: [PATCH 1/6] Adding collection show page for overrides --- app/views/catalog/_show_collection.html.erb | 66 +++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 app/views/catalog/_show_collection.html.erb diff --git a/app/views/catalog/_show_collection.html.erb b/app/views/catalog/_show_collection.html.erb new file mode 100644 index 0000000..055d85b --- /dev/null +++ b/app/views/catalog/_show_collection.html.erb @@ -0,0 +1,66 @@ +<% parents = Arclight::Parents.from_solr_document(document).as_parents %> +
+
+ <% if document.digital_objects.present? %> + <%= content_tag :p, class: "media breadcrumb-item breadcrumb-item-#{parents.length + 3}" do %> + + + <%= t('arclight.views.show.online_content_upper') %> + + <%= render_document_partial(document, 'arclight_viewer') %> + <% end %> + <% end %> +
+
+ +
+
+ +
+
+ <%= render 'collection_context' %> +
+
+ <%= render 'collection_contents' %> +
+ <% if document.online_content? %> +
+ <%= render partial: 'collection_online_contents', locals: { document: document } %> +
+ <% end %> +
+

<%= t 'arclight.views.show.access' %>

+ <% unless blacklight_config.show.context_access_tab_items.nil? %> + <% items = blacklight_config.show.context_access_tab_items.select { |i| fields_have_content?(@document, i) } %> + <% items.each_with_index do |item, index| %> + <%= render partial: 'access_contents', locals: { document: @document, field_accessor: item, card_index: index} %> + <% end %> + <% end %> +
+
+
+ +
From fbe47335a3b079ffaa9a2aa5ea70945d3b068090 Mon Sep 17 00:00:00 2001 From: Randall Floyd Date: Thu, 4 Jan 2024 15:15:53 -0500 Subject: [PATCH 2/6] AR-203 More roles not in required context --- app/views/catalog/_show_collection.html.erb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/views/catalog/_show_collection.html.erb b/app/views/catalog/_show_collection.html.erb index 055d85b..f7d4d02 100644 --- a/app/views/catalog/_show_collection.html.erb +++ b/app/views/catalog/_show_collection.html.erb @@ -9,29 +9,29 @@ <%= render_document_partial(document, 'arclight_viewer') %> <% end %> - <% end %> + <% end %>
-
-
    '> +
    +
      '>
    • - + <%= t 'arclight.views.show.overview' %>
    • - + <%= t 'arclight.views.show.no_contents' %>
      • <% if document.online_content? %>
    • - + <%= t 'arclight.views.show.online_content' %>
      • <% end %>
    • - + <%= t 'arclight.views.show.access' %>
      • From 6f9f8e736686cf4c3714e3d5606d63d259be37cd Mon Sep 17 00:00:00 2001 From: Randall Floyd Date: Thu, 4 Jan 2024 16:07:59 -0500 Subject: [PATCH 3/6] AR-199 Visible label and accessible name do not match --- app/views/catalog/_index_collection_context_default.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/catalog/_index_collection_context_default.html.erb b/app/views/catalog/_index_collection_context_default.html.erb index 6dfe51c..990fe8a 100644 --- a/app/views/catalog/_index_collection_context_default.html.erb +++ b/app/views/catalog/_index_collection_context_default.html.erb @@ -11,7 +11,7 @@ <%= link_to( "##{document.id}-collapsible-hierarchy", class: "al-toggle-view-children #{!show_expanded?(document) ? 'collapsed' : ''}", - 'aria-label': "Toggle children", + 'aria-label': "Children of #{document.level} #{document.normalized_title} #{document.number_of_children}", data: { toggle: 'collapse' } From a15efac2e8550053a3e072414f958f73ad754dbd Mon Sep 17 00:00:00 2001 From: Randall Floyd Date: Fri, 5 Jan 2024 11:38:41 -0500 Subject: [PATCH 4/6] AR-200 Improves contrast ratios for various elements --- app/assets/stylesheets/iu-branding.scss | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/assets/stylesheets/iu-branding.scss b/app/assets/stylesheets/iu-branding.scss index 9cac6b3..a590c28 100644 --- a/app/assets/stylesheets/iu-branding.scss +++ b/app/assets/stylesheets/iu-branding.scss @@ -177,3 +177,14 @@ li.al-collection-context .al-online-content-icon svg, .toggle-delete:hover { text-decoration: none; } + +// Increase contrast ratios for accessibility +.text-muted { + color: #34373a !important; +} + +.facet-values { + .remove { + color: #0e0e0e !important; + } +} From 1e35151f338fc9e71689664d4dafbf186e1647b3 Mon Sep 17 00:00:00 2001 From: Randall Floyd Date: Fri, 5 Jan 2024 11:40:02 -0500 Subject: [PATCH 5/6] AR-120 Adding alternative title for Universal Viewer's iframe --- app/assets/stylesheets/iu-branding.scss | 2 +- app/views/viewers/_universal_viewer.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/iu-branding.scss b/app/assets/stylesheets/iu-branding.scss index a590c28..f2822db 100644 --- a/app/assets/stylesheets/iu-branding.scss +++ b/app/assets/stylesheets/iu-branding.scss @@ -185,6 +185,6 @@ li.al-collection-context .al-online-content-icon svg, .facet-values { .remove { - color: #0e0e0e !important; + color: #34373a !important; } } diff --git a/app/views/viewers/_universal_viewer.html.erb b/app/views/viewers/_universal_viewer.html.erb index 625cff0..6c46903 100644 --- a/app/views/viewers/_universal_viewer.html.erb +++ b/app/views/viewers/_universal_viewer.html.erb @@ -3,7 +3,7 @@
    From dde840d63f77400fe4307119cc73452c42f21737 Mon Sep 17 00:00:00 2001 From: Randall Floyd Date: Fri, 5 Jan 2024 12:33:14 -0500 Subject: [PATCH 6/6] AR-201 Container element is empty caused by a span as child to a ul element --- .../javascripts/context_navigation.js.erb | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/context_navigation.js.erb b/app/assets/javascripts/context_navigation.js.erb index 71b8e58..df2b090 100644 --- a/app/assets/javascripts/context_navigation.js.erb +++ b/app/assets/javascripts/context_navigation.js.erb @@ -63,19 +63,19 @@ class ExpandButton { constructor(data) { var collapseIcon = `collapse'>`; var expandIcon = `expand'>`; - + // Find Siblings count var siblingCount = ` 999 `; this.collapseText = collapseIcon + `Hide`+ siblingCount + data.collapse; this.expandText = expandIcon + `Show` + siblingCount + data.expand; - + this.$el = $(``); this.handleClick = this.handleClick.bind(this); this.$el.click(this.handleClick); } - + } /** @@ -187,11 +187,12 @@ class ContextNavigation { const $span = $(''); $span.addClass('divider'); $span.attr('text-position', 'left'); + $span.attr('role', 'listitem'); $ul.append($span); const button = new ExpandButton(this.data); $span.append(button.$el); - + return $ul; } @@ -268,7 +269,7 @@ class ContextNavigation { prevParentList.append(renderedBeforeDocs); - + } else { renderedBeforeDocs = beforeDocs.map(newDoc => newDoc.render()).join(''); } @@ -276,7 +277,7 @@ class ContextNavigation { // Silly but works for now this.ul.append(prevParentList || renderedBeforeDocs); - + let itemDoc = newDocs.slice(newDocIndex, newDocIndex + 1); let renderedItemDoc = itemDoc.map(doc => doc.render()).join(''); @@ -370,7 +371,7 @@ class ContextNavigation { var srOnly = $('h2[data-sr-enable-me]'); toEnable.removeClass('disabled'); toEnable.text(srOnly.data('hasContents')); - srOnly.text(srOnly.data('hasContents')); + srOnly.text(srOnly.data('hasContents')); } showSiblingCount(){ @@ -409,5 +410,5 @@ Blacklight.onLoad(function () { ); contextNavigation.getData(); }); - + });