Merge branch 'hotfix-1.6.10'

duke-libraries · Apr 17, 2020 · ca7d729 · ca7d729
2 parents 2bceadb + 76db54f
commit ca7d729
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/app/assets/stylesheets/dul_argon/base.scss b/app/assets/stylesheets/dul_argon/base.scss
@@ -43,3 +43,10 @@ a:hover {
 img.trln_request_icon {
   margin-right: 0.4em;
 }
+
+.url-note {
+    background: #e6f3e7;
+    border-left: 4px solid #00830e;
+    padding: 5px 10px;
+    color: #00760d;
+}
diff --git a/app/views/hathitrust/etas.html.erb b/app/views/hathitrust/etas.html.erb
@@ -1,8 +1,14 @@
-<% unless etas_argon_url_hash.fetch(:href, nil).blank? && document.record_owner == 'duke' %>
+<% unless etas_argon_url_hash.fetch(:href, nil).blank? %>
   <div class="<%= primary_link_class %>">
     <ul>
       <li><%= link_to_fulltext_url(etas_argon_url_hash) %></li>
     </ul>
+    <div class="etas-note-wrapper">
+      <dl class="dl-horizontal">
+        <dt><span class="url-note-label label label-info">Note</span></dt>
+        <dd><span class="url-note">View a version of this item available temporarily from HathiTrust.</span></dd>
+      </dl>
+    </div>
   </div>
   <div class="<%= items_spacer_class %>"></div>
 <% end %>
diff --git a/app/views/hathitrust/show.html.erb b/app/views/hathitrust/show.html.erb
@@ -0,0 +1,14 @@
+<% unless hathitrust_argon_url_hash.fetch(:href, nil).blank? %>
+  <div class="<%= primary_link_class %>">
+    <ul>
+      <li><%= link_to_open_access(hathitrust_argon_url_hash) %></li>
+    </ul>
+    <div class="etas-note-wrapper">
+      <dl class="dl-horizontal">
+        <dt><span class="url-note-label label label-info">Note</span></dt>
+        <dd><span class="url-note">View a version of this item from HathiTrust.</span></dd>
+      </dl>
+    </div>
+  </div>
+  <div class="<%= items_spacer_class %>"></div>
+<% end %>
diff --git a/lib/dul_argon_skin/version.rb b/lib/dul_argon_skin/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DulArgonSkin
-  VERSION = '1.6.9'
+  VERSION = '1.6.10'
 end