X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7e44e7ea12b604b8823c24f468c33e9f33fb6e5f..46a7d27450216b1e022d23396931aa1b46c58c73:/apps/workbench/app/views/application/show.html.erb diff --git a/apps/workbench/app/views/application/show.html.erb b/apps/workbench/app/views/application/show.html.erb index f3046990c1..d6eca3a215 100644 --- a/apps/workbench/app/views/application/show.html.erb +++ b/apps/workbench/app/views/application/show.html.erb @@ -1,25 +1,30 @@ <% content_for :page_title do %> -<%= (@object.respond_to?(:properties) ? @object.properties[:page_title] : nil) || - @object.friendly_link_name %> + <%= (@object.respond_to?(:properties) ? @object.properties[:page_title] : nil) || + @name_link.andand.name || + @object.friendly_link_name %> <% end %> +<% content_for :content_top do %> + <% if @object.respond_to? :properties %> -<% if @object.properties[:page_content] %> -<% content_for :page_content do %> -

-<%= render_content_from_database(@object.properties[:page_title] || @object.uuid) %> -

+ <% if @object.properties[:page_content] %> + <% content_for :page_content do %> +

+ <%= render_content_from_database(@object.properties[:page_title] || @object.uuid) %> +

+ + <% if @object.properties[:page_subtitle] %> +

+ <%= render_content_from_database @object.properties[:page_subtitle] %> +

+ <% end %> -<% if @object.properties[:page_subtitle] %> -

-<%= render_content_from_database @object.properties[:page_subtitle] %> -

+ <%= render_content_from_database @object.properties[:page_content] %> + <% end %> + <% end %> <% end %> -<%= render_content_from_database @object.properties[:page_content] %> -<% end %> -<% end %> <% end %> +<%= render partial: 'content', layout: 'content_layout', locals: {pane_list: controller.show_pane_list }%> -<%= render :partial => 'application/arvados_object' %>