[ARVADOS] updated: 29c763eb4a438cbaf48ad0a188a01e69b9ecebb8
git at public.curoverse.com
git at public.curoverse.com
Thu Jan 9 12:09:28 EST 2014
Summary of changes:
.../views/users/{home.html.erb => _home.html.erb} | 0
apps/workbench/app/views/users/home.html.erb | 72 +-------------------
2 files changed, 1 insertions(+), 71 deletions(-)
copy apps/workbench/app/views/users/{home.html.erb => _home.html.erb} (100%)
via 29c763eb4a438cbaf48ad0a188a01e69b9ecebb8 (commit)
via 9ab5271a6bdd7a2b24f238e6348580bde850f2e4 (commit)
from ad6b2213951d8e2b0ec41e7b1aff70a32b75de9f (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 29c763eb4a438cbaf48ad0a188a01e69b9ecebb8
Merge: 9ab5271 ad6b221
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Thu Jan 9 12:09:45 2014 -0500
Merge branch 'master' of git.clinicalfuture.com:arvados
commit 9ab5271a6bdd7a2b24f238e6348580bde850f2e4
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Thu Jan 9 12:02:04 2014 -0500
Tweaked user home template to make theming easier.
diff --git a/apps/workbench/app/views/users/home.html.erb b/apps/workbench/app/views/users/_home.html.erb
similarity index 100%
copy from apps/workbench/app/views/users/home.html.erb
copy to 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 883b6a0..9fb2c27 100644
--- a/apps/workbench/app/views/users/home.html.erb
+++ b/apps/workbench/app/views/users/home.html.erb
@@ -1,71 +1 @@
-<% content_for :css do %>
- .dash-list {
- padding: 9px 0;
- }
- .dash-list>ul>li>a>span {
- min-width: 1.5em;
- margin-left: auto;
- margin-right: auto;
- }
- .job-table {
- white-space: nowrap;
- table-layout: fixed;
- }
- .job-table td {
- overflow: hidden;
- overflow-x: hidden;
- text-overflow: ellipsis;
- }
- .centerme {
- margin-left: auto;
- margin-right: auto;
- text-align: center;
- }
- .bigfatnumber {
- font-size: 4em;
- font-weight: bold;
- }
- .dax {
- max-width: 10%;
- margin-right: 1em;
- float: left
- }
- .daxalert {
- overflow: hidden;
- }
-<% end %>
-
-<div class="container-fluid">
-
- <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 ✉'),
- Rails.configuration.activation_contact_link, class: "btn btn-primary" %></p>
-<% end %>
- </div>
-
- <%= render :partial => 'notifications' %>
- </div>
-
- <div class="span8">
- <%= render :partial => 'tables' %>
- </div>
-
-</div>
+<%= render :partial => 'home' %>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list