Merge branch '3381-job-progress-bar-bug' closes #3381

[arvados.git] / 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 05f71573debc417bc7170b89b06b752d4f48c8c0..9cacebda02971ccdbff2d28569dd7a6d55e35cff 100644 (file)
--- a/apps/workbench/app/views/users/welcome.html.erb
+++ b/apps/workbench/app/views/users/welcome.html.erb
@@ -1,9 +1,38 @@
-<h1>Please log in to use Arvados Workbench.</h1>
-</p>
-<p style="margin-top: 1em">
-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 Google services for only for identification, and will never access any personal information.
-</p>
-<p style="margin-top: 1em">
-  <a  class="btn btn-primary" href="<%= $arvados_api_client.arvados_login_url(return_to: request.url) %>">Click here to log in to Arvados Workbench with a Google account</a>
-</p>
+<% content_for :breadcrumbs do raw '<!-- -->' end %>
 
+<div class="row">
+  <div class="col-sm-8 col-sm-push-4" style="margin-top: 1em">
+    <div class="well clearfix">
+      <%= image_tag "dax.png", style: "width: 147px; height: 197px; max-width: 25%; margin-right: 2em", class: 'pull-left' %>
+
+      <h3>Please log in.</h3>
+
+      <p>
+
+        The "Log in" button below will show you a Google sign-in page.
+       After you assure Google that you want to log in here with your
+       Google account, you will be redirected back here to
+       <%= Rails.configuration.site_name %>.
+
+      </p><p>
+
+       If you have never used <%= Rails.configuration.site_name %>
+       before, logging in for the first time will automatically
+       create a new account.
+
+      </p><p>
+
+        <i><%= Rails.configuration.site_name %> uses your name and
+       email address only for identification, and does not retrieve
+       any other personal information from Google.</i>
+
+      </p>
+      <p>
+       <%= link_to arvados_api_client.arvados_login_url(return_to: request.url), class: "pull-right btn btn-primary" do %>
+          Log in to <%= Rails.configuration.site_name %>
+          <i class="fa fa-fw fa-arrow-circle-right"></i>
+        <% end %>
+      </p>
+    </div>
+  </div>
+</div>