From 273c4fd5c7e8e32dc8bdb9c06e66d003f34acff7 Mon Sep 17 00:00:00 2001 From: Xiaoming Hu Date: Tue, 19 Dec 2023 23:49:43 +0100 Subject: [PATCH 1/4] Extended Metadata unfolded at start #1696 add "expand all" and "collapse all" buttons --- .../stylesheets/linked_extended_metadata.css | 12 +++++++++ app/helpers/extended_metadata_helper.rb | 2 +- ...xtended_metadata_attribute_values.html.erb | 26 +++++++++++++++++-- 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/linked_extended_metadata.css b/app/assets/stylesheets/linked_extended_metadata.css index 138061afb7..fee60b92ba 100644 --- a/app/assets/stylesheets/linked_extended_metadata.css +++ b/app/assets/stylesheets/linked_extended_metadata.css @@ -55,3 +55,15 @@ padding: 0px 0px; border-radius: 5px; } + +#extended-metadata .panel-heading-button { + display: flex; + justify-content: space-between; + align-items: center; +} + +.extended_metadata-small-btn{ + font-size: 1rem; + padding: 0.2rem 0.5rem; +} + diff --git a/app/helpers/extended_metadata_helper.rb b/app/helpers/extended_metadata_helper.rb index 7361f78253..46738abb76 100644 --- a/app/helpers/extended_metadata_helper.rb +++ b/app/helpers/extended_metadata_helper.rb @@ -38,7 +38,7 @@ def render_extended_metadata_value(attribute, resource) content_tag(:div, class: 'extended_metadata') do if attribute.linked_extended_metadata? || attribute.linked_extended_metadata_multi? content_tag(:span, class: 'linked_extended_metdata_display') do - folding_panel(attribute.label, true, id: attribute.title) do + folding_panel(attribute.label, false, id: attribute.title) do display_attribute(resource.extended_metadata, attribute, link: true) end end diff --git a/app/views/extended_metadata/_extended_metadata_attribute_values.html.erb b/app/views/extended_metadata/_extended_metadata_attribute_values.html.erb index 77de064f8f..f2cf20d264 100644 --- a/app/views/extended_metadata/_extended_metadata_attribute_values.html.erb +++ b/app/views/extended_metadata/_extended_metadata_attribute_values.html.erb @@ -4,7 +4,15 @@ <% if resource.respond_to?(:extended_metadata) && resource.extended_metadata %>
-
<%= label %> (<%= resource.extended_metadata.extended_metadata_type.title %>)
+
+
+ <%= label %> (<%= resource.extended_metadata.extended_metadata_type.title %>) +
+
+ + +
+
<% resource.extended_metadata.extended_metadata_attributes.each do |attribute| %> <%= render_extended_metadata_value(attribute, resource) %> @@ -12,4 +20,18 @@
<% else %> -<% end %> \ No newline at end of file +<% end %> + + From 66ca77fea2874f6f8bf852bad230899629866704 Mon Sep 17 00:00:00 2001 From: whomingbird Date: Wed, 10 Jan 2024 15:17:24 +0100 Subject: [PATCH 2/4] only show "expand all" and "collapse all" buttons when there are linked extended metadata types --- .../_extended_metadata_attribute_values.html.erb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/views/extended_metadata/_extended_metadata_attribute_values.html.erb b/app/views/extended_metadata/_extended_metadata_attribute_values.html.erb index f2cf20d264..634650bd86 100644 --- a/app/views/extended_metadata/_extended_metadata_attribute_values.html.erb +++ b/app/views/extended_metadata/_extended_metadata_attribute_values.html.erb @@ -2,19 +2,21 @@ label = 'Extended Metadata' %> <% if resource.respond_to?(:extended_metadata) && resource.extended_metadata %> - + <% metadata_type = resource.extended_metadata.extended_metadata_type %>
- <%= label %> (<%= resource.extended_metadata.extended_metadata_type.title %>) + <%= label %> (<%= metadata_type.title %>)
+ <% if metadata_type.extended_metadata_attributes.select{ |x|x.linked_extended_metadata? || x.linked_extended_metadata_multi? }.any? %>
+ <% end %>
- <% resource.extended_metadata.extended_metadata_attributes.each do |attribute| %> + <% metadata_type.extended_metadata_attributes.each do |attribute| %> <%= render_extended_metadata_value(attribute, resource) %> <% end %>
From 9a2fdcfdd05543fdb0eea82f4dd5c0a478dd31cc Mon Sep 17 00:00:00 2001 From: whomingbird Date: Thu, 11 Jan 2024 08:48:30 +0100 Subject: [PATCH 3/4] code refactoring --- .../_extended_metadata_attribute_values.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/extended_metadata/_extended_metadata_attribute_values.html.erb b/app/views/extended_metadata/_extended_metadata_attribute_values.html.erb index 634650bd86..1cf70e55eb 100644 --- a/app/views/extended_metadata/_extended_metadata_attribute_values.html.erb +++ b/app/views/extended_metadata/_extended_metadata_attribute_values.html.erb @@ -8,7 +8,7 @@
<%= label %> (<%= metadata_type.title %>)
- <% if metadata_type.extended_metadata_attributes.select{ |x|x.linked_extended_metadata? || x.linked_extended_metadata_multi? }.any? %> + <% if metadata_type.attributes_with_linked_extended_metadata_type.any? %>
From 460e057b9ab491c0278f295b4020cbd79cbd0106 Mon Sep 17 00:00:00 2001 From: whomingbird Date: Thu, 11 Jan 2024 08:51:23 +0100 Subject: [PATCH 4/4] make "remove" and "add new" buttons smaller --- ...ncy_linked_extended_metadata_multi_attribute_fields.html.erb | 2 +- app/views/extended_metadata/_single_row.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/extended_metadata/_fancy_linked_extended_metadata_multi_attribute_fields.html.erb b/app/views/extended_metadata/_fancy_linked_extended_metadata_multi_attribute_fields.html.erb index e5789c03ff..06e156178a 100644 --- a/app/views/extended_metadata/_fancy_linked_extended_metadata_multi_attribute_fields.html.erb +++ b/app/views/extended_metadata/_fancy_linked_extended_metadata_multi_attribute_fields.html.erb @@ -19,7 +19,7 @@ <% end %>
- <%= button_link_to('Add new', 'add', '#', :id => "add-row-#{prefix}") %> + <%= button_link_to('Add new', 'add', '#', :id => "add-row-#{prefix}", class: 'extended_metadata-small-btn') %>
diff --git a/app/views/extended_metadata/_single_row.html.erb b/app/views/extended_metadata/_single_row.html.erb index 930fb7544d..38cca5fa8d 100644 --- a/app/views/extended_metadata/_single_row.html.erb +++ b/app/views/extended_metadata/_single_row.html.erb @@ -25,7 +25,7 @@
<% if allow_row_removal %>
-