fixed conflicts

UCLALibrary · Oct 15, 2019 · d489715 · d489715
1 parent a57b503
commit d489715
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/app/views/catalog/_index.html.erb b/app/views/catalog/_index.html.erb
@@ -1,14 +1,17 @@
 <% doc_presenter = index_presenter(document) %>
 <div class="metadata-thumbnail-wrapper">
-  <%# default partial to display solr document fields in catalog index view -%>
+<!-- default partial to display solr document fields in catalog index view -->
 
-  <dl class="document-metadata dl-invert row">
-
-    <% doc_presenter.fields_to_render.each do | field_name, field | -%>
-      <dt class="blacklight-<%= field_name.parameterize %> col-md-3"><%= render_index_field_label document, field: field_name %></dt>
-      <dd class="blacklight-<%= field_name.parameterize %> col-md-9"><%= doc_presenter.field_value field %></dd>
-    <% end -%>
-  </dl>
+<dl class="document-metadata dl-invert row">
+  <% doc_presenter.fields_to_render.each do | field_name, field | -%>
+    <dt class="blacklight-<%= field_name.parameterize %> col-md-3"><%= render_index_field_label document, field: field_name %></dt>
+    <dd class="blacklight-<%= field_name.parameterize %> col-md-9"><%= doc_presenter.field_value field %></dd>
+    <% if field_name = "Description" %>
+      <dt class="blacklight-<%= field_name.parameterize %> col-md-3"></dt>
+      <dd class="blacklight-<%= field_name.parameterize %> col-md-9">&nbsp;&nbsp;&nbsp;</dd>
+    <% end %>    
+  <% end -%>
+</dl>
 
   <% if presenter(document).thumbnail.exists? && tn = presenter(document).thumbnail.thumbnail_tag({}, counter: document_counter_with_offset(document_counter)) %>
     <div class="document-thumbnail"><%= tn %></div>