projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15803: Adjust workbench1 user panel to promote setup/unsetup buttons
[arvados.git]
/
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 71b1cd15984e6b45151e8ab7ec8ad2d8a60f32bb..bd3afbb681f098a1f3fe726e7d9bc49f671240ac 100644
(file)
--- a/
apps/workbench/app/views/layouts/application.html.erb
+++ b/
apps/workbench/app/views/layouts/application.html.erb
@@
-8,9
+8,9
@@
SPDX-License-Identifier: AGPL-3.0 %>
<meta charset="utf-8">
<title>
<% if content_for? :page_title %>
<meta charset="utf-8">
<title>
<% if content_for? :page_title %>
- <%= yield :page_title %> / <%= Rails.configuration.
site_n
ame %>
+ <%= yield :page_title %> / <%= Rails.configuration.
Workbench.SiteN
ame %>
<% else %>
<% else %>
- <%= Rails.configuration.
site_n
ame %>
+ <%= Rails.configuration.
Workbench.SiteN
ame %>
<% end %>
</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<% end %>
</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
@@
-18,6
+18,11
@@
SPDX-License-Identifier: AGPL-3.0 %>
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
<meta name="description" content="">
<meta name="author" content="">
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
<meta name="description" content="">
<meta name="author" content="">
+ <% if current_user %>
+ <% content_for :js do %>
+ window.defaultSession = <%=raw({baseURL: Rails.configuration.Services.Controller.ExternalURL.to_s, token: Thread.current[:arvados_api_token], user: current_user}.to_json)%>
+ <% end %>
+ <% end %>
<% 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 %>
<% 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 %>
@@
-27,8
+32,8
@@
SPDX-License-Identifier: AGPL-3.0 %>
social graph that search engines can use. http://ogp.me/ %>
<meta property="og:type" content="article" />
<meta property="og:url" content="<%= request.url %>" />
social graph that search engines can use. http://ogp.me/ %>
<meta property="og:type" content="article" />
<meta property="og:url" content="<%= request.url %>" />
- <meta property="og:site_name" content="<%= Rails.configuration.
site_n
ame %>" />
- <% if @object %>
+ <meta property="og:site_name" content="<%= Rails.configuration.
Workbench.SiteN
ame %>" />
+ <% if
defined?(@object) &&
@object %>
<% if @object.respond_to?(:name) and @object.name.present? %>
<meta property="og:title" content="<%= @object.name%>" />
<% end %>
<% if @object.respond_to?(:name) and @object.name.present? %>
<meta property="og:title" content="<%= @object.name%>" />
<% end %>
@@
-44,7
+49,7
@@
SPDX-License-Identifier: AGPL-3.0 %>
<%= yield :head %>
<%= javascript_tag do %>
angular.module('Arvados').value('arvadosApiToken', '<%=Thread.current[:arvados_api_token]%>');
<%= yield :head %>
<%= javascript_tag do %>
angular.module('Arvados').value('arvadosApiToken', '<%=Thread.current[:arvados_api_token]%>');
- angular.module('Arvados').value('arvadosDiscoveryUri', '<%= Rails.configuration.
arvados_v1_base.sub '/arvados/v1',
'/discovery/v1/apis/arvados/v1/rest' %>');
+ angular.module('Arvados').value('arvadosDiscoveryUri', '<%= Rails.configuration.
Services.Controller.ExternalURL.to_s +
'/discovery/v1/apis/arvados/v1/rest' %>');
<%= yield :js %>
<% end %>
<style>
<%= yield :js %>
<% end %>
<style>