X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1944f82913c0a19254a136bf79bc353e762267e1..e522f0285d8214484d09e9342c97a1b97d7768c5:/apps/workbench/app/views/users/welcome.html.erb diff --git a/apps/workbench/app/views/users/welcome.html.erb b/apps/workbench/app/views/users/welcome.html.erb index ced69c48e3..92fd6dad46 100644 --- a/apps/workbench/app/views/users/welcome.html.erb +++ b/apps/workbench/app/views/users/welcome.html.erb @@ -1,20 +1,75 @@ -<%= image_tag "dax.png", style: "float: right; max-width: 25%; margin-left: 2em" %> -
"+respj.errors[0]+"
"; + }); + return; + } + + var redir = document.getElementById('login-return-to').value + if (redir.indexOf('?') > 0) { + redir += '&' + } else { + redir += '?' + } + resp.json().then(function(respj) { + document.location = redir + "api_token=v2/" + respj.uuid + "/" + respj.api_token; + }); + }); + } + function clear_authenticate_error() { + document.getElementById('login-authenticate-error').innerHTML = ""; + } +<% end %> + +When you click on the button below you will be taken to a Google sign-in page. - After entering your information, you will be redirected back to the Arvados - Workbench. If you have never used Arvados before, logging in for the first - time will also create a new user account. Arvados uses your your name and - email address from Google services only for identification, and will never - access any personal information.
-- - Click here to log in to Arvados Workbench with a Google account -
+ + <%= raw(Rails.configuration.Workbench.WelcomePageHTML) %> + + <% case %> + <% when Rails.configuration.Login.PAM.Enable, + Rails.configuration.Login.LDAP.Enable, + Rails.configuration.Login.Test.Enable %> + + <% else %> +