+ <% if document.direct_download.present? || document.hgl_download.present? || document.iiif_download.present? || document.download_types.present? %>
+
-
- <% elsif document.direct_download.present? || document.hgl_download.present? || document.iiif_download.present? %>
-
- <% end %>
-
<% elsif document.restricted? && document.same_institution? %>
-
- <%= link_to t('geoblacklight.tools.login_to_view'), login_path %>
+
+
<% end %>
diff --git a/app/views/catalog/_show_main_content.html.erb b/app/views/catalog/_show_main_content.html.erb
new file mode 100644
index 00000000..253b6097
--- /dev/null
+++ b/app/views/catalog/_show_main_content.html.erb
@@ -0,0 +1,25 @@
+<%= render(Blacklight::SearchContextComponent.new(search_context: @search_context, search_session: search_session)) if search_session['document_id'] == @document.id %>
+
+<% @page_title = t('blacklight.search.show.title', document_title: Deprecation.silence(Blacklight::BlacklightHelperBehavior) { document_show_html_title }, application_name: application_name).html_safe %>
+<% content_for(:head) { render_link_rel_alternates } %>
+<%= render Blacklight::DocumentMetadataRestrictedComponent.new(document: @document) %>
+<%= render (blacklight_config.view_config(:show).document_component || Blacklight::DocumentComponent).new(presenter: document_presenter(@document), component: :div, title_component: :h1, show: true) do |component| %>
+ <% component.footer do %>
+ <% if @document.respond_to?(:export_as_openurl_ctx_kev) %>
+
+
+ <% end %>
+ <% end %>
+
+ <%# Use :body for complete backwards compatibility (overriding the component body markup),
+ but if the app explicitly opted-in to components, make the partials data available as :partials to ease migrations pain %>
+ <% component.public_send(blacklight_config.view_config(:show).document_component.blank? && blacklight_config.view_config(:show).partials.any? ? :body : :partial) do %>
+
+ <%= render_document_partials @document, blacklight_config.view_config(:show).partials, component: component %>
+
+ <% end %>
+<% end %>
diff --git a/app/views/catalog/_show_tools_old.html.erb b/app/views/catalog/_show_tools_old.html.erb
deleted file mode 100644
index d5bb7425..00000000
--- a/app/views/catalog/_show_tools_old.html.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-<%-
- # Compare with render_document_functions_partial helper, and
- # _document_functions partial. BL actually has two groups
- # of document-related tools. "document functions" by default
- # contains Bookmark functionality shown on both results and
- # item view. While "document tools" contains external export type
- # functions by default only on detail.
-
--%>
-<% if show_doc_actions? %>
-
-<% end %>
diff --git a/app/views/catalog/_upper_metadata.html.erb b/app/views/catalog/_upper_metadata.html.erb
deleted file mode 100644
index 5a7fe06c..00000000
--- a/app/views/catalog/_upper_metadata.html.erb
+++ /dev/null
@@ -1,30 +0,0 @@
-<% document ||= @document %>
-<% doc_presenter = show_presenter(document) %>
-
-
- <% if @document.rights_text %>
-
×
- <% end %>
- <% if (document["dct_isPartOf_sm"]) && (document["dct_isPartOf_sm"].include? ("2015 Dublin LiDAR")) %>
- <%= render 'laefer_notice' %>
- <% end %>
- <% if (document["dct_isPartOf_sm"]) && (document["dct_isPartOf_sm"].include? ("2019 Sunset Park LiDAR")) %>
- <%= render 'laefer_sunset' %>
- <% end %>
-
- <%# From https://github.com/projectblacklight/blacklight/blob/master/app/views/catalog/_show_default.html.erb %>
- <%# default partial to display solr document fields in catalog show view -%>
-
- <% document_show_fields(document).each do |field_name, field| -%>
- <% if should_render_show_field? document, field %>
- <%= render_document_show_field_label document, field: field_name %>
- <%= doc_presenter.field_value field %>
- <% end -%>
- <% end -%>
- <% if !@document.references.nil? && !@document.references.url.nil? %>
- Preservation record:
- <%= link_to @document.references.url.endpoint, @document.references.url.endpoint %>
- <% end %>
-
-
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index c3c5b641..b845af37 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,14 +1,17 @@
-
-
NYU Spatial Data Repository
- <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
- <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
- <%= csrf_meta_tags %>
-
-
+
+
NYU Spatial Data Repository
+
+ <%= csrf_meta_tags %>
+ <%= csp_meta_tag %>
-<%= yield %>
+ <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
+ <%= javascript_tag '$.fx.off = true;' if Rails.env.test? %>
+ <%= javascript_importmap_tags %>
+
-
+
+ <%= yield %>
+
diff --git a/app/views/layouts/blacklight.html.erb b/app/views/layouts/blacklight.html.erb
index eadc9f77..472412b9 100644
--- a/app/views/layouts/blacklight.html.erb
+++ b/app/views/layouts/blacklight.html.erb
@@ -1,51 +1,26 @@
-
-
-
-
-
-
-
+<% content_for(:content) do %>
+ <% if content_for? :sidebar %>
+
-
-
-
-
-
-
-
-
-
-
-
<%= render_page_title %>
- <%= opensearch_description_tag application_name, opensearch_catalog_url(:format => 'xml') %>
- <%= favicon_link_tag 'favicon.ico' %>
- <%= stylesheet_link_tag "application", media: "all" %>
- <%= javascript_include_tag "application" %>
- <%= csrf_meta_tags %>
- <%= content_for(:head) %>
-
-
-
-
-
-
-
-
- <%= render :partial => 'shared/header_navbar' %>
- <%= render partial: 'shared/ajax_modal' %>
-
- <%= content_tag :h1, application_name, class: 'sr-only application-heading' %>
- <%= render :partial => '/flash_msg', layout: 'shared/flash_messages' %>
-
- <%= yield %>
+
+ <% else %>
+
+ <%= yield %>
+
+
+ <%= render CuratedCollections::CuratedCollectionsComponent.new(collections: ::NyuGeoblacklight::CuratedCollections.collections.sample(2),
+ header: 'Featured Collections') %>
+ <%= render CuratedCollections::CuratedCollectionsComponent.new(collections: ::NyuGeoblacklight::CuratedCollections.recent[0..1],
+ header: 'Recently Updated') %>
+
+ <%= render CuratedMaps::CuratedMapsComponent.new(maps: ::NyuGeoblacklight::CuratedCollections.maps.sample(3)) %>
-
- <%= render :partial => 'shared/footer' %>
-
-
-
+
+ <% end %>
+<% end %>
+
+<%= render template: "layouts/blacklight/base" %>
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
new file mode 100644
index 00000000..cbd34d2e
--- /dev/null
+++ b/app/views/layouts/mailer.html.erb
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+ <%= yield %>
+
+
diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb
new file mode 100644
index 00000000..37f0bddb
--- /dev/null
+++ b/app/views/layouts/mailer.text.erb
@@ -0,0 +1 @@
+<%= yield %>
diff --git a/app/views/record_mailer/email_record.text.erb b/app/views/record_mailer/email_record.text.erb
deleted file mode 100644
index d17a6054..00000000
--- a/app/views/record_mailer/email_record.text.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<% @documents.each do |document| %>
-<%= document.to_email_text %>
-<%= t('blacklight.email.text.url', :url =>polymorphic_url(document, @url_gen_params)) %>
-<% end %>
-<%= t('blacklight.email.text.message', :message => @message) %>
\ No newline at end of file
diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb
index 798f07cb..bb8cf046 100644
--- a/app/views/shared/_footer.html.erb
+++ b/app/views/shared/_footer.html.erb
@@ -13,7 +13,7 @@
<%= image_tag 'dss_newlogo1-short-sz.png', alt: 'Link to Data Services Homepage', height: 30 %>
-
Running SDR <%= NyuGeoblacklight::VERSION %>
+
Running SDR <%= Settings.VERSION %>