From fc4325d2a9faf12cc6f7af85373f591a9b47b0ba Mon Sep 17 00:00:00 2001 From: Renee LeBeau Date: Tue, 2 Jun 2026 18:33:02 -0400 Subject: [PATCH 1/2] IULRDC-196 DataCORE: adding files from hyrax --- .../hyrax/admin/admin_sets/show.html.erb | 36 +++++ .../collections/_form_branding.html.erb | 153 ++++++++++++++++++ 2 files changed, 189 insertions(+) create mode 100644 app/views/hyrax/admin/admin_sets/show.html.erb create mode 100644 app/views/hyrax/dashboard/collections/_form_branding.html.erb diff --git a/app/views/hyrax/admin/admin_sets/show.html.erb b/app/views/hyrax/admin/admin_sets/show.html.erb new file mode 100644 index 00000000..c987dbb3 --- /dev/null +++ b/app/views/hyrax/admin/admin_sets/show.html.erb @@ -0,0 +1,36 @@ +<% provide :page_header do %> +

<%= t('.header') %>

+<% end %> + +
+
+
+ <%= render 'show_actions', presenter: @presenter %> + +
+
+ <% if has_thumbnail? @presenter.solr_document %> +
+ <%= render_thumbnail_tag @presenter.solr_document, {}, suppress_link: true %> +
+ <% else %> + + <% end %> +
+
+ <%= render 'collection_description', presenter: @presenter %> + <%= render 'show_descriptions' %> +
+
+ +
+

<%= t '.item_list_header' %>

+ <%= render 'sort_and_per_page', collection: @presenter %> + + <%= render_document_index @member_docs %> + + <%= render 'paginate' %> +
+
+
+
diff --git a/app/views/hyrax/dashboard/collections/_form_branding.html.erb b/app/views/hyrax/dashboard/collections/_form_branding.html.erb new file mode 100644 index 00000000..ad90f376 --- /dev/null +++ b/app/views/hyrax/dashboard/collections/_form_branding.html.erb @@ -0,0 +1,153 @@ +
+

<%= t('.branding.label') %>

+

<%= t('.branding.description') %>

+ +

<%= t('.banner.description') %>.

+ +
+ + + + + +
+
+ + + + Choose File + + +
+ + +
+ +
+
+
+ +
 
+
+
+ +
+
+
+ <% if f.object.banner_info[:file] %> + + + <% else %> + + <% end %> + + + +
+
+
+
+ + <%= render 'hyrax/uploads/js_templates_branding' %> + + +

<%= t('.logo.description') %>

+ + +
From e273178aa2908565aa243d6152960057df283be3 Mon Sep 17 00:00:00 2001 From: Renee LeBeau Date: Tue, 2 Jun 2026 18:38:37 -0400 Subject: [PATCH 2/2] IULRDC-196 DataCORE dashboard accessibility changes --- app/assets/stylesheets/main.scss | 13 +++ app/views/bulkrax/exporters/index.html.erb | 6 +- app/views/bulkrax/importers/index.html.erb | 6 +- .../hyrax/admin/admin_sets/show.html.erb | 2 +- .../dashboard/collections/_form.html.erb | 91 ++++++++----------- .../collections/_form_branding.html.erb | 2 +- .../_featured_collection_fields.html.erb | 2 +- 7 files changed, 59 insertions(+), 63 deletions(-) diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index 7ad51a51..2110ff5f 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -589,6 +589,13 @@ ul.tabular li.attribute-fundedby { } } +/* Embargoes */ + +table.embargoes th label { + margin-bottom: 0; +} + + .panel-workflow .panel-heading { background-color: #e68406; font-weight: bold; @@ -745,6 +752,12 @@ div.facets h3 { background-color: #fafafa; } +/** Admin Sets **/ + +div.panel-body.admin-set.row { + margin: 0; +} + /** Collections **/ .hyc-container { diff --git a/app/views/bulkrax/exporters/index.html.erb b/app/views/bulkrax/exporters/index.html.erb index edc8f185..a350da37 100644 --- a/app/views/bulkrax/exporters/index.html.erb +++ b/app/views/bulkrax/exporters/index.html.erb @@ -34,9 +34,9 @@ <%= link_to raw(''), exporter_download_path(exporter) %> <% end%> - <%= link_to raw(''), exporter_path(exporter), title: "View ' + exporter.name + '" %> - <%= link_to raw(''), edit_exporter_path(exporter), title: "Edit ' + exporter.name + '" %> - <%= link_to raw(''), exporter, method: :delete, data: { confirm: 'Are you sure?' }, title: "Delete ' + exporter.name + '" %> + <%= link_to raw(''), exporter_path(exporter), title: 'View ' + exporter.name %> + <%= link_to raw(''), edit_exporter_path(exporter), title: 'Edit ' + exporter.name %> + <%= link_to raw(''), exporter, method: :delete, data: { confirm: 'Are you sure?' }, title: 'Delete ' + exporter.name %> <% end %> diff --git a/app/views/bulkrax/importers/index.html.erb b/app/views/bulkrax/importers/index.html.erb index 5cc711c4..78d225cc 100644 --- a/app/views/bulkrax/importers/index.html.erb +++ b/app/views/bulkrax/importers/index.html.erb @@ -44,9 +44,9 @@ <%= importer.importer_runs.last&.deleted_records %> <%= importer.importer_runs.last&.total_collection_entries %> <%= importer.importer_runs.last&.total_work_entries %> - <%= link_to raw(''), importer_path(importer), title: "View ' + importer.name + '" %> - <%= link_to raw(''), edit_importer_path(importer), title: "Edit ' + importer.name + '" %> - <%= link_to raw(''), importer, method: :delete, data: { confirm: 'Are you sure?' }, title: "Delete ' + importer.name + '" %> + <%= link_to raw(''), importer_path(importer), title: 'View ' + importer.name %> + <%= link_to raw(''), edit_importer_path(importer), title: 'Edit ' + importer.name %> + <%= link_to raw(''), importer, method: :delete, data: { confirm: 'Are you sure?' }, title: 'Delete ' + importer.name %> <% end %> diff --git a/app/views/hyrax/admin/admin_sets/show.html.erb b/app/views/hyrax/admin/admin_sets/show.html.erb index c987dbb3..4dc01375 100644 --- a/app/views/hyrax/admin/admin_sets/show.html.erb +++ b/app/views/hyrax/admin/admin_sets/show.html.erb @@ -11,7 +11,7 @@
<% if has_thumbnail? @presenter.solr_document %>
- <%= render_thumbnail_tag @presenter.solr_document, {}, suppress_link: true %> + <%= render_thumbnail_tag @presenter.solr_document, { alt: @presenter.solr_document.title }, suppress_link: true %>
<% else %> diff --git a/app/views/hyrax/dashboard/collections/_form.html.erb b/app/views/hyrax/dashboard/collections/_form.html.erb index 3f1a8b75..8e248ab3 100644 --- a/app/views/hyrax/dashboard/collections/_form.html.erb +++ b/app/views/hyrax/dashboard/collections/_form.html.erb @@ -1,58 +1,48 @@ -<%= render "shared/nav_safety_modal" %> -
-