Merge branch 'master' into 3354-render-textile

[arvados.git] / apps / workbench / app / views / users / _home.html.erb

diff --git a/apps/workbench/app/views/users/_home.html.erb b/apps/workbench/app/views/users/_home.html.erb
index f59e65ef665d65f2555a1c5fc3024405e462ae0e..0c5739c15873b13130307818dac9e7bd5f2befce 100644 (file)
--- a/apps/workbench/app/views/users/_home.html.erb
+++ b/apps/workbench/app/views/users/_home.html.erb
@@ -27,37 +27,8 @@
       }
 <% end %>
 
-<div class="container-fluid">
+<div id="home-tables">
 
-  <div class="span3 pull-right">
-    <br/>
-
-    <div class="well">
-<% if current_user.andand.is_active %>
-  <p>Your account status:<br/>
-    <strong>Active</strong></p>
-<% elsif current_user %>
-      <p>Your account status:<br/>
-       <strong>New / inactive</strong></p>
-      <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.
-      </p>
-      <p>
-       <%= link_to raw('Contact us &#x2709;'),
-           Rails.configuration.activation_contact_link, class: "btn btn-primary" %></p>
-<% end %>
-    </div>
-
-    <%= render :partial => 'notifications' %>
-  </div>
-  
-  <div class="span8">
     <%= render :partial => 'tables' %>
-  </div>
 
 </div>