Merge pull request #2053 from projectblacklight/2052-citation-fix

Move modal content into _citation partial and simply render that from…

Author: mejackreed

app/views/catalog/_citation.html.erb

@@ -1,21 +1,26 @@
+<div class="modal-header">
+  <h1><%= t('blacklight.tools.citation') %></h1>
+  <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+    <span aria-hidden="true">&times;</span>
+  </button>
+</div>
+<div class="modal-body">
+  <% @documents.each do |document| %>
+    <h1 class="modal-title"><%= document_heading(document) %></h1>
 
-<% @documents.each do |document| %>
+    <% if document.respond_to?(:export_as_mla_citation_txt) %>
+      <h2><%= t('blacklight.citation.mla') %></h2>
+      <%= document.send(:export_as_mla_citation_txt).html_safe %><br/><br/>
+    <% end %>
 
-  <h1 class="modal-title"><%= document_heading(document) %></h1>
+    <% if document.respond_to?(:export_as_apa_citation_txt) %>
+      <h2><%= t('blacklight.citation.apa') %></h2>
+      <%= document.send(:export_as_apa_citation_txt).html_safe %><br/><br/>
+    <% end %>
 
-<% if document.respond_to?(:export_as_mla_citation_txt) %>
-  <h2><%= t('blacklight.citation.mla') %></h2>
-  <%= document.send(:export_as_mla_citation_txt).html_safe %><br/><br/>
-<% end %>
-
-<% if document.respond_to?(:export_as_apa_citation_txt) %>
-  <h2><%= t('blacklight.citation.apa') %></h2>
-  <%= document.send(:export_as_apa_citation_txt).html_safe %><br/><br/>
-<% end %>
-
-<%- if document.respond_to?(:export_as_chicago_citation_txt) -%>
-  <h2><%= t('blacklight.citation.chicago') %></h2>
-  <%= document.send(:export_as_chicago_citation_txt).html_safe %>
-<%- end -%>
-
-<% end %>
+    <% if document.respond_to?(:export_as_chicago_citation_txt) %>
+      <h2><%= t('blacklight.citation.chicago') %></h2>
+      <%= document.send(:export_as_chicago_citation_txt).html_safe %>
+    <% end %>
+  <% end %>
+</div>

app/views/catalog/citation.html.erb

@@ -1 +1 @@
-<%= render :partial => 'citation' -%>
+<%= render partial: 'citation' %>

app/views/catalog/citation.js.erb

@@ -1,9 +1 @@
-<div class="modal-header">
-  <h1><%= t('blacklight.tools.citation') %></h1>
-  <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
-    <span aria-hidden="true">&times;</span>
-  </button>
-</div>
-<div class="modal-body">
-<%= render :partial => 'citation' -%>
-</div>
+<%= render partial: 'citation' %>