[ARVADOS] created: 18b95abb060d64cdd581afb4611ae5b295f89cf1

[git at public.curoverse.com]

        at  18b95abb060d64cdd581afb4611ae5b295f89cf1 (commit)


commit 18b95abb060d64cdd581afb4611ae5b295f89cf1
Author: Peter Amstutz <tetron at cosmos>
Date:   Thu Dec 26 21:06:30 2013 -0500

    Wizards that check for uploading collections, running a crunch job,
    and running a pipeline and link to documentation if the user hasn't
    done it yet.

diff --git a/apps/workbench/app/views/users/home.html.erb b/apps/workbench/app/views/users/home.html.erb
index a229908..fd49d8e 100644
--- a/apps/workbench/app/views/users/home.html.erb
+++ b/apps/workbench/app/views/users/home.html.erb
@@ -25,17 +25,34 @@
 
 <% if current_user.andand.is_active %>
 
-<% if not Job.limit(1).where(created_by: current_user.uuid).count == 0 %>
+<% 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" %> You haven't run a job yet</p>
+  <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: "" %>
+  </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: "" %>
+  </p>
 </div>
 <% end %>
 
-<% if not PipelineInstance.limit(1).where(created_by: current_user.uuid).count == 0 %>
+<% 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>You haven't run a pipeline yet</p>
+  <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: "" %>
+  </p>
 </div>
 <% end %>
 

commit 1944f82913c0a19254a136bf79bc353e762267e1
Merge: bab3fc9 5416a45
Author: Peter Amstutz <tetron at cosmos>
Date:   Thu Dec 26 20:38:22 2013 -0500

    Merge remote-tracking branch 'remotes/origin/1636-inactive-user' into 1678-new-user-orientation-pete-wfh
    
    # Please enter a commit message to explain why this merge is necessary,
    # especially if it merges an updated upstream into a topic branch.
    #
    # Lines starting with '#' will be ignored, and an empty message aborts
    # the commit.


commit bab3fc9161233635d5d64d1ad37b79efac6a4313
Author: Peter Amstutz <tetron at cosmos>
Date:   Thu Dec 26 20:37:41 2013 -0500

    Starting working on wizard for jobs/pipelines

diff --git a/apps/workbench/app/views/users/home.html.erb b/apps/workbench/app/views/users/home.html.erb
index e67772f..53de550 100644
--- a/apps/workbench/app/views/users/home.html.erb
+++ b/apps/workbench/app/views/users/home.html.erb
@@ -24,6 +24,21 @@
 <% end %>
 
 <% if current_user.andand.is_active %>
+
+<% if not 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" %> You haven't run a job yet</p>
+</div>
+<% end %>
+
+<% if not 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>You haven't run a pipeline yet</p>
+</div>
+<% end %>
+
 <div class="row-fluid">
   <div class="col span12">
     <div class="clearfix">

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


hooks/post-receive
--