From 025a76abfc0bb01cf29b0d55c52e92af3b7dafab Mon Sep 17 00:00:00 2001
From: Carolyn Cole <cam156@psu.edu>
Date: Fri, 7 Feb 2014 08:13:57 -0500
Subject: [PATCH] Removing hard coded asset paths, which do not work in
 production.  While doing that upgrading to use existing partials and rails
 helpers for those links.

---
 .../_thumbnail_display.html.erb               |  4 +-
 .../generic_files/_media_display.html.erb     |  6 +--
 app/views/users/_contributions.html.erb       | 48 ++++++++-----------
 3 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/app/views/dashboard/_index_partials/_thumbnail_display.html.erb b/app/views/dashboard/_index_partials/_thumbnail_display.html.erb
index a7780a6fbb..cddc36b75a 100644
--- a/app/views/dashboard/_index_partials/_thumbnail_display.html.erb
+++ b/app/views/dashboard/_index_partials/_thumbnail_display.html.erb
@@ -2,8 +2,8 @@
 <% if document.image? || document.pdf? || document.video? %>
   <% path = sufia.download_path(document.noid, {datastream_id: 'thumbnail'}) %>
 <% elsif document.audio? %>
-  <% path = "/assets/audio.png" %>
+  <% path = "audio.png" %>
 <% else %>
-  <% path = "/assets/default.png" %>
+  <% path = "default.png" %>
 <% end %>
 <%= link_to image_tag(path, {width: width}), sufia.generic_file_path(document) %>
diff --git a/app/views/generic_files/_media_display.html.erb b/app/views/generic_files/_media_display.html.erb
index 3a4b91b001..6f162c7f51 100644
--- a/app/views/generic_files/_media_display.html.erb
+++ b/app/views/generic_files/_media_display.html.erb
@@ -1,5 +1,5 @@
 <% if @generic_file.image? %>
-  <a href="<%= sufia.download_path(@generic_file) %>" target="_new" title="Download the full-sized image"><img src="<%= sufia.download_path(@generic_file, {:datastream_id => 'thumbnail'}) %>" width="338" alt="Download the full-sized image of <%= @generic_file.title.first %>"/>Download the full-sized image</a>
+  <%= link_to image_tag(sufia.download_path(@generic_file, datastream_id: 'thumbnail'),{width:"338", alt:"Download the full-sized image of #{@generic_file.title.first}"})+"Download the full-sized image", sufia.download_path(@generic_file), { target:"_new", title:"Download the full-sized image"}%>
 <% elsif @generic_file.video? %>
   <video controls="controls" class="video-js vjs-default-skin" data-setup="{}" preload="auto">
     <source src="<%= sufia.download_path(@generic_file, datastream_id: 'webm') %>" type="video/webm" />
@@ -13,7 +13,7 @@
     Your browser does not support the audio tag.
   </audio>
 <% elsif @generic_file.pdf?%>
-  <a href="<%= sufia.download_path(@generic_file) %>" target="_new" title="Download the full-sized PDF"><img src="<%= sufia.download_path(@generic_file, datastream_id: 'thumbnail') %>" width="338" alt="Download the full-sized PDF of <%= @generic_file.title.first %>"/>Download the full-sized PDF</a>
+  <%= link_to image_tag(sufia.download_path(@generic_file, datastream_id: 'thumbnail'),{width:"338", alt:"Download the full-sized PDF of #{@generic_file.title.first}"})+"Download the full-sized PDF", sufia.download_path(@generic_file), { target:"_new", title:"Download the full-sized PDF"}%>
 <% else %>
-  <a href="<%= sufia.download_path(@generic_file) %>" target="_new"><img src="/assets/default.png" alt="No preview available" width="338" height="493" /></a>
+  <%= link_to image_tag("default.png", {alt:"No preview available", width:"338", height:"493"}),  sufia.download_path(@generic_file), { target:"_new", title:"Download the document"} %>
 <% end %>
diff --git a/app/views/users/_contributions.html.erb b/app/views/users/_contributions.html.erb
index 2004822a19..6d855b7759 100644
--- a/app/views/users/_contributions.html.erb
+++ b/app/views/users/_contributions.html.erb
@@ -1,29 +1,21 @@
-        <div class="tab-pane active" id="contributions">
-		      <i class="icon-trophy trophy-on" ></i> <strong>Highlighted Files</strong>
-		      <% if @trophies.count > 0 %>
-		        <table>
-		        <% @trophies.each do |t| %>
-              <tr id="trophyrow_<%= Sufia::Noid.noidify(t.pid) %>">   
-		          <% if t.image? || t.pdf? %>
-		            <% temp_thumbnail_path = sufia.download_path(t) + "?datastream_id=thumbnail" %>
-		            <% temp_href = "<a href=\"" + sufia.download_path(t) + "\"> <img src=\"" + temp_thumbnail_path + "\" width=\"90\" alt=\"Download the full-sized image\"/></a>" %>
-		          <% else %>
-		            <% temp_href = "<a href=\"" + sufia.download_path(t) + "\"> <img src=\"/assets/default.png\"  width=\"90\" alt=\"Download file\"/></a>" %>
-		          <% end %>                                 
-		          <td>  
-                <%= temp_href.html_safe() %> 
-		          </td>
-		          <td>
-		            <%= link_to display_title(t), sufia.generic_file_path(t) %>
-                <% if current_user == @user %>
-                  <%= link_to raw("<i class='trophy-on icon-remove'></i>"),"", class: 'trophy-on trophy-class', title: "Click to remove from Highlighted files.", id: Sufia::Noid.noidify(t.pid),  remote: true, data: {removerow: "true" }  %>
-                <% end %>
-		          </td>
-		          </tr>
-		        <% end %>
-		        </table>
-		      <% else %>
-		        <%= @user.name %> has no highlighted files.
-		      <% end %>
-        </div>
+<div class="tab-pane active" id="contributions">
+  <i class="icon-trophy trophy-on"></i> <strong>Highlighted Files</strong>
+  <% if @trophies.count > 0 %>
+    <table>
+      <% @trophies.each do |t| %>
+        <tr id="trophyrow_<%= Sufia::Noid.noidify(t.pid) %>">
+          <td>
+            <%= render partial: "dashboard/_index_partials/thumbnail_display", locals: {document: t, width: 90} %>
+          </td>
+          <td>
+            <%= link_to display_title(t), sufia.generic_file_path(t) %>
+            <%= link_to raw("<i class='trophy-on icon-remove'></i>"), "", class: 'trophy-on trophy-class', title: "Click to remove from Highlighted files.", id: Sufia::Noid.noidify(t.pid), remote: true, data: {removerow: "true"} if current_user == @user%>
+          </td>
+        </tr>
+      <% end %>
+    </table>
+  <% else %>
+    <%= @user.name %> has no highlighted files.
+  <% end %>
+</div>