projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3112-report-bug
[arvados.git]
/
apps
/
workbench
/
app
/
views
/
projects
/
_show_tab_contents.html.erb
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 df37d3e1c7051ad6b1da1fcb0af7fb77d6aecc91..8ea2e6cc181ac893ea6a4a02d967336d2d1538d0 100644
(file)
--- a/
apps/workbench/app/views/projects/_show_tab_contents.html.erb
+++ b/
apps/workbench/app/views/projects/_show_tab_contents.html.erb
@@
-2,7
+2,7
@@
<div class="row">
<div class="col-sm-5">
<div class="btn-group btn-group-sm">
<div class="row">
<div class="col-sm-5">
<div class="btn-group btn-group-sm">
- <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Selection... <
i class="fa fa-fw fa-long-arrow-down "></i
></button>
+ <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Selection... <
span class="caret"></span
></button>
<ul class="dropdown-menu" role="menu">
<li><%= link_to "Compare selected", '#',
'data-href' => compare_pipeline_instances_path,
<ul class="dropdown-menu" role="menu">
<li><%= link_to "Compare selected", '#',
'data-href' => compare_pipeline_instances_path,
@@
-14,7
+14,8
@@
'data-selection-param-name' => 'item_uuids[]',
'data-selection-action' => 'remove',
'data-remote' => true,
'data-selection-param-name' => 'item_uuids[]',
'data-selection-action' => 'remove',
'data-remote' => true,
- 'method' => 'delete'
+ 'method' => 'delete',
+ 'data-toggle' => 'dropdown'
%></li>
<li><%= link_to "Move selected", '#',
'data-href' => choose_projects_path(
%></li>
<li><%= link_to "Move selected", '#',
'data-href' => choose_projects_path(
@@
-33,27
+34,28
@@
</div>
</div>
<div class="col-sm-4 pull-right">
</div>
</div>
<div class="col-sm-4 pull-right">
- <input type="text" class="form-control filterable-control" placeholder="Search project contents" data-filterable-target="table.arv-index.arv-project-<%= tab_
nam
e %> tbody"/>
+ <input type="text" class="form-control filterable-control" placeholder="Search project contents" data-filterable-target="table.arv-index.arv-project-<%= tab_
pan
e %> tbody"/>
</div>
</div>
</div>
</div>
- <table class="table table-condensed
table-fixedlayout arv-index arv-project-<%= tab_name %>" style="overflow-x: hidden
">
+ <table class="table table-condensed
arv-index arv-project-<%= tab_pane %>
">
<colgroup>
<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>
</colgroup>
- <tbody data-infinite-scroller="#<%= tab_name %>-scroll" data-infinite-content-href="<%= url_for(format: :json, partial: :contents_rows, offset: page_offset, filters: "#{filters}") if page_offset %>">
- <%= render partial: 'show_contents_rows', locals: {project: @object, objects_and_names: objects_and_names} %>
+ <tbody data-infinite-scroller="#<%= tab_pane %>-scroll" data-infinite-content-href="<%= url_for partial: :contents_rows, filters: filters.to_json %>">
</tbody>
<thead>
<tr>
</tbody>
<thead>
<tr>
- <th>
- </th>
- <th>
- description
- </th>
+ <th>
</th>
+ <
th><
/th>
+ <th>
</th>
+ <th>name</th>
+ <
th>description<
/th>
</tr>
</thead>
</table>
</tr>
</thead>
</table>
-
</div>
</div>