X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8acdf166ab8add0a62d4bfa3817c88cdc870d935..b653d031a5dbf2a42cf81d787753e945bf3911b4:/apps/workbench/app/views/layouts/application.html.erb diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb index a06a9bef79..0a309db5b5 100644 --- a/apps/workbench/app/views/layouts/application.html.erb +++ b/apps/workbench/app/views/layouts/application.html.erb @@ -2,10 +2,22 @@ - <%= Rails.configuration.site_name rescue Rails.application.class.parent_name %> + + <% if content_for? :page_title %> + <%= yield :page_title %> / <%= Rails.configuration.site_name %> + <% else %> + <%= Rails.configuration.site_name %> + <% end %> + + + + <% if current_user and $arvados_api_client.discovery[:websocketUrl] %> + + <% end %> + <%= stylesheet_link_tag "application", :media => "all" %> <%= javascript_include_tag "application" %> <%= csrf_meta_tags %> @@ -14,55 +26,27 @@ <%= yield :js %> <% end %> + +<%= piwik_tracking_tag %> - -
-
-
- - - - - - <%= Rails.configuration.site_name rescue Rails.application.class.parent_name %> -
-
    - <% [ - [true, 'Keys', authorized_keys_path], - [true, 'VMs', virtual_machines_path], - [true, 'Data', collections_path], - [true, 'Groups', groups_path], - [true, 'Pipeline Templates', pipeline_templates_path], - [true, 'Pipeline Instances', pipeline_instances_path], - [true, 'Jobs', jobs_path] - ].each do |admin_only, name, path| %> - <% if !admin_only or (current_user and current_user.is_admin) %> - ><%= name %> - <% end %> - <% end %> -
-
    - <% if current_user -%> -
  • Log out
    • - <% else -%> -
  • Log in
    • - <% end -%> -
-
-
-
-
- -
- - <%= yield %> - -
- +<%= render template: 'layouts/body' %> +<%= javascript_tag do %> +<%= yield :footer_js %> +<% end %>