[ARVADOS] created: 42db7b0f5120a762bcb061f04116bba792706de5
git at public.curoverse.com
git at public.curoverse.com
Fri Dec 27 10:26:57 EST 2013
at 42db7b0f5120a762bcb061f04116bba792706de5 (commit)
commit 42db7b0f5120a762bcb061f04116bba792706de5
Merge: 461b2b4 18b95ab
Author: Peter Amstutz <peter.amstutz at clinicalfuture.com>
Date: Fri Dec 27 10:27:08 2013 -0500
Merge branch '1678-new-user-orientation-pete-wfh' of git.clinicalfuture.com:arvados into 1678-new-active-user-orientation
Conflicts:
apps/workbench/app/views/users/home.html.erb
diff --cc apps/workbench/app/views/users/home.html.erb
index 7fa729f,fd49d8e..7c4c707
--- a/apps/workbench/app/views/users/home.html.erb
+++ b/apps/workbench/app/views/users/home.html.erb
@@@ -25,27 -25,37 +25,58 @@@
<% if current_user.andand.is_active %>
++
+<% if @my_ssh_keys.count == 0%>
- <div class="alert alert-block alert-info row-fluid">
++ <div class="alert alert-info">
+ <button type="button" class="close" data-dismiss="alert">×</button>
- <div class="span6">
- <p>I noticed that you have not yet set up an SSH public key for use with Arvados.
++ <div class="span5" style="overflow: hidden; margin-right: 1em">
++ <%= image_tag "dax.png", style: "max-width: 10%; margin-right: 1em; float: left" %>
++ Hi, I noticed that you have not yet set up an SSH public key for use with Arvados.
+ <%= link_to "Click here to learn how to create a SSH key pair.",
- "http://doc.arvados.org/user/getting_started/ssh-access.html" %>
++ "http://doc.arvados.org/user/getting_started/ssh-access.html", class: "alert-link" %>
+ After you have created an SSH key, you can paste your SSH public key
+ in the text box.
- </p>
+ </div>
- <div class="span5">
+ <%= form_for AuthorizedKey.new do |f| %>
+ <%= hidden_field_tag :return_to, request.original_url %>
- <%= f.text_area :public_key, cols: 40, rows: 5, value: "Put your public key here" %>
- <%= f.submit :Save %>
++ <%= f.text_area :public_key, cols: 50, rows: 4, placeholder: "Paste your public key here", style: "width: 45%" %>
++ <%= f.submit :Save, value: raw("✓"), class: "btn btn-primary", style: "vertical-align: top" %>
+ <% end %>
- </div>
+ </div>
+<% end %>
+
+ <% if Collection.limit(1).where(created_by: current_user.uuid).count == 0 %>
+ <div class="alert alert-block alert-info">
+ <button type="button" class="close" data-dismiss="alert">×</button>
+ <p><%= image_tag "dax.png", style: "max-width: 5%; margin-right: 1em" %>
+ Hi, I noticed you haven't uploaded a new collection yet.
- <%= link_to "Click here to learn how to upload data to Arvados Keep.", "http://doc.arvados.org/user/tutorials/tutorial-keep.html", class: "" %>
++ <%= link_to "Click here to learn how to upload data to Arvados Keep.", "http://doc.arvados.org/user/tutorials/tutorial-keep.html", class: "alert-link" %>
+ </p>
+ </div>
+
+ <% end %>
+
+ <% if Job.limit(1).where(created_by: current_user.uuid).count == 0 %>
+ <div class="alert alert-block alert-info">
+ <button type="button" class="close" data-dismiss="alert">×</button>
+ <p><%= image_tag "dax.png", style: "max-width: 5%; margin-right: 1em" %>
+ Hi, I noticed you haven't run a job yet.
- <%= link_to "Click here to learn how to run an Arvados Crunch job.", "http://doc.arvados.org/user/tutorials/tutorial-job1.html", class: "" %>
++ <%= link_to "Click here to learn how to run an Arvados Crunch job.", "http://doc.arvados.org/user/tutorials/tutorial-job1.html", class: "alert-link" %>
+ </p>
+ </div>
+ <% end %>
+
+ <% if PipelineInstance.limit(1).where(created_by: current_user.uuid).count == 0 %>
+ <div class="alert alert-block alert-info">
+ <button type="button" class="close" data-dismiss="alert">×</button>
+ <p><%= image_tag "dax.png", style: "max-width: 5%; margin-right: 1em" %>
+ Hi, I noticed you haven't run a pipeline yet.
- <%= link_to "Click here to learn how to run an Arvados Crunch pipeline.", "http://doc.arvados.org/user/tutorials/tutorial-new-pipeline.html", class: "" %>
++ <%= link_to "Click here to learn how to run an Arvados Crunch pipeline.", "http://doc.arvados.org/user/tutorials/tutorial-new-pipeline.html", class: "alert-link" %>
+ </p>
+ </div>
++
+ <% end %>
+
<div class="row-fluid">
<div class="col span12">
<div class="clearfix">
commit 461b2b4bfa50a11acb257817d13e70d030700dc0
Author: Peter Amstutz <peter.amstutz at clinicalfuture.com>
Date: Fri Dec 27 08:53:10 2013 -0500
Floated Dax to the left instead of the right.
diff --git a/apps/workbench/app/views/users/home.html.erb b/apps/workbench/app/views/users/home.html.erb
index 8a211c8..7fa729f 100644
--- a/apps/workbench/app/views/users/home.html.erb
+++ b/apps/workbench/app/views/users/home.html.erb
@@ -24,6 +24,28 @@
<% end %>
<% if current_user.andand.is_active %>
+
+<% if @my_ssh_keys.count == 0%>
+ <div class="alert alert-block alert-info row-fluid">
+ <button type="button" class="close" data-dismiss="alert">×</button>
+ <div class="span6">
+ <p>I noticed that you have not yet set up an SSH public key for use with Arvados.
+ <%= link_to "Click here to learn how to create a SSH key pair.",
+ "http://doc.arvados.org/user/getting_started/ssh-access.html" %>
+ After you have created an SSH key, you can paste your SSH public key
+ in the text box.
+ </p>
+ </div>
+ <div class="span5">
+ <%= form_for AuthorizedKey.new do |f| %>
+ <%= hidden_field_tag :return_to, request.original_url %>
+ <%= f.text_area :public_key, cols: 40, rows: 5, value: "Put your public key here" %>
+ <%= f.submit :Save %>
+ <% end %>
+ </div>
+ </div>
+<% end %>
+
<div class="row-fluid">
<div class="col span12">
<div class="clearfix">
@@ -130,7 +152,7 @@
</div>
<% elsif current_user %>
- <%= image_tag "dax.png", style: "float: right; max-width: 25%; margin-left: 2em" %>
+ <%= image_tag "dax.png", style: "float: left; max-width: 25%; margin-right: 2em" %>
<h1>Welcome to Arvados, <%= current_user.first_name %>!</h1>
<div class="row-fluid">
<div class="col span8">
diff --git a/apps/workbench/app/views/users/welcome.html.erb b/apps/workbench/app/views/users/welcome.html.erb
index ced69c4..e11382f 100644
--- a/apps/workbench/app/views/users/welcome.html.erb
+++ b/apps/workbench/app/views/users/welcome.html.erb
@@ -1,4 +1,4 @@
-<%= image_tag "dax.png", style: "float: right; max-width: 25%; margin-left: 2em" %>
+<%= image_tag "dax.png", style: "float: left; max-width: 25%; margin-right: 2em" %>
<h1>Hi there! Please log in to use Arvados Workbench.</h1>
<div class="row-fluid">
<div class="col span8" style="margin-top: 1em">
commit e159519053a0f74c96a596ae78f3587bb98ebd09
Merge: ab3f974 5416a45
Author: Peter Amstutz <peter.amstutz at clinicalfuture.com>
Date: Fri Dec 27 08:43:14 2013 -0500
Merge branch '1636-inactive-user' into 1678-new-active-user-orientation
commit ab3f9742f002e3af4339c17eede2b6ee99df83b2
Merge: 92208a3 a75d871
Author: Peter Amstutz <peter.amstutz at clinicalfuture.com>
Date: Thu Dec 26 13:19:00 2013 -0500
Merge remote-tracking branch 'origin' into 1678-new-active-user-orientation
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list