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
new file mode 100644
index 00000000..4dc01375
--- /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, { alt: @presenter.solr_document.title }, 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' %>
+
+
+
+
-
- -
-
- <%= t('.tabs.description') %>
-
+
+
- <%= simple_form_for @form, url: [hyrax, :dashboard, @form], html: { class: 'editor nav-safety', data: { behavior: 'collection-form', 'param-key' => @form.model_name.param_key } } do |f| %>
-
-
-
-
+ <%= simple_form_for @form, url: [hyrax, :dashboard, @form], html: { class: 'editor' } do |f| %>
+
+
+
+
<% f.object.primary_terms.each do |term| %>
<%= render_edit_field_partial(term, f: f) %>
<% end %>
- <% # TODO: Remove check for PcdmCollection when Issue #5286 is resolved. %>
- <% if f.object.persisted? && !(Hyrax.config.collection_class < Valkyrie::Resource) %>
+ <% if f.object.persisted? %>
<%# we're loading these values dynamically to speed page load %>
<%= f.input :thumbnail_id,
- input_html: { data: { text: thumbnail_label_for(object: f.object) } } %>
+ input_html: { data: { text: f.object.thumbnail_title } } %>
<% end %>
<% if f.object.display_additional_fields? %>
<%= link_to t('hyrax.collection.form.additional_fields'),
'#extended-terms',
- class: 'btn btn-secondary additional-fields',
+ class: 'btn btn-default additional-fields',
data: { toggle: 'collapse' },
role: "button",
'aria-expanded'=> "false",
@@ -80,38 +70,32 @@
<% if @form.persisted? %>
- <% if collection_brandable?(collection: @collection) %>
-
-
-
- <%= render 'form_branding', f: f %>
-
+
+
+
+ <%= render 'form_branding', f: f %>
- <% end %>
+
- <% if collection_discoverable?(collection: @collection) %>
-
-
-
- <%= render 'form_discovery', f: f %>
-
+
+
+
+ <%= render 'form_discovery', f: f %>
- <% end %>
+
- <% if collection_sharable?(collection: @collection) %>
-
-
-
- <%= render 'form_share', f: f %>
-
+
+
+
+ <%= render 'form_share', f: f %>
- <% end %>
+
<% end %>
-