[myexperiment-hackers] [3651] branches/packs/app/views/packs: Switched content type for type in resource tiles

[noreply]

Revision

3651

Author

dgc

Date

2013-09-01 20:39:38 +0000 (Sun, 01 Sep 2013)

Log Message

Switched content type for type in resource tiles

Modified Paths

• branches/packs/app/views/packs/_resource_tile.html.erb
• branches/packs/app/views/packs/_resource_tiles.html.erb

Diff

Modified: branches/packs/app/views/packs/_resource_tile.html.erb (3650 => 3651)

--- branches/packs/app/views/packs/_resource_tile.html.erb	2013-09-01 14:43:50 UTC (rev 3650)
+++ branches/packs/app/views/packs/_resource_tile.html.erb	2013-09-01 20:39:38 UTC (rev 3651)
@@ -1,8 +1,9 @@
 <% ore_path = resource.ore_path %>
+<% association = find_association(resource) %>
 <tr>
-  <td><img src="" find_association(resource)["image"] -%>"> <%= link_to(h(resource.folder_entry.entry_name), pack_items_path(pack) + "/" + ore_path) -%></td>
+  <td><img src="" association["image"] -%>"> <%= link_to(h(resource.folder_entry.entry_name), pack_items_path(pack) + "/" + ore_path) -%></td>
   <td><%=h resource.size -%></td>
-  <td><%=h resource.content_type -%></td>
+  <td><%=h association["label"] -%></td>
   <td><%=h resource.annotations.count -%></td>
   <td>
     <% if Authorization.check('destroy', resource, current_user) %>

Modified: branches/packs/app/views/packs/_resource_tiles.html.erb (3650 => 3651)

--- branches/packs/app/views/packs/_resource_tiles.html.erb	2013-09-01 14:43:50 UTC (rev 3650)
+++ branches/packs/app/views/packs/_resource_tiles.html.erb	2013-09-01 20:39:38 UTC (rev 3651)
@@ -2,7 +2,7 @@
   <tr>
     <th>Path</th>
     <th>Size</th>
-    <th>Content type</th>
+    <th>Type</th>
     <th>Annotations</th>
     <th></th>
   </tr>