[ARVADOS] updated: dcd96ef83d878c48e588a815d7793e6004c4f08c

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/assets/images/mouse-move.gif    | Bin 0 -> 26082 bytes
 .../app/assets/images/pipeline-running.gif         | Bin 0 -> 114564 bytes
 .../_getting_started_popup.html.erb                |  62 ++++++++++++++++++++-
 3 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 apps/workbench/app/assets/images/mouse-move.gif
 create mode 100644 apps/workbench/app/assets/images/pipeline-running.gif

       via  dcd96ef83d878c48e588a815d7793e6004c4f08c (commit)
      from  8e4ed0edeadc4dfcc85666ef5c36619815dca8e2 (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 dcd96ef83d878c48e588a815d7793e6004c4f08c
Author: Nancy Ouyang <nancy.ouyang at gmail.com>
Date:   Fri Apr 10 12:57:39 2015 -0400

    first page prototype

diff --git a/apps/workbench/app/assets/images/mouse-move.gif b/apps/workbench/app/assets/images/mouse-move.gif
new file mode 100644
index 0000000..516bc16
Binary files /dev/null and b/apps/workbench/app/assets/images/mouse-move.gif differ
diff --git a/apps/workbench/app/assets/images/pipeline-running.gif b/apps/workbench/app/assets/images/pipeline-running.gif
new file mode 100644
index 0000000..64e9009
Binary files /dev/null and b/apps/workbench/app/assets/images/pipeline-running.gif differ
diff --git a/apps/workbench/app/views/getting_started/_getting_started_popup.html.erb b/apps/workbench/app/views/getting_started/_getting_started_popup.html.erb
index c07c3cf..a602b10 100644
--- a/apps/workbench/app/views/getting_started/_getting_started_popup.html.erb
+++ b/apps/workbench/app/views/getting_started/_getting_started_popup.html.erb
@@ -1,25 +1,81 @@
+<<<<<<< HEAD:apps/workbench/app/views/application/_getting_started_popup.html.erb
+<%
+  update_getting_started_shown_user_pref() if current_user
+%>
+<style>
+.style_image {
+  border: 10px solid #ddd;
+}
+</style>
+
+<div class="modal">
+  <div class="modal-dialog modal-with-loading-spinner" style="width:80%">
+=======
 <div id="getting-started-modal-window" class="modal">
   <div class="modal-dialog modal-with-loading-spinner">
+>>>>>>> 8e4ed0edeadc4dfcc85666ef5c36619815dca8e2:apps/workbench/app/views/getting_started/_getting_started_popup.html.erb
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button>
         <div>
-          <div class="col-sm-8"> <h4 class="modal-title"> Getting Started with Arvados </h4> </div>
+          <div class="col-sm-8"> <h4 class="modal-title">Welcome to Arvados!</h4> </div>
           <div class="spinner spinner-32px spinner-h-center col-sm-1" hidden="true"></div>
         </div>
         <br/>
       </div>
 
+<<<<<<< HEAD:apps/workbench/app/views/application/_getting_started_popup.html.erb
+      <div class="modal-body" style="height: 38em; overflow-y: scroll">
+
+<div class="container">
+    <div class="row">
+        <div class="col-md-6">
+  <strong>How does this work?</strong> What you're looking at right now is Workbench, the graphical interface to the Arvados system.
+<br><br>
+Click the <span class="btn btn-sm btn-primary">Next ></span> button below for a quick tour of Arvados.
+<br><br>
+<strong>OR</strong> 
+          <br><br>Get started by running your first pipeline in 3 quick steps:<br><br>
+<ol><li> Go to the <span class="btn btn-sm btn-default"><i class="fa fa-lg fa-fw fa-dashboard"></i> Dashboard</span> > <span class="btn btn-sm btn-primary"><i class="fa fa-fw fa-gear"></i> Run a pipeline...</span> <br><br>
+<%= image_tag "mouse-move.gif", :class => "style_image" %>.
+</li><br>
+  <li>  <span class="btn btn-sm btn-default"><i class="fa fa-fw fa-gear"></i>Mason Lab -- Ancestry Mapper (public)</span> > <span class="btn btn-sm btn-primary">Next: choose inputs <i class="fa fa-fw fa-arrow-circle-right"></i></span></li><br>
+  <li> <span class="btn btn-sm btn-primary">Run <i class="fa fa-fw fa-play"></i></span></li>
+</ol>
+      </div>        <div class="col-md-6" style="border-left: solid; border-width: 1px">
+            <br>
+<i class="fa fa-flag fa-flip-horizontal" style="color: green"></i> <i class="fa fa-child"></i> 
+<strong>Voila!</strong> <i class="fa fa-child"></i> <i class="fa fa-flag" style="color: green"></i> 
+Your pipeline is now spooling up and getting ready to run!  
+            <br><br>
+
+  <br><br>
+  Go ahead, try it for yourself right now. <span class="glyphicon glyphicon-thumbs-up"></span>
+<br><br>
+<%= image_tag "pipeline-running.gif", :class => "style_image" %>
+
+  <br><br>
+  <em><strong>Note:</strong> You can always come back to this Getting Started guide by clicking the <span class="fa fa-lg fa-question-circle"></span> in the upper-right corner.</em> 
+  <br><br>
+</div> </div> </div> 
+
+
+
+      </div>
+      <div class="modal-body" style="height: 35em; overflow-y: scroll">
+        Page 2
+=======
       <div class="modal-body" style="height: 25em; overflow-y: scroll">
          <%= image_tag "getting_started/pipeline.gif" %>
       </div>
       <div class="modal-body" style="height: 25em; overflow-y: scroll">
          <%= image_tag "getting_started/mouse-move.gif" %>
+>>>>>>> 8e4ed0edeadc4dfcc85666ef5c36619815dca8e2:apps/workbench/app/views/getting_started/_getting_started_popup.html.erb
       </div>
-      <div class="modal-body" style="height: 25em; overflow-y: scroll">
+      <div class="modal-body" style="height: 35em; overflow-y: scroll">
         Page 3
       </div>
-      <div class="modal-body" style="height: 25em; overflow-y: scroll">
+      <div class="modal-body" style="height: 35em; overflow-y: scroll">
         Page 4
       </div>
 

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


hooks/post-receive
--