[ARVADOS] updated: 45741702d88801640ca6c59269edb610dc2b6071

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/users/_tables.html.erb |   25 ++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

       via  45741702d88801640ca6c59269edb610dc2b6071 (commit)
      from  7722719387453c7ab5f9326536daa2655cad60c9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 45741702d88801640ca6c59269edb610dc2b6071
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Mar 4 21:57:40 2014 -0500

    Fixed default inactive user page.

diff --git a/apps/workbench/app/views/users/_tables.html.erb b/apps/workbench/app/views/users/_tables.html.erb
index 09ca3ce..320f32c 100644
--- a/apps/workbench/app/views/users/_tables.html.erb
+++ b/apps/workbench/app/views/users/_tables.html.erb
@@ -250,7 +250,30 @@
 </div>
 
 <% else %>
-  <%= image_tag "dax.png", style: "max-width=40%" %>
+
+  <div class="row-fluid">
+    <div class="col-sm-4">
+      <%= image_tag "dax.png", style: "max-width:100%" %>
+    </div>
+    <div class="col-sm-8">
+      <h2>Welcome to Arvados, <%= current_user.first_name %>!</h2>
+      <div class="well">
+	<p>
+	  Your account must be activated by an Arvados administrator.  If this
+	  is your first time accessing Arvados and would like to request
+	  access, or you believe you are seeing the page in error, please 
+	  <%= link_to "contact us", Rails.configuration.activation_contact_link %>.  
+	  You should receive an email at the address you used to log in when
+	  your account is activated.  In the mean time, you can 
+	  <%= link_to "learn more about Arvados", "https://arvados.org/projects/arvados/wiki/Introduction_to_Arvados" %>,
+	  and <%= link_to "read the Arvados user guide", "http://doc.arvados.org/user" %>.
+	</p>
+	<p style="padding-bottom: 1em">
+	  <%= link_to raw('Contact us &#x2709;'),
+	      Rails.configuration.activation_contact_link, class: "pull-right btn btn-primary" %></p>
+      </div>
+    </div>
+  </div>
 <% end %>
 
 <% content_for :js do %>

-----------------------------------------------------------------------


hooks/post-receive
--