Merge branch 'master' into 3088-project-chooser-on-run-pipeline-template

[arvados.git] / 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 90790856ae17f155e1b9ffb9e0492951e732c3e6..d6eca3a2155d2e7c50b58e030884fc5c8f323dcc 100644 (file)
--- a/apps/workbench/app/views/application/show.html.erb
+++ b/apps/workbench/app/views/application/show.html.erb
@@ -1 +1,30 @@
-<%= render :partial => 'application/arvados_object' %>
+<% content_for :page_title do %>
+  <%= (@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 %>
+      <h1>
+        <%= render_content_from_database(@object.properties[:page_title] || @object.uuid) %>
+      </h1>
+      
+      <% if @object.properties[:page_subtitle] %>
+        <h4>
+          <%= render_content_from_database @object.properties[:page_subtitle] %>
+        </h4>
+      <% 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 }%>
+