[ARVADOS] updated: 7482410350df49dbddab05448b167bf61f14d71e

[git at public.curoverse.com]

Summary of changes:
 .../app/views/projects/_show_contents_rows.html.erb   |  7 +++++++
 .../app/views/projects/_show_tab_contents.html.erb    | 19 +++++++++++--------
 2 files changed, 18 insertions(+), 8 deletions(-)

       via  7482410350df49dbddab05448b167bf61f14d71e (commit)
       via  4169ee2834e63a0a13aa6b2e853a2d43659f1048 (commit)
      from  a5fbf74ba1454a555f2c74290e2ff08596955bb3 (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 7482410350df49dbddab05448b167bf61f14d71e
Merge: a5fbf74 4169ee2
Author: Brett Smith <brett at curoverse.com>
Date:   Wed Aug 13 16:39:40 2014 -0400

    Merge branch '3421-wide-project-tables-wip'
    
    Closes #3421, #3584.


commit 4169ee2834e63a0a13aa6b2e853a2d43659f1048
Author: Brett Smith <brett at curoverse.com>
Date:   Wed Aug 13 12:07:06 2014 -0400

    3421: Make Workbench project contents tables variable width.
    
    This change will ensure that users can see the "edit name" buttons, by
    letting a table row grow as needed to accommodate long names.  It puts
    each row's buttons in dedicated cells to try to stay true to the
    original layout as much as possible.

diff --git a/apps/workbench/app/views/projects/_show_contents_rows.html.erb b/apps/workbench/app/views/projects/_show_contents_rows.html.erb
index d3a2e98..e1996a7 100644
--- a/apps/workbench/app/views/projects/_show_contents_rows.html.erb
+++ b/apps/workbench/app/views/projects/_show_contents_rows.html.erb
@@ -9,7 +9,9 @@
       <div style="width:1em; display:inline-block;">
         <%= render partial: 'selection_checkbox', locals: {object: name_object, friendly_name: ((name_object.name rescue '') || '')} %>
       </div>
+    </td>
 
+    <td>
       <% if @object.editable? %>
         <%= link_to({action: 'remove_item', id: @object.uuid, item_uuid: ((name_link && name_link.uuid) || object.uuid)}, method: :delete, remote: true, data: {confirm: "Remove #{object.class_for_display.downcase} #{name_object.name rescue object.uuid} from this project?", toggle: 'tooltip', placement: 'top'}, class: 'btn btn-sm btn-default btn-nodecorate', title: 'remove') do %>
           <i class="fa fa-fw fa-trash-o"></i>
@@ -17,11 +19,16 @@
       <% else %>
         <i class="fa fa-fw"></i><%# placeholder %>
       <% end %>
+    </td>
 
+    <td>
       <%= render :partial => "show_object_button", :locals => {object: object, size: 'sm', name_link: name_link} %>
+    </td>
 
+    <td>
       <%= render_editable_attribute (name_link || object), 'name', nil, {tiptitle: 'rename'} %>
     </td>
+
     <td class="arv-description-in-table">
       <%= render_controller_partial(
           'show_object_description_cell.html',
diff --git a/apps/workbench/app/views/projects/_show_tab_contents.html.erb b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
index c9c4dc0..e3884b6 100644
--- a/apps/workbench/app/views/projects/_show_tab_contents.html.erb
+++ b/apps/workbench/app/views/projects/_show_tab_contents.html.erb
@@ -37,20 +37,23 @@
     </div>
   </div>
 
-  <table class="table table-condensed table-fixedlayout arv-index arv-project-<%= tab_pane %>" style="overflow-x: hidden">
+  <table class="table table-condensed arv-index arv-project-<%= tab_pane %>">
     <colgroup>
-      <col width="40%" />
-      <col width="60%" />
+      <col width="0*" style="max-width: fit-content;" />
+      <col width="0*" style="max-width: fit-content;" />
+      <col width="0*" style="max-width: fit-content;" />
+      <col width="60%" style="width: 60%;" />
+      <col width="40%" style="width: 40%;" />
     </colgroup>
     <tbody data-infinite-scroller="#<%= tab_pane %>-scroll" data-infinite-content-href="<%= url_for partial: :contents_rows, filters: filters.to_json %>">
     </tbody>
     <thead>
       <tr>
-        <th>
-        </th>
-        <th>
-          description
-        </th>
+        <th></th>
+        <th></th>
+        <th></th>
+        <th>name</th>
+        <th>description</th>
       </tr>
     </thead>
   </table>

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


hooks/post-receive
--