X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/696e9cc71bb82411bb73148e5cdf1d68b11b709b..e50d40423bb2bf1fa1fe940b91006bfcd1643a8c:/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 f92b32c801..0a309db5b5 100644 --- a/apps/workbench/app/views/layouts/application.html.erb +++ b/apps/workbench/app/views/layouts/application.html.erb @@ -4,7 +4,7 @@ <% if content_for? :page_title %> - <%= yield :page_title %> + <%= yield :page_title %> / <%= Rails.configuration.site_name %> <% else %> <%= Rails.configuration.site_name %> <% end %> @@ -14,6 +14,10 @@ <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon"> <meta name="description" content=""> <meta name="author" content=""> + <% if current_user and $arvados_api_client.discovery[:websocketUrl] %> + <meta name="arv-websocket-url" content="<%=$arvados_api_client.discovery[:websocketUrl]%>?api_token=<%=Thread.current[:arvados_api_token]%>"> + <% end %> + <meta name="robots" content="NOINDEX, NOFOLLOW"> <%= stylesheet_link_tag "application", :media => "all" %> <%= javascript_include_tag "application" %> <%= csrf_meta_tags %> @@ -22,98 +26,27 @@ <%= yield :js %> <% end %> <style> - body { - padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */ + <%= yield :css %> + body { + min-height: 100%; + height: 100%; } + @media (max-width: 979px) { body { padding-top: 0; } } + + @media (max-width: 767px) { + .breadcrumbs { + display: none; + } + } </style> + <link href="//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.css" rel="stylesheet"> +<%= piwik_tracking_tag %> </head> <body> - - <div class="navbar navbar-inverse navbar-fixed-top"> - <div class="navbar-inner"> - <a class="brand" style="margin-left: 1px" href="/"><%= Rails.configuration.site_name rescue Rails.application.class.parent_name %></a> - - <ul class="nav pull-right"> - <% if current_user -%> - <li><span class="badge badge-info" style="margin: 10px auto 10px; padding-top: 4px; padding-bottom: 4px"><%= current_user.email %></span></li> - <li><a href="<%= logout_path %>">Log out</a></li> - <% else -%> - <li><a href="<%= $arvados_api_client.arvados_login_url(return_to: root_url) %>">Log in</a></li> - <% end -%> - </ul> - - <% if current_user.andand.is_active %> - <ul class="nav"> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown"> - Access <b class="caret"></b> - </a> - <ul class="dropdown-menu"> - <li><%= link_to 'Keys', authorized_keys_path %></li> - <li><%= link_to 'VMs', virtual_machines_path %></li> - <li><%= link_to 'Repositories', repositories_path %></li> - <li><%= link_to 'API Tokens', api_client_authorizations_path %></li> - </ul> - </li> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown"> - Compute <b class="caret"></b> - </a> - <ul class="dropdown-menu"> - <li><%= link_to 'Jobs', jobs_path %></li> - <li><%= link_to 'Pipeline instances', pipeline_instances_path %></li> - <li><%= link_to 'Pipeline templates', pipeline_templates_path %></li> - </ul> - </li> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown"> - Data <b class="caret"></b> - </a> - <ul class="dropdown-menu"> - <li><%= link_to 'Collections', collections_path %></li> - <li><%= link_to 'Humans', humans_path %></li> - <li><%= link_to 'Traits', traits_path %></li> - </ul> - </li> - <% if current_user.is_admin %> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown"> - Admin <b class="caret"></b> - </a> - <ul class="dropdown-menu"> - <li><%= link_to 'Users', users_path %></li> - <li><%= link_to 'Groups', groups_path %></li> - <li><%= link_to 'Nodes', nodes_path %></li> - </ul> - </li> - <% end %> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown"> - Docs <b class="caret"></b> - </a> - <ul class="dropdown-menu"> - <li><%= link_to 'Tutorials and User guide', "http://doc.arvados.org/user", target: "_blank" %></li> - <li><%= link_to 'API Reference', "http://doc.arvados.org/api", target: "_blank" %></li> - <li><%= link_to 'Admin guide', "http://doc.arvados.org/admin", target: "_blank" %></li> - <li><%= link_to 'Install guide', "http://doc.arvados.org/install", target: "_blank" %></li> - </ul> - </li> - - </ul> - <% end %> - </div> - </div> - - <div class="container"> - - <%= yield %> - - </div> <!-- /container --> - - <%= piwik_tracking_tag %> - <%= javascript_tag do %> - <%= yield :footer_js %> - <% end %> +<%= render template: 'layouts/body' %> +<%= javascript_tag do %> +<%= yield :footer_js %> +<% end %> </body> </html>