AR-1724 compact infinite record summarys by using a dl to show label/…

…value pairs
archivesspace · Jun 19, 2017 · 862fbbe · 862fbbe
1 parent 59d92d2
commit 862fbbe
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 29 deletions.
diff --git a/public-new/app/assets/stylesheets/archivesspace/infinite-scroll.scss b/public-new/app/assets/stylesheets/archivesspace/infinite-scroll.scss
@@ -58,4 +58,19 @@ $indent-width: 20px;
     h3 {
         margin-top: 0;
     }
+
+    dl.dl-horizontal {
+        margin-top: 5px;
+
+        dt {
+            text-align: left;
+            padding-left: 3px;
+            white-space: normal;
+            margin-bottom: 5px;
+            line-height: 1.2em;
+        }
+        dd {
+            line-height: 1.2em;
+        }
+    }
 }
diff --git a/public-new/app/views/resources/_infinite_item.html.erb b/public-new/app/views/resources/_infinite_item.html.erb
@@ -11,39 +11,56 @@
     <%= render partial: 'shared/single_note', locals: {:type => 'abstract', :note_struct => scopecontent_note, :notitle => true} %>
   <% end %>
 
-  <% accessrestrict_note = @result.note('accessrestrict') %>
-  <% if accessrestrict_note %>
-    <%= render partial: 'shared/single_note', locals: {:type => 'accessrestrict', :note_struct => accessrestrict_note, :notitle => false} %>
-  <% end %>
+  <dl class="dl-horizontal">
 
-  <% unless @result.dates.blank? %>
-    <h4><%= t('resource._public.dates') %></h4>
-    <%= render partial: 'shared/dates', locals: {:dates => @result.dates} %>
-  <% end %>
+    <% accessrestrict_note = @result.note('accessrestrict') %>
+    <% if accessrestrict_note && !accessrestrict_note['note_text'].blank? %>
+      <dt><%= accessrestrict_note['label'] %></dt>
+      <dd>
+        <%= render partial: 'shared/single_note', locals: {:type => 'accessrestrict', :note_struct => accessrestrict_note, :notitle => true} %>
+      </dd>
+    <% end %>
 
-  <% unless @result.extents.blank? %>
-    <h4><%= t('resource._public.extent') %></h4>
-    <% @result.extents.each do |ext| %>
-      <p class="extent"><%= inheritance(ext['_inherited']).html_safe %>
-        <%= ext['display']%>
-      </p>
+    <% unless @result.dates.blank? %>
+        <dt><%= t('resource._public.dates') %></dt>
+        <% @result.dates.each do |date| %>
+        <dd>
+          <%= inheritance(date['_inherited']).html_safe %>
+          <%= date['final_expression'] %>
+        </dd>
+        <% end %>
     <% end %>
-  <% end %>
 
-  <% unless @result.agents.blank? %>
-    <h4><%= t('pui_agent.related') %></h4>
-    <%= render partial: 'shared/present_list', locals: {:list => @result.agents, :list_clss => 'agents_list'} %>
-  <% end %>
+    <% unless @result.extents.blank? %>
+        <dt><%= t('resource._public.extent') %></dt>
+        <% @result.extents.each do |extent| %>
+          <dd>
+            <%= inheritance(extent['_inherited']).html_safe %>
+            <%= extent['display']%>
+          </dd>
+        <% end %>
+    <% end %>
 
-  <% if @result['language'] %>
-    <dl class="dl-horizontal">
-      <dt><%= t('resource._public.finding_aid.language')%></dt>
-      <dd><%= t('enumerations.language_iso639_2.' + @result['language'].downcase) %></dd>
-    </dl>
-  <% else %>
-    <% langmaterial_note = @result.note('langmaterial') %>
-    <% if langmaterial_note %>
-      <%= render partial: 'shared/single_note', locals: {:type => 'langmaterial', :note_struct => langmaterial_note, :notitle => false} %>
+    <% unless @result.agents.blank? %>
+      <dt><%= t('pui_agent.related') %></dt>
+        <% @result.agents.collect(&:last).flatten.each do |agent| %>
+          <dd>
+            <%= link_to agent.fetch('title'), agent.fetch('uri') %>
+          </dd>
+        <% end %>
     <% end %>
-  <% end %>
+
+    <% if @result['language'] %>
+        <dt><%= t('resource._public.finding_aid.language')%></dt>
+        <dd><%= t('enumerations.language_iso639_2.' + @result['language'].downcase) %></dd>
+    <% else %>
+      <% langmaterial_note = @result.note('langmaterial') %>
+      <% if langmaterial_note && !langmaterial_note['note_text'].blank? %>
+        <dt><%= t('resource._public.finding_aid.language')%></dt>
+        <dd>
+          <%= render partial: 'shared/single_note', locals: {:type => 'langmaterial', :note_struct => langmaterial_note, :notitle => false} %>
+        </dd>
+      <% end %>
+    <% end %>
+  </dl>
 </div>