X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6038a018b758e1a4babc5669df50622cd470df2f..56d21dc3d5823117729df3db6186da96f277b328:/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 e8a15f386c..9da8ea1518 100644 --- a/apps/workbench/app/views/application/show.html.erb +++ b/apps/workbench/app/views/application/show.html.erb @@ -1,25 +1,29 @@ -<% if @object.respond_to? :properties %> - <% content_for :page_title do %> -<%= @object.properties[:page_title] || @object.friendly_link_name %> + <%= (@object.respond_to?(:properties) ? @object.properties[:page_title] : nil) || + @object.friendly_link_name %> <% end %> -<% if @object.properties[:page_content] %> -<% content_for :page_content do %> -

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

+<% content_for :content_top do %> -<% if @object.properties[:page_subtitle] %> -

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

-<% end %> +<% 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_subtitle] %> +

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

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