Merge branch 'master' into 2060-edit-tags-in-workbench

Conflicts:
	apps/workbench/app/assets/javascripts/application.js
	apps/workbench/app/assets/stylesheets/application.css.scss

diff --git a/apps/workbench/app/assets/javascripts/application.js b/apps/workbench/app/assets/javascripts/application.js
index 927e7ae1defc44b269bfa38c36380313c9c21dee..4d9c1b8be3defc57579d8469a7aa47217cc7ade3 100644 (file)
--- a/apps/workbench/app/assets/javascripts/application.js
+++ b/apps/workbench/app/assets/javascripts/application.js
@@ -47,6 +47,22 @@ jQuery(function($){
         }).
         on('ajax:complete', function(e, status) {
             $('.loading').fadeOut('fast', 0);
+        }).
+        on('click', '.removable-tag a', function(e) {
+            $(this).parents('[data-tag-link-uuid]').eq(0).next().andSelf().remove();
+        }).
+        on('click', 'a.add-tag-button', function(e) {
+            new_tag = window.prompt("Add tag for collection "+
+                                    $(this).parents('tr').attr('data-object-uuid'),
+                                    "");
+            if (new_tag != null) {
+                $(this).
+                    parent().
+                    find('>span').
+                    append($('<span class="label label-info removable-tag" data-tag-link-uuid=""></span>').text(new_tag).append('&nbsp;<a>&times;</a>')).
+                    append('<br/>');
+            }
+            return false;
         });
 
     HeaderRowFixer = function(selector) {

diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index 5ada51a936a33d7e6fc3e622a443e63bc90ddd0c..a4163f8b3fe136c2456d530470a2e1fb9ec836b4 100644 (file)
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -126,6 +126,17 @@ ul.arvados-nav li ul li {
     display:inline-block;
 }
 
+td.add-tag-button .add-tag-button {
+    margin-top: 2px;
+    opacity: 0;
+}
+td.add-tag-button:hover .add-tag-button {
+    opacity: 1;
+}
+.removable-tag a {
+    cursor: pointer;
+}
+
 li.notification {
     padding: 10px;
 }

diff --git a/apps/workbench/app/views/collections/_index_tbody.html.erb b/apps/workbench/app/views/collections/_index_tbody.html.erb
index 9252886bb2094cf05ee6819ce9dbab290471d16b..a34b213e5ab6cdae1fb0c04c3e9b1c40ffdd310d 100644 (file)
--- a/apps/workbench/app/views/collections/_index_tbody.html.erb
+++ b/apps/workbench/app/views/collections/_index_tbody.html.erb
@@ -1,6 +1,6 @@
 <% @collections.each do |c| %>
 
-<tr class="collection">
+<tr class="collection" data-object-uuid="<%= c.uuid %>">
   <td>
     <%= link_to_if_arvados_object c.uuid %>
   </td>
@@ -20,10 +20,15 @@
   <td>
     <%= raw(distance_of_time_in_words(c.created_at, Time.now).sub('about ','~').sub(' ','&nbsp;')) if c.created_at %>
   </td>
-  <td>
+  <td class="add-tag-button">
+    <span>
     <% if @collection_info[c.uuid] %>
-      <%= @collection_info[c.uuid][:tags].uniq.join ', ' %>
+      <% @collection_info[c.uuid][:tags].uniq.each do |tag| %>
+        <span class="label label-info removable-tag" data-tag-link-uuid=""><%= tag %>&nbsp;<a>&times;</a></span><br/>
+      <% end %>
     <% end %>
+    </span>
+    <a class="btn btn-xs btn-info add-tag-button"><i class="glyphicon glyphicon-plus"></i>&nbsp;Add</a>
   </td>
   <td>
     <% if @collection_info[c.uuid][:wanted_by_me] %>