Fixed up some glyphicons

diff --git a/apps/workbench/app/views/application/_recent.html.erb b/apps/workbench/app/views/application/_recent.html.erb
index 6ea381868e90e6ed6f9c2fd9d2d03f77a977f9a0..86b6b049f9cfd54df064b247fe051143a79d2f9a 100644 (file)
--- a/apps/workbench/app/views/application/_recent.html.erb
+++ b/apps/workbench/app/views/application/_recent.html.erb
@@ -46,7 +46,7 @@
       <td>
         <% if object.editable? %>
         <%= link_to({action: 'destroy', id: object.uuid}, method: :delete, remote: true, data: {confirm: "You are about to delete #{controller.model_class} #{object.uuid}.\n\nAre you sure?"}) do %>
-        <i class="icon-trash"></i>
+        <i class="glyphicon glyphicon-trash"></i>
         <% end %>
         <% end %>
       </td>

diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index b7f4ad318b52f87aa4a0392b9de38ed00526200d..2e2fb8488243047bc73562d49b2fc2086cdfa51a 100644 (file)
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -160,7 +160,8 @@
           <% [['Data', [['humans'],
                         ['traits'],
                         ['specimens'],
-                        ['collections', 'Files']]],
+                        ['collections', 'Files'],
+                        ['links']]],
               ['Compute', [['pipeline_templates', 'Pipelines'],
                            ['repositories', 'Code repositories'],
                            ['virtual_machines']]],

diff --git a/apps/workbench/app/views/links/_recent.html.erb b/apps/workbench/app/views/links/_recent.html.erb
index 76e959a2431bb8fba448274b7585fe9c3c8d995f..7548ae111f51b9f24886fe5990baef4f6e6dc953 100644 (file)
--- a/apps/workbench/app/views/links/_recent.html.erb
+++ b/apps/workbench/app/views/links/_recent.html.erb
@@ -38,7 +38,7 @@
 
       <td>
         <% if current_user and (current_user.is_admin or current_user.uuid == link.owner_uuid) %>
-        <%= link_to raw('<i class="icon-trash"></i>'), { action: 'destroy', id: link.uuid }, { confirm: 'Delete this link?', method: 'delete' } %>
+        <%= link_to raw('<i class="glyphicon glyphicon-trash"></i>'), { action: 'destroy', id: link.uuid }, { confirm: 'Delete this link?', method: 'delete' } %>
         <% end %>
       </td>
 

diff --git a/apps/workbench/app/views/pipeline_instances/_recent.html.erb b/apps/workbench/app/views/pipeline_instances/_recent.html.erb
index 481d276e3090339a9c5906a430593168a30e244a..ef394e8c8660b416c61ca9ccb1aec00aa49c7526 100644 (file)
--- a/apps/workbench/app/views/pipeline_instances/_recent.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_recent.html.erb
@@ -58,12 +58,6 @@
         </small>
       </td><td>
         <%= ob.created_at %>
-      </td><td>
-        <% if ob.editable? %>
-        <%= link_to({action: 'destroy', id: ob.uuid}, method: :delete, remote: true, data: {confirm: "You are about to delete #{controller.model_class} #{ob.uuid}.\n\nAre you sure?"}) do %>
-        <i class="icon-trash"></i>
-        <% end %>
-        <% end %>
       </td>
     </tr>