projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 4026-project-move-admin
[arvados.git]
/
apps
/
workbench
/
app
/
views
/
application
/
_content_layout.html.erb
diff --git
a/apps/workbench/app/views/application/_content_layout.html.erb
b/apps/workbench/app/views/application/_content_layout.html.erb
index c8e38277201b7a465fcc53a1f7b82556d7c18f31..ff597d9994ad05663f14d443ef7b56ecdba3969f 100644
(file)
--- a/
apps/workbench/app/views/application/_content_layout.html.erb
+++ b/
apps/workbench/app/views/application/_content_layout.html.erb
@@
-1,13
+1,10
@@
-<
%= content_for :content_top %
>
- <%
if @object and @object.is_a?(Group) and @object.group_class.in?(['project','folder'])
%>
+<
div class="clearfix"
>
+ <%
= content_for :content_top
%>
<div class="pull-right">
<%= content_for :tab_line_buttons %>
</div>
<div class="pull-right">
<%= content_for :tab_line_buttons %>
</div>
- <br clear="all" />
-<% else %>
- <br clear="all" />
- <div class="pull-right">
- <%= content_for :tab_line_buttons %>
- </div>
-<% end %>
+</div>
+
<%= content_for :tab_panes %>
<%= content_for :tab_panes %>
+
+<%= render :partial => 'loading_modal' %>