[ARVADOS] updated: d92e6647371dc3894555043d630fb5c297ef5d6c

[Git user]

Summary of changes:
 .../app/assets/javascripts/edit_collection.js      |  2 ++
 .../app/views/collections/_show_tags.html.erb      | 26 +++++++++++++---------
 2 files changed, 17 insertions(+), 11 deletions(-)

       via  d92e6647371dc3894555043d630fb5c297ef5d6c (commit)
      from  a55340ef920f13f6c451e593718bf5a2f91c62b4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit d92e6647371dc3894555043d630fb5c297ef5d6c
Author: radhika <radhika at curoverse.com>
Date:   Fri Jun 16 15:20:45 2017 -0400

    9426: few mote UI updates for collection#Tags tab
    
    Arvados-DCO-1.1-Signed-off-by: Radhika Chippada <radhika at curoverse.com>

diff --git a/apps/workbench/app/assets/javascripts/edit_collection.js b/apps/workbench/app/assets/javascripts/edit_collection.js
index 11bf60a..14240d2 100644
--- a/apps/workbench/app/assets/javascripts/edit_collection.js
+++ b/apps/workbench/app/assets/javascripts/edit_collection.js
@@ -28,6 +28,7 @@ $(document).
                 $("#Upload-tab").attr("data-toggle", "tab");
 
                 $('.edit-collection-tags').removeClass('disabled');
+                $('#edit-collection-tags').attr('title', '');
             } else {
                 // User clicked "no" and so do not unlock
             }
@@ -46,6 +47,7 @@ $(document).
 
             $('.edit-collection-tags').removeClass('hide');
             $('.edit-collection-tags').addClass('disabled');
+            $('#edit-collection-tags').attr('title', 'Unlock collection to edit tags');
             $('.collection-tag-add').addClass('hide');
             $('.collection-tag-remove').addClass('hide');
             $('.collection-tag-save').addClass('hide');
diff --git a/apps/workbench/app/views/collections/_show_tags.html.erb b/apps/workbench/app/views/collections/_show_tags.html.erb
index 856f810..ed40873 100644
--- a/apps/workbench/app/views/collections/_show_tags.html.erb
+++ b/apps/workbench/app/views/collections/_show_tags.html.erb
@@ -1,16 +1,16 @@
 <%
   object = @object unless object
-  props = object.properties
+  tags = object.properties[:tags]
 %>
 
   <div class="collection-tags-container" style="padding-left:2em;padding-right:2em;">
-    <div>
-      <% if object.editable? %>
-        <button type="button" class="btn btn-primary edit-collection-tags disabled" title="Unlock collection to edit tags">Edit</button>
-      <% end %>
-    </div>
+    <% if object.editable? %>
+      <p title="Unlock collection to edit tags" id="edit-collection-tags">
+        <button type="button" class="btn btn-primary edit-collection-tags disabled">Edit</button>
+      </p>
+    <% end %>
 
-    <table class="table table-condensed table-fixedlayout collection-tags-table">
+    <table class="table table-condensed table-fixedlayout collection-tags-table" border="1">
       <colgroup>
         <col width="5%" />
         <col width="25%" />
@@ -26,7 +26,7 @@
       </thead>
 
       <tbody>
-        <% props.each do |k, v| %>
+        <% tags.andand.each do |k, v| %>
           <tr class="collection-tag-<%=k%>">
             <td>
               <i class="glyphicon glyphicon-remove collection-tag-remove hide" style="cursor: pointer;"></i>
@@ -50,11 +50,15 @@
         </tr>
       </tbody>
     </table>
-    <i class="glyphicon glyphicon-plus collection-tag-add hide" style="cursor: pointer;">Add new tag</i>
     <div>
       <% if object.editable? %>
-        <button type="button" class="btn btn-primary collection-tag-save hide">Save</button>
-        <button type="button" class="btn btn-primary collection-tag-cancel hide">Cancel</button>
+        <div class="pull-left">
+          <button class="btn btn-primary btn-sm collection-tag-add hide"><i class="glyphicon glyphicon-plus"></i> Add new tag </button>
+        </div>
+        <div class="pull-right">
+          <button type="button" class="btn btn-primary collection-tag-save hide">Save</button>
+          <button type="button" class="btn btn-primary collection-tag-cancel hide">Cancel</button>
+        </div>
       <% end %>
     </div>
   </div>

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


hooks/post-receive
--