diff --git a/app/assets/stylesheets/mdl.scss b/app/assets/stylesheets/mdl.scss index a997c491..03e0f1c3 100644 --- a/app/assets/stylesheets/mdl.scss +++ b/app/assets/stylesheets/mdl.scss @@ -1502,6 +1502,8 @@ a.view-text:hover { .leftPanel .views .thumbsView .thumbs .thumb .wrap.video { background-image: none !important; } + + height: inherit; } .iiif-av-component .controls-container { @@ -1513,10 +1515,23 @@ a.view-text:hover { padding-top: 10px; } } + +.caption-choices-list-item { + padding-bottom: 0 !important; +} + +.uv-wrapper { + height: 768px; +} /* End item page styles */ /* Spotlight styles */ +.embed-uv { + width: 100%; + height: 768px; +} + .card-back .description { font-size: 14px; } diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index 2d36efe6..17a18b60 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -210,6 +210,12 @@ def parse_referrer_pagination_params(query_string) # Spotlight additions config.show.oembed_field = :oembed_url_ssm config.show.partials.insert(1, :oembed) + # Allows the "item embed" widget to utilize universalviewer + config.view.embed( + partials: [:embed_uv], + if: false, + locals: { view_config: config.show } + ) config.show.tile_source_field = :image_uri_ssi config.index.tile_source_field = :image_uri_ssi config.document_solr_path = 'get' diff --git a/app/views/catalog/_embed_uv.html.erb b/app/views/catalog/_embed_uv.html.erb new file mode 100644 index 00000000..0ca9f6f2 --- /dev/null +++ b/app/views/catalog/_embed_uv.html.erb @@ -0,0 +1,3 @@ +
+ <%= render('universalviewer', document:) %> +
diff --git a/app/views/catalog/_show_default.html.erb b/app/views/catalog/_show_default.html.erb index 161cec51..224a6244 100644 --- a/app/views/catalog/_show_default.html.erb +++ b/app/views/catalog/_show_default.html.erb @@ -1,8 +1,3 @@ -<% - borealis_doc = MDL::BorealisDocument.new(document:) - manifest_url = borealis_doc.manifest_url -%> -
<%= content_tag :div, @@ -11,8 +6,8 @@ <% end %>
-
-
+
+ <%= render('universalviewer', document:) %>
@@ -36,148 +31,7 @@ } %> -<% content_for(:head) do %> - - - - -<% end %> - <% content_for(:webpack_bundles) do %> <%= javascript_pack_tag 'drawMap' %> <%= javascript_pack_tag 'citation' %> <% end %> - -<% content_for(:blocking_javascript) do %> - -<% end %> diff --git a/app/views/catalog/_universalviewer.html.erb b/app/views/catalog/_universalviewer.html.erb new file mode 100644 index 00000000..a7741d38 --- /dev/null +++ b/app/views/catalog/_universalviewer.html.erb @@ -0,0 +1,136 @@ +<% + borealis_doc = MDL::BorealisDocument.new(document:) + manifest_url = borealis_doc.manifest_url +%> + +
+ +<% content_for(:head) do %> + + + +<% end %> + +<% content_for(:blocking_javascript) do %> + +<% end %>