[ARVADOS] created: 579300424ef50990ff9414f2eabf8f371f278d99

[git at public.curoverse.com]

        at  579300424ef50990ff9414f2eabf8f371f278d99 (commit)


commit 579300424ef50990ff9414f2eabf8f371f278d99
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Feb 10 22:43:05 2014 -0800

    Mock up add/remove tag UI.

diff --git a/apps/workbench/app/assets/javascripts/application.js b/apps/workbench/app/assets/javascripts/application.js
index 4c83198..3d2914b 100644
--- a/apps/workbench/app/assets/javascripts/application.js
+++ b/apps/workbench/app/assets/javascripts/application.js
@@ -47,8 +47,21 @@ jQuery(function($){
         }).
         on('ajax:complete', function(e, status) {
             $('.loading').hide();
+        }).
+        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(' <a>×</a>')).
+                    append('<br/>');
+            }
+            return false;
         });
 })(jQuery);
-
-
-
diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index c35620c..c992959 100644
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -125,3 +125,16 @@ ul.arvados-nav li ul li {
     width: 100px;
     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;
+}
diff --git a/apps/workbench/app/views/collections/_index_tbody.html.erb b/apps/workbench/app/views/collections/_index_tbody.html.erb
index 9252886..a34b213 100644
--- 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(' ',' ')) 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 %> <a>×</a></span><br/>
+      <% end %>
     <% end %>
+    </span>
+    <a class="btn btn-xs btn-info add-tag-button"><i class="glyphicon glyphicon-plus"></i> Add</a>
   </td>
   <td>
     <% if @collection_info[c.uuid][:wanted_by_me] %>

-----------------------------------------------------------------------


hooks/post-receive
--