[myexperiment-hackers] [3276] branches/wf4ever: Squashed commit of the f

Diff

Modified: branches/wf4ever/app/controllers/research_objects_controller.rb (3275 => 3276)


--- branches/wf4ever/app/controllers/research_objects_controller.rb	2012-12-17 15:21:36 UTC (rev 3275)
+++ branches/wf4ever/app/controllers/research_objects_controller.rb	2012-12-18 13:55:33 UTC (rev 3276)
@@ -10,7 +10,7 @@
 
   include ApplicationHelper
 
-  before_filter :find_research_object,  : [:show, :edit, :update, :resource_show]
+  before_filter :find_research_object,  : [:show, :edit, :update, :resource_show, :wfrun]
   before_filter :find_research_objects, : [:all]
   
   # GET /research_objects
@@ -57,7 +57,23 @@
       format.html # show.rhtml
     end
   end
+  
+  
+  # GET /research_objects/1/wfrun/2
+  def wfrun
 
+    @manifest = @contributable.manifest
+
+      
+    @ro_entry_url = url_for : false,
+                            :host => base_host,
+                            :id => @research_object.object_id
+    
+    respond_to do |format|
+      format.html # wfrun.rhtml
+    end
+  end
+
   # GET /research_objects/new
   def new
     @research_object = ResearchObject.new

Added: branches/wf4ever/app/views/research_objects/_inputs.rhtml (0 => 3276)


--- branches/wf4ever/app/views/research_objects/_inputs.rhtml	                        (rev 0)
+++ branches/wf4ever/app/views/research_objects/_inputs.rhtml	2012-12-18 13:55:33 UTC (rev 3276)
@@ -0,0 +1,9 @@
+<div class="inputs">
+  <h2>Inputs</h2>
+  <table class="values">
+    <tr><th>Parameter</th> <th>Value</th></tr>
+    <tr><td>database</td> <td><code>colouredanimals</code></td></tr>
+    <tr><td>species</td> <td><code>elephant</code></td></tr>
+    <tr><td>part</td> <td><code>trunk</code></td></tr>
+  </table>
+</div>
\ No newline at end of file

Added: branches/wf4ever/app/views/research_objects/_outputs.rhtml (0 => 3276)


--- branches/wf4ever/app/views/research_objects/_outputs.rhtml	                        (rev 0)
+++ branches/wf4ever/app/views/research_objects/_outputs.rhtml	2012-12-18 13:55:33 UTC (rev 3276)
@@ -0,0 +1,26 @@
+<div class="outputs">
+  <h2>Outputs</h2>
+  <table class="values">
+    <tr><th>Parameter</th> <th>Value</th></tr>
+    <tr><td>name</td> <td><code>elmer</code></td></tr>
+    <tr><td>titles</td> <td>
+      <pre>"Elmer", "1989"
+"Elmer Again", "1991"
+"Elmer on Stilts", "1993"
+"Elmer and Wilbur", "1994"
+"Elmer in the Snow", "1995"
+"The Elmer Pop-Up Book", "1996"
+"Elmer and the Wind", "1997"
+"Elmer Plays Hide and Seek", "1998"
+"Elmer and the Lost Teddy", "1999"
+"Elmer and the Stranger", "2000"</pre>
+    <span class="more">153 more lines</span>
+    <div><a href=''>View/download</a> (1.2 MiB" plain text</div>
+  </td></tr>
+    <tr><td>observation</td> <td>
+<a href="" title="Elmer The Patchwork Elephant by [Nocturne], on Flickr"><img src="" width="150" height="150" alt="Elmer The Patchwork Elephant"></a>      
+    <tr><td>features</td> <td><a href=''>Download</a> (147 MiB" Excel spreadsheet</td></tr>
+      
+    </td></tr>
+  </table>
+</div>
\ No newline at end of file

Added: branches/wf4ever/app/views/research_objects/_rundescription.rhtml (0 => 3276)


--- branches/wf4ever/app/views/research_objects/_rundescription.rhtml	                        (rev 0)
+++ branches/wf4ever/app/views/research_objects/_rundescription.rhtml	2012-12-18 13:55:33 UTC (rev 3276)
@@ -0,0 +1,11 @@
+    <div class="annotation">
+        <h3 class="type">Description</h3>
+        <div class="body">
+          This is a run of the Hello World workflow. As you see this produced some very interesting
+          results, but this should be tested for consistency.
+        </div>
+        <div class="provenance">
+          <span class="authoredBy">Stian Soiland-Reyes</span> on 
+          <span class="authoredOn">2012-12-25 10:04</span>
+        </div>        
+      </div>

Added: branches/wf4ever/app/views/research_objects/_rundetails.rhtml (0 => 3276)


--- branches/wf4ever/app/views/research_objects/_rundetails.rhtml	                        (rev 0)
+++ branches/wf4ever/app/views/research_objects/_rundetails.rhtml	2012-12-18 13:55:33 UTC (rev 3276)
@@ -0,0 +1,39 @@
+<div class="run_details">
+  <h2>Run details</h2>
+
+  <div class="process collapsed">
+    <div class="summary">
+      Process <code>Make_stuff</code> <span class="process_stats">(5 runs, <span class="error">2 failed</span>)</span>
+    </div>
+  </div>
+
+  <div class="process expanded">
+    <div class="summary">
+      Process <code>analyze</code> <span class="process_stats">(25 runs, <span class="error">3 failed</span>)</span>
+    </div>    
+    <div class="runs">
+      <div class="run collapsed">
+         <div class="summary">
+           Process run <code>15</code> 
+              <span class="createdOn">2012-11-15 17:05</span>
+              <span class="duration">(15 min 3 sec)</span>
+              <span class="error">failed</span>
+         </div>
+      </div>
+      
+      <div class="run expanded">
+         <div class="summary">
+           Process run <code>17</code> 
+              <span class="createdOn">2012-11-16 12:15</span>
+              <span class="duration">(9 min 43 sec)</span>
+              <span class="ok">ok</span>
+         </div>
+        <div class="details">
+          <%= render :partial => "research_objects/inputs", :locals => { :contributable => @contributable } -%>  
+          <%= render :partial => "research_objects/outputs", :locals => { :contributable => @contributable } -%>            
+        </div>
+      </div>
+      
+    </div>
+  </div>
+</div>
\ No newline at end of file

Added: branches/wf4ever/app/views/research_objects/_runstats.rhtml (0 => 3276)


--- branches/wf4ever/app/views/research_objects/_runstats.rhtml	                        (rev 0)
+++ branches/wf4ever/app/views/research_objects/_runstats.rhtml	2012-12-18 13:55:33 UTC (rev 3276)
@@ -0,0 +1,15 @@
+<div class="contribution_section_box"> 
+    <h3 class="heading">
+      Run Statistics  
+  	</h3>
+    <div class="stats">
+        <div><strong>Duration:</strong> 4 mins</div>
+        <div><strong>Processes:</strong> 15</div>
+        <div><strong>Process runs:</strong> 55</div>
+        <div><strong>Inputs:</strong> 5 (13 kiB)</div>
+        <div><strong>Errors:</strong> 4</div>
+        <div><strong>Interactions:</strong> 12</div>
+        <div><strong>Outputs:</strong> 52 (12 MiB)</div>
+        <div><strong>Intermediates:</strong> 5422 (3 GiB)</div>
+    </div>
+  </div>

Added: branches/wf4ever/app/views/research_objects/_startedby.rhtml (0 => 3276)


--- branches/wf4ever/app/views/research_objects/_startedby.rhtml	                        (rev 0)
+++ branches/wf4ever/app/views/research_objects/_startedby.rhtml	2012-12-18 13:55:33 UTC (rev 3276)
@@ -0,0 +1,10 @@
+    <div class="annotation starters">
+        <h3 class="type">Started by</h3>
+        <div class="body">
+          <div>
+            <span class="createdBy">Alan R Williams</span> 
+            <span class="createdOn">on 2012-12-24 18:40</span>
+          </div>      
+          <div>using Taverna Server 2.4.0 at <code>http://example.com/taverna-server/</code></div>
+        </div>
+     </div>  
\ No newline at end of file

Added: branches/wf4ever/app/views/research_objects/_workflow.rhtml (0 => 3276)


--- branches/wf4ever/app/views/research_objects/_workflow.rhtml	                        (rev 0)
+++ branches/wf4ever/app/views/research_objects/_workflow.rhtml	2012-12-18 13:55:33 UTC (rev 3276)
@@ -0,0 +1,7 @@
+      <div class="annotation">
+        <h3 class="type">Executed workflow</h3>
+        <div class="body">
+          <div><a href="" world</a> by Stian Soiland-Reyes, Khalid Belhajjame</div>
+          <img src="" />
+        </div>
+      </div>

Added: branches/wf4ever/app/views/research_objects/wfrun.rhtml (0 => 3276)


--- branches/wf4ever/app/views/research_objects/wfrun.rhtml	                        (rev 0)
+++ branches/wf4ever/app/views/research_objects/wfrun.rhtml	2012-12-18 13:55:33 UTC (rev 3276)
@@ -0,0 +1,37 @@
+
+<ul class="sectionIcons">
+	<% if @authorised_to_edit -%>
+		<li><%= icon('new', new_version_workflow_path(@workflow), nil, nil, 'Upload New Version')%></li>
+	<% end -%>	
+	<% if mine?(@workflow) -%>
+		<li><%= icon('manage', edit_workflow_path(@workflow), nil, nil, 'Manage Workflow Entry')%></li>
+	<% end -%>
+	<% if Authorization.check("destroy", @workflow, current_user) -%>
+		<li>
+			<%= icon('destroy', workflow_path(@workflow), nil, { :confirm => 'This deletes all versions of the Workflow and all metadata such as tags, comments and citations. Are you sure?', :method => :delete }, 'Delete Workflow Entry') %>
+		</li>
+	<% end -%>
+</ul>
+
+<h1>Workflow run #1 in: <%=h @contributable.title -%></h1>
+
+
+
+<div class="contribution_left_box">
+	
+      <%= render :partial => "research_objects/startedby", :locals => { :contributable => @contributable } -%>  
+      <%= render :partial => "research_objects/rundescription", :locals => { :contributable => @contributable } -%>
+      <%= render :partial => "research_objects/workflow", :locals => { :contributable => @contributable } -%>  
+      <%= render :partial => "research_objects/inputs", :locals => { :contributable => @contributable } -%>  
+      <%= render :partial => "research_objects/outputs", :locals => { :contributable => @contributable } -%>  
+      <%= render :partial => "research_objects/rundetails", :locals => { :contributable => @contributable } -%>  
+
+</div> <!-- end of left box -->
+
+<div class="contribution_right_box">
+
+  <%= render :partial => "research_objects/tree", :locals => { :contributable => @contributable, :ro_uri => @contributable.url } -%>    
+  <%= render :partial => "research_objects/runstats", :locals => { :contributable => @contributable, :ro_uri => @contributable.url } -%>    
+  
+  
+</div>
\ No newline at end of file

Modified: branches/wf4ever/config/routes.rb (3275 => 3276)


--- branches/wf4ever/config/routes.rb	2012-12-17 15:21:36 UTC (rev 3275)
+++ branches/wf4ever/config/routes.rb	2012-12-18 13:55:33 UTC (rev 3276)
@@ -201,7 +201,8 @@
 
   map.research_object_resources '/research_objects/:id/resources', :controller => 'research_objects', :action ="" 'resource_index', :conditions => { :method => :get }
   map.research_object_resource  '/research_objects/:id/resources/:resource_path', :controller => 'research_objects', :action ="" 'resource_show',  :conditions => { :method => :get }, :requirements => { :resource_path => /.*/ }
-
+  map.research_object_resource  '/research_objects/:id/wfrun/:run_id', :controller => 'research_objects', :action ="" 'wfrun'
+  
     # Finn's folder stuff
   map.folder_contents '/folders/folder_contents', :controller => 'folders', :action ="" 'folder_contents'
   map.resources :folders

Added: branches/wf4ever/public/images/mockup/workflow.jpg (0 => 3276)


--- branches/wf4ever/public/images/mockup/workflow.jpg	                        (rev 0)
+++ branches/wf4ever/public/images/mockup/workflow.jpg	2012-12-18 13:55:33 UTC (rev 3276)
@@ -0,0 +1,59 @@
+\xFF\xD8\xFF\xE0JFIFHH\xFF\xDBC	
+
+			
+
+		
+
+
+\xFF\xDBC	\xFF\xC0\x8C\x9F"\xFF\xC4	
+\xFF\xC4H
+
+!1"AQa#'23WXv\x96\xB5\xD3678\x95\x97\xD5	4BFbdw\x82\x93\xB6%R\x91\xFF\xC4\xFF\xC41	!13QARq\x91\xA1\xE12Ba\x81\xB1\xC1\xD1\xF0\xFF\xDA?\xFA\xA7JR\x80R\x94\xA0C^ݱ,[/Pn-7
+?\xD4I\xF9;]V\xC8H\xAD\x9B&\xA2\xEDRrB\x81\xF8\x81\x91\xE1\xAEA\x81\xD75|\xD7\xA5\xFBLk\xEF\xDA?\xFA\xF4uo\xB6\xA4\xAB\xD4\xD4f\xAA\xF5(k"\xC4\xF3޴~\x84\xF5\x93\xEE\xA8~u<\xF7\xAD\xA1=d\xFB\xAA\x9DP\xCB\xCA!I;,\x83\x95[\x9EA\x84p\xB9Jc\xF1]\xBBI\xAAc\x83h(address@hidden<\xE3Y\x9C]\xB6|pn<\xF7\xAD\xA1=d\xFB\xAA\x9DO=\xEBG\xE8OY>\xEA\x87\xE7Ua\xA8:\xB9m麎Ӝe$\xB8\xB3\xB6\xE4\xEE\x859D\xD36Z12X\x81\xB8\xE5\xF8A)\xED\x9286L\f\xF4Z:\x9Bx\xD6a\xDE\xCD,\xE0\xDCy\xEFZ?Bz\xC9\xF7T?:\xACMכS\П=\xB7qD8\xB6_'"\xCEu\x804p\x92\xAA E\xC9\xE8\x8D\xD0ST\x86Ͼ\xAA:\xCB\xEC\x81\xFA\xC4ׯ\xB5Q?\x80\xB0\xAE{\xABH\xDB\xC1I?u\xBD̫KU\xA3\xA6\xE9JUy\xD8)JP
+R\x94\x94\xA5\xA5)@)JP
+\xE2Կi\x8D}\xFBA\xFF^\x8E\xAEҮ-K\xF6\x98\xD7ߴ\xF5\xE8\xEA\xED\xB0磚\xEF\x94\xCD'hKy\xDDզg\x81g\xF1蹟\xB7\xB8\xA93)address@hiddenα\xC3g\xA4P"address@hidden<+~7	\x82
+"g(\xF3\xC64\x8F\x8D\xC4S%>A\xEAU\xCC\xE9)\xBC\x95\x91\xA8\xE2\xB0qc\xBD<\xBE\xFCO\xB9\xD2kmͺh\xF6½\x9BD5F\xDAq\x9B~:\x91\\x884:\xCEH:.M\x98\xA7a2\x81qS\x9DW\xB4\xE5\xDD7ᖱ\xE7\xE4\xEF)'address@hidden'\x87\x97\x90(t\xD5*\x8Cd\x96ي\xCB\xEC\x81\xFA\xC4ׯ\xB5Q?\x80\xB0\xACJ\xCB\xEC\x81\xFA\xC4ׯ\xB5Q?\x80\xB0\xAE}%\xCA^\xBF\xC37Ys\xA1\xD3t\xA5*\x90\xB4\xA5()JJR\x80R\x95\x8B)'\xEEfY\xE2M\xB0AG.\*m\xA4I"address@hidden \xFA5\x9B(\xA4i\x98\xA0d\xC15V9
+\xE0  c\x98׾\xB2\xAD\x999Y\x9B}\x84\xAC\xE5\xB8\xE6\xFB\xA4
+\xAB\x88\xB7+\xA2\xB2\xAD!\xD53\xA8\x89Ι\x84=\xA41\x83\xD84Ψk۱݋zj
+ũ\xA8\x89't*\xD9y`\xE7A\xABeA\xAAM\x88`'p<4\xD4z\xE6\xAD;b度\xAE\x86*wNd\xED\xF8\xF8\x95\xD3J6Q\xD3\xE6k\xA52C	\xF7(\x8Ah*u\xED&Ab\x90\xC3\xC4\xE0\xD8\\xF7-\xD5p[\xD1PZs'pG\xCB.\xA2RR\x8D_3A(bI\xB5E\x93]R(\xA8q\xF0\x94\xE21\xC8K\x9C\xA6\xE2\xF2\x8C4\x9E\xE6R\xFEd6\x8F\xD3f\xB2}\xEAɧ\x99
+\xA3\xF4٬\x9Fz\x83\xF2j\xFB\xB9\xA4\xE5a\xAD\xF7\xF2\xB0v\xE3\x99\xF9\xA8V\xF1m\x97E]\x9C\xA2dQc\x912\x88\xFBNb\x87\xB4il\xC9\xCA\xCC\xDB\xEC%g-\xC70\xDD U\E\xB9]\x95hq\xA9\x9DDNt\xCC!\xED!\x8C\xC1\xA9\xEDg\xE6~\xE4vp\xE8qΚvbcuꞯY\xF2\xBA٫\\x85\x939¹\xB6\xA9\xC2^\x9B\xB58\x83\xC2\xC3\xC5p\xA6\x82\xE0=Y\xAB/̆\xD1\xFAl\xD6O\xBDA\xF95\x93\xD9\xEANU\xF7h\x8E\xD2\xC8?\xB7\xC7$\x85\xD5\xC1]U\xD19W\xFF\xD13 mD\xB9M4\x95\xF4\x80=\x94S\x94\xB6\xFD\xCFr\xDDP\xB7\xBD\xA72w|\xB2\xEA%%(\xD5\xF34\x86!D\x9BTY5\xD5"\x8A\x81\xB7\x89N!\xC3\x80d\xB9mg\xE6~\xE3g\x85/\xE6Ch\xFD6k'ޠ\xFC\x9A\xB14[A\xADMB|\x96\xDC\xE5\xC5.\xE2\xE6|\x9C\x84\x8B\xC9\xD7\xE0\xEDª\xA6\x81'\xA6/@M"\xEA\x9B\xDC\xD2r\xB0\xD6\xFB\xF9X;q\xCC\xFC\x83T\xABx\xB6ˢ\x8A\xAE\xCE\xD12(\xB1șD}\xA71C\xDA4\xB6d\xE5fm\xF6\xB3\x96\xE3\x98\xEE\x90*\xAE"ܮ\x8Aʴ8\x87T΢':f\xF6\x90\xC6`\xD4\\xE5-͙Q\x8Cx#gJ\x8C\xDB-\xD55p\1S\xBAs'o\xC7Į\x9AQ\xB2\x8E\x9F3])\x92O\xB9DSAS\xA8\x90i2\x86 `\xC2\xE7\xB9n\xA8[\x82ފ\x82ә;\x82>Yu\x92\x94j\xF9\x9A	C\xA2M\xAA,address@hidden@2\đ&\xA5k.i9Xk}\xFC\xAC\xB8\xE6~A\xAAU\xBC[e\xD1EWg\xE8\x99X\xE4L\xA2>Ә\xA1\xED[2r\xB36\xFB	Y\xCBq\xCC\xF7HWnWEeZC\xAAgQ\x9D3{Hc\xB0h
+\x9D*3l\\xB7T\xD5\xC1p\xC5N\xE9̝\xBF\xBAiF\xCA:|\xCDt\xA6Ha>address@hidden,Rx\x81\x80\x9E庡nz*Nd\xEE\xF9e\xD4JJQ\xAB\xE6h%B\x896\xA8\xB2k\xAAEn>\x9CC\x869\xC9r\x9A\x94\xA5\xACYH\xC8\xF9\xA8\xC7p\xD2\xCC\xD2v\xC5\xFA
+6r\xDDR\xEE"\xA9\xA2S\x90\xC1\xEB(\x88{\xEB*\xB5\x97D\\x84ݵ-2\xACC\xE7\xECWj\xDAA"o;5N\x99\x8AE\x8A\\x86D\x860C8\xEF\xFA&.2>1\xA44K4\x9A1`\x82m\x9B7H\xBBH\x92D(\x84(z\x80
+ꎼԘ6\xA1\xA4\xEE\xDA>JV^
+\xE4\xF37F!\xA2\xA8\xB5]VH\xBBw\xA2\xE5mۍ\xA6\xCEͯ!	mD\xC2\xCBL\xAB.\xF9\x83\xB9\x90T\x9B\xF1R&R\x9Dc#\x819\x80L!\x91\xC6{Ǿ\xB9\xFF\xB6͵\xA8\xEE-\xFBR\xF7\xD2\xF2\xB7T[\xD7\xF0M\x92T贗`\xB3380A4\\x99\x93\x83\x8Fp\xC8(\xB5{[i\x85\xE9\xA61Z\xABo1\x9Eq5t\xB6\xB4Y3\xC9\xE2\x8F\;address@hidden>I\xC1K\x9C\x9B\x84cc\xD1\xAD+\xDB
+t\x{1E281E}\x99]C\xAB~R\xDCɯx\x84c\x8EMKX_(\xA1R	pE\xB8ŉ\x83=\xE2`[\xC3\xC8o\xA0:\xC9\xDD\xFB\xCBQ\xE2t\xBDV\xCFVbBy\x8AB\xF2\xE5n\xCDv\x88*Sv\xE08\x99\xF2"P\x88\xF94WP;@\xDAzt\xF6\xF5i+<\xF4\x96\x9E\xA4ۆ(\xA0d\xD3jc8*-\xC9\xC4T\x86;\x85\xA3\x93\xBB\xE7 \x98\x80nD\x88\xECɩ)X\x9A?\xA6p\xF2V\xBCº2\xF5K\xAF\x9Df\xE1#J?\x800¼t"U\x9D`ld:(\x9A((B\x83\xB6Syi\xBA7=\xB1\xDA\xF3\xB1\xF4N\xD5ա\x90\xB1p̼W;W\xFC\xCF
+]5\xA3S(&2\xA4*Q\xE9\x9D"g \x93^\x82PJ\x80\xBB\xF4?\xF5\xFB\xDA3\xEDT\xFDn6\xAF*\xF9\xF5[\xB7\xBCv\x91k\xA6\xB7\xBE\xA8/5n'e\Q\xF1\xA8\x94C\xC0\x84\x8F(/address@hidden>כ
+n^䱬\x91\xEA\xBA \xF9\xE4%\x8EݳELYv3\xCA?1\x855+\xA8p9˝\x9C\x92\xB9\xC6\xC3PA\x9E\xBDg\xCDyI6j\xD5#.\xBA\xEA\x9CD\x93(\x98\xC60\xF4\xEE\xAA~7\xB55\xA2\xF4"\xE6X\x97\xDCE\xA38\xE5\xB1\x97t\x94A\x8Ape\xCEns\\xA0\x92\xA61\x8A\xAE\x82d!= \xDC\xB1\x98\xD1\x8B\xD9vC\xB3\xB5\xB0\xFC\xAC\xC0\xF62\xF6\x8B7f\xC8Nf&lU\x8D\x8E\xBDL;\x8D\xEB\x8F\xAE\xABMB\xBDn\xEDc\xD1\xF7:\xC7D\xEFxK\xBE\xE4d\x94\x90=\x87:0\x850\x94\x8E\x96G\xFA\xB2\xE9\xA4P9\xD2s\x9CA0\xD8\\x8E\xD0:ye\x93n\x89\xD7X\xDBSL\xA2s3\x80ȍkmK\x9E
+\xF7\xB5\xE1\xEFK]\xF8>\x86\x9F`\xDER9\xD0&t\xC1v\xAB\xA6USi\xC0]\xC41G\xCFP\xAE?\x83\xB6\xAE9ykJ'4\xA2\xE6]=M\xD4\xB3\xAB\xBF\x81TbM$\xDA\xE2;Cq\xCE^
+\xE8\xAEG\xE9%\xA67
+M\xA69
+hu\xB9kXp\xED{3\xDA\xFA\x8F\xA2\xB7\x84TF\x91M\xB5\x9B\xB7ڮ\x94U	׆#\x95\Ƒ>*\xE53\xBE!\xB7g(\xAAnD\xB8T\xFA
+Zx+\xB6޹\x9FN\xC6\xC2H\x83\x976̐DJ\x9099wb\xD9 \x9EL\xF8(%\xC9}<g  
+\xFE\xD8ՋSH\xB5bך\xD2\xDB\xFENJ\xFF\xD2T\xE2-\x96\xED\xA2\xDCI*\x8Ah>\x9F2,\x98p\x8B\xECCj\x86\xDCq)\x88M\xE7\xC1FҸ4\xA9\x921\xA5\xA1\xD2\xD3\xEB\x8A1{\x92\xF9\x87\x9B;\xAB~\xDC\xAD-f\xB1\x861\x88;HIA\xC2RFp\xD95Q*\x8Ew\xDE`TgQ\xB5
+\xDF\xD2\xEBT\xF7\x85\xCE\x85\x82o\xA3\xE3ǖLS\x8A\xF1\xE2-\xE8"8\xAE\xC8\xE7\xA1r=q\x8A\xAC{!\xC48\x85\xB0\xE7َ\x9E%i0\xF1\x89sG\x91\xBCC\xD8V\xF2r\xED\xC0]\xA3\xF0\xE7V4\x868(address@hidden@)JP
+\xD6]\x92\x96Դ\xD4L2\xB2\xEF\x981]\xD3h\xF4\x8F\xB0\xEF"f1)\xB08\x98\xA08g\xB8{\xABgX\xB2\x92q\xF0\xB1\x8E\xE6e\x9E$ыr\xE5¦\xDAD\x92!D\xC79\x87\xD4P\xF7Pּ\xA4\x84ݵ5-\xACC\xE7\xECPt\xE6=S\xEF;5N\x99LtLlD\x86(\x8E8\xEE\xEA\xD9\xD6,\\x9C|\xD4cI\x98\x97\x89;b\xFDܶp\x91\xB7T\x8EP1Q\xF5\x80\x94@@}\xF5\x95@)JP
+\x85j\xE6\xB2鶄\xDA#}\xEA\xB5\xC7\xE08"\xB9M\x99\x9E7JUT\xCE\xC0\xA0C\x98v\x88dC\xC0g"\x9A\xD5_\xDAwH\x90\xD7}\xBE4\xA8\xE9\xEE'"address@hidden(\xC7\xDD\xF7K\xB8UBD\xE2\xED$\xA1\xB6P\xC0R\xB7"\xA10`\xB9\xEF2P8\xE0\xC1\x90\xC8\xFF\x83\xD4+\xF3\xE9\xFD$\xBE\xAF\xF6\xBB\xB4m\xF9X\xF5>\xD6rk\x8Aa5!\xB16f\x87(\xFA\x8C\xE0PL\xC0>\xA3\x8D~\x83h)JZ\xB5\xAD\x983K\xC9hԏ4\xC1\x83\x98\xC6\xCF;\xD3j\xBA\x88\xA8\xB2A\xD71\xDB a韃}m)@)JP
+\x8C\xEA6\x9E\xDB\xFA\xA3j\x9EϹ\xF9\x9F\xA8\xFA>@ye3\xF1Y\xBCE\xDA=D\xA7\xBAyu\x87L\xE6\xA4\xD5\xD4o\xFCU?\x93x\x9E\x8F\xD9\xE1,\xF09^qs8뿕\xE3\xEC\xFF\xDAMJR\x80V,\xA4d|\xD4c\xB8ifi;b\xFD9n\xA9wT\x8EQ)\xC8`\xF5\x80\x94D=\xF5\x95Zˢ.Bnږ\x85\x89\x99V!\xF3\xF6+\xB5m \x917\x9D\x9A\xA7L\xC5"\xC5.C"C!\x9Cw\x87}\x93\xD2%\x9AM\xB0A6͛\xA4]\xA4I"
address@hidden|\xC1\x8A
+\\xC8*M\x87x\xA9)N\xB1\x8B\x91\xC0\x9C\xC0&\xC8\xE3=\xE3\xDF[:\x94`{\\xEB\xA5\xE2\xDD\xE4ŝٲ\xDDy\x8C\xAC\x94cg.\xF5͕[\x93x\xB3S\x9C\xC9i\xF6n:
+\xC6\xE8!ֶ>q\xFD\xA6\xBE\xAB\xF6\x8F\xF10\xFF\xCA\xEAٯ\xF5\\xA7ګ\xAF\xF1\xF7\xF58\xB9\xAF[6\xCBE\xBB\x9B\xC6톁IҜ\x93~\x93R\xAA\xA7\xFF$a\xF7Z\xBB\xA5aFT\xE39gzE]K\xBA\xB1\x9B\x8A\xEAxy\xC7\xF6\x9A\xFA\xAF\xDA?\xC4\xC3\xFF+\xA7\x9Ci\xAF\xAA\xFD\xA3\xFCL?\xF2\xBA\xF53\xD4]>\x90~\x94[\xEE\xDEr\xF5u\x9B#(\x81\xD5:\x80u\x88$)\xD9nj\xE4\xB8\xCEPT;\xC8ly\xC3_\xF6%\xC4\xDAE\xE5\xBFz\xC0ɷ\x88AVrH\xACFb" \xB1\x88a\xF0";address@hidden(\x80n\x80\xF3\x8F\xED5\xF5_\xB4\x89\x87\xFEWQǚ\xF5\xA4\xCD\xE4m\xF6\x97\xC4,\x90^\xB2\x8BC\xC58a$\xD9d\xE54L\xA9\x80N
+u\xEAH6\xEE"\xE8\x97\x98Vc}W\xB3\x98\xBD\xEBuZ\xB6\xF6\xF72I'Ÿ\x9D#\xA4\xD1\xE0\xB62\x80\xA8\x89C "\x88(\|\x8A\x82f0dc\xD8-\xBA\xFC\x99\xEDu\xBA8\xFE\xD3_U\xFBG\xF8\x98\xE5t\xF3\x8F\xED5\xF5_\xB4\x89\x87\xFEW^z\x87`B:\x8De3|[\xECL\xA7\x8EEԚ)\xE1M\xDC(\x94\xC6Pշ5\xB7\x8D\x92\x8E\x99\x8Ek/\xFD\xB3\xE6\x91#\x96\xAE\x9B*UQ]\x94Er\x88\x94\xC51D   !R\xEE\xEBw\xBB\xB9\xDBT\xCFѮ\xD1:\x81j\xB3\xFD)\xD4-!\x8C\xB4]\xB6\xB7\x82\xE1A\xCB\xA4e\x88\xB2|\xC8!\xB0J-\xD89\xE4{\xBB\xBA\xD5\xF5\\xAF\xA5\x9F\xB6[\xCF\xF4\xC4?
+\xB65\xF7\xB4\xAB\xD9\xD6ތ\xBAo+n瓎\x94\x91N,address@hidden
+\x92Y܋*3s\xA6\xA7"Хr\xCF\xFEB\xB4\xDB\xE8{X>\xEC\xA7\xF9\xF5\x89-\xFD$ZE\xAC\xACΖ\xEA\xD36hm\xE2,\xB5\xB8\x91JQ1\x80\xA5\xF1\xFB\xC4\xC2\xEB\xAA\x88i}RJ\xAF\xDF\xA5\xFF$U\xCD	<)\xAFtu\x8DFuP\xAD\xFD.\xB5Ox\\xE0\xE8X&\xFA><yd\xC1E8\xAF"\xD1\x82!ӊ\xE1<address@hidden" =F\xB3j\xC4\xDE)JP
+\xD6]\x92\x96Դ\xD4L2\xB2\xEF\x981]\xD3h\xF4\x8F\xB0\xEF"f1)\xB08\x98\xA08g\xB8{\xABgX\xB2\x92q\xF0\xB1\x8E\xE6e\x9E$ыr\xE5¦\xDAD\x92!D\xC79\x87\xD4P\xF7Pּ\xA4\x84ݵ5-\xACC\xE7\xECPt\xE6=S\xEF;5N\x99LtLlD\x86(\x8E8\xEE\xEA\xD9\xD6,\\x9C|\xD4cI\x98\x97\x89;b\xFDܶp\x91\xB7T\x8EP1Q\xF5\x80\x94@@address@hidden>h\x83\xC8\xF2&\xE9C*\xE4\x85v\xA2d2*\xF1S"\xA2C	\x8B\xC0O%0cwٯ\xF5\\xA7ګ\xAF\xF1\xF7\xF56\xBAl[&\xF8E\xBB{\xD6΃\xB8hqQ\xB9%#\xD1vTN=\xE6 (address@hidden"\x91\xD3#\x94\xFB
+(\x94K\x9C\x90\x9DV\xB8\xA2&\xD7]\xA5\xCD \x84\x96\x84\x95yn\x809*
+\x9D(\xDD\xD82\x85-\x8D\x8E\x9Agu\x92\x87\xC0dv\x89\xAB\xAD\xB7nͺM \x9A"@M$\x93(\x84 \xA5\xE8\xD0+\xD9YV\xD1QQɇZM\xB6r\xFD\xA7\xA5\x94\xCBQ`u6Fݹܘ.\xB6ʿBbB\x9D+B\xC4H2\xE6̔zH\xB6)ާ\xB8EU2i%\x82\xC1\xD2\x95\x95\xE1gI]V\xB2emB3\x83,\xAA
+\x82#)8\x92\xEC\xC7hDx\xADx\xA3\xD0h\x94\xFBDp=J\x92\xA1\xFE\xF4\xFE\x8C:address@hidden"\x98\xA2\xDC  ![\xEB\x83Ol\xB2E\xA4\xC5\xD5c\xDB\xF3/\xE3\xFF\xAA:\x90\x8CE\xC2\xCD\xFA\xE7\xE0\xCEr\x89\x89ׯA\xB5 \xA5:[7\xC7p\x9DMtE\xF4\xB3\xF6\xCBy\xFE\x98\x87\xE2\xA1]
+\xA8v\xAF\xAAvD֞^\x91\xE0\xF6y\xA1ٻK86\xD3w\x86\xFE\xC9\xCA`)\xCA`\xEAS\xA2B\xB9\xE7K?l\xB7\x9F\xE9\x88~*\xD5\xE7\xEFy\xF2-\xED\xB9Q>gF\xB0\xBA,;\xA2kF\xB5
+\xC0\xAFr\xDAbM\x8FL]\xA13|\xF2\xB2\xF1\x94\xA2U3\xB5R(_eN\xBB4鏗}W\xF1\xF2e\xBF\xC1\xD3Y
+\xACH`\xF89\x8B\x89?\xED\xFF\x89y\xE9\xEA\xC4;\xF8B}v\xAD\xEC\xC8\xEB_cae커\x96\x95\xED\xB0\xB7k6\xF13\xE0JGh\xA1\xF2\xF0_\x85L\xB9T\x89Ԡc
+[Zu\xA7\xF6\xBE\x95\xD8Кwf0p\xB0-͢YɄ\xA5\xEF9\xCD\xFD\xA3\x9C\xC2c\x98\xC3\xD4\xC61\x84z\x8D|\xC7E}\x9FZh\xCD=SKG>0\x8F\x96O\xEF~\x8B\xF0\xF4\xCF\xE4\x99Um\xA1)[\xDEJ\xE5p\xF0]\x8F\xD3\xE8H\xEA3\xA8\xDA{oꍪ{>\xE7\xE6|\xA3\xE8\xF9\xE5\x94\xCF\xC5f\xF1h\xF5\x9CV\xE9\xE41\xD423\x9A\x93TgQ\xBC\xF1T\xFEL|\xE1\xFEz?g\x84\xB3\xC0\xE5y\xC4y\xCC\xE3\xAE\xFEW\x8F\xB3\xFC{k\xE8\x85\xE1&\xA5)@+R2>j1\xDC4\xB34\x9D\xB1~\x82\x8D\x9C\xB7T\xBB\x88\xAAG(\x94\xE40z\xC0J"\xFAʭe\xD1!7mKB\xC4̫\xF9\xFBڶ\x90H\x9B\xCE\xCDS\xA6b\x91b\x97!\x91!\x84\x90\xCE;þ\x80ɋ\x8C\x8F\x85\x8Ci
+\xCD&\x8CX \x9Bf\xCD\xD2.\xD2$\x91
+!
+\xA0\x80\xBA\xB2\xAA
+lE\xEA\xD4$\xD4D,\xB4ͽ/j\xB0\x83A\xAB\xA9H\xE0\x93$\x88B\x94\xEB\xB9\x813\xE0L!\x910\xF7\x8F}l\xF5\xCAW\x8B\xFF>,\xF8s\x8EO\xD2c\x94\xE0\xF5\xDF\xF3\x9E\xFF\x93\x8FW~h
+\xF2S\xB1e\xA97s2\xDAe\xBB|\xFDu\xB9]X\xC2\xEA\xAAs	\x8Es\xACD\xC2"#\xEF\xACo1\xCE\xC8?W[\xF7Y*\xF2\xA8Ξ\xF9J\xF1\xE3[şq\xCF\xFA=\xCCr\x9Cϟ\xF4\xF7\xE7v}]ؠ+?1\xCE\xC8?W[\xF7Y)\xE69\xD9\xEA\xEBc\xFE\xEB%Y\x9F^P?\xBB>$r?\xE6<+\xCEg\xFE?ݚj\x94\xAF\xFE*|Y\xF0\xE7\x9F\xA4<\xC7)\xC1\xEB\xBF\xE6==\xFF'\xAE\xFC\xD0\x9F\x98\xE7d\xAB\xAD\x8F\xFB\xAC\x94\xF3\xEC\x83\xF5u\xB1\xFFu\x92\xAF*\x8C\xE9\xFE5\xBCY\xF0\xE7\xFF\xA3\xDC\xC7)\xC1\xC0l\xF9\xFFO~wg\xD5݊\xB3\xF3\xEC\x83\xF5u\xB1\xFFu\x92\x9Ec\x9D\x90~\xAE\xB6?\xEE\xB2U\x99\xF1\x95\xE5\xFB\xB3\xE2G#\xFEc¼\xE6\xE1\xE1c\xFD٦\xA1yJ\xF1\xE2\xA7şq\xC9\xFAC\xCCr\x9C\xBB\xFEc\xD3\xDF\xF2q\xEA\xEF\xCD\xA2\xD3n\xCFZ!\xA3\xB2n\xE6t\xB7K\xAD\xEB]\xF3\xE49W.#Y\x95\xAA\x96\xE06\xC3w\x86\xE0Ǻ\xAC:TgO|\xA5x\xBF\xF1\xAD\xE2χ8\xE7\xFD\xE69Ng\xCF\xFA{\xF3\xBB>\xAE\xECPjTg\xE3+\xCA\xF7gĎG\xFCǅy\xCC\xFF\xC3\xC2\xC7\xFB\xB3MB\xF2\x95\xE2\xFF\xC5O\x8B>\xE3\x93\xF4\x87\x98\xE58=w\xFCǧ\xBF\xE4\xE3\xD5ߚMQ\x9DF\xD4+K\xADS\xDE8:	\xBE\x8F\x8FY0QN+ǈ\xB4G\xA0\x88t\xE2\xB8O#\x9E\x85\xC8\xF5\xC6*MQ\x9D=\xF2\x95\xE2\xFFƷ\x8B>\xE3\x9F\xF4{\x98\xE588
address@hidden
+R\x94\x94\xA5\xA5)@)JP
+R\x94\x94\xA5\xA5)@)JP
+R\x94\x94\xA5\xFF\xD9
\ No newline at end of file

Modified: branches/wf4ever/public/stylesheets/styles.css (3275 => 3276)


--- branches/wf4ever/public/stylesheets/styles.css	2012-12-17 15:21:36 UTC (rev 3275)
+++ branches/wf4ever/public/stylesheets/styles.css	2012-12-18 13:55:33 UTC (rev 3276)
@@ -2105,6 +2105,7 @@
   padding: 6px;
 }
 
+
 .pivot .summary DIV+DIV {
   padding-top: 0.4em;
 }
@@ -2494,4 +2495,60 @@
 
 .error { 
   color: #c44; 
-}
\ No newline at end of file
+}
+.contribution_section_box .stats {
+  text-align: left;
+}
+table.values td,  table.values th {
+  text-align: left;
+  vertical-align: top;
+}
+.values .more {
+  font-size: smaller;
+}
+
+.collapsed .summary:before, .expanded .summary:before {
+  border: #555 1px solid;
+  color: black;
+  text-align: center;
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+
+.collapsed .summary:before {
+  content: "+";
+}
+
+.expanded  .summary:before {
+  content: "–";
+}
+
+pre, code {
+  font-family: Consolas, "Inconsolata", monospace;
+}
+
+
+.process {
+  background: #ddd;
+  margin: 0.5em;
+  padding: 0.1em;
+}
+.runs {
+ padding-left: 2em; 
+}
+
+.run {
+  background: #eee;
+  margin: 0.5em;
+  padding: 0.1em;
+  
+}
+
+.details h2 {
+  /* Undo generan h2 styling */
+  background: none;
+  padding: none;
+  font-size: 100%;
+  border: none;
+  margin: none;
+}

Modified: branches/wf4ever/public/stylesheets/webfonts.css (3275 => 3276)


--- branches/wf4ever/public/stylesheets/webfonts.css	2012-12-17 15:21:36 UTC (rev 3275)
+++ branches/wf4ever/public/stylesheets/webfonts.css	2012-12-18 13:55:33 UTC (rev 3276)
@@ -1,2 +1,3 @@
 @import url(http://fonts.googleapis.com/css?family=Margarine);
address@hidden url(http://fonts.googleapis.com/css?family=Inconsolata);

From:	noreply
Subject:	[myexperiment-hackers] [3276] branches/wf4ever: Squashed commit of the following:
Date:	Tue, 18 Dec 2012 13:55:33 +0000 (UTC)

[myexperiment-hackers] [3276] branches/wf4ever: Squashed commit of the f

Log Message

Modified Paths

Added Paths

Diff

Modified: branches/wf4ever/app/controllers/research_objects_controller.rb (3275 => 3276)

Added: branches/wf4ever/app/views/research_objects/_inputs.rhtml (0 => 3276)

Added: branches/wf4ever/app/views/research_objects/_outputs.rhtml (0 => 3276)

Added: branches/wf4ever/app/views/research_objects/_rundescription.rhtml (0 => 3276)

Added: branches/wf4ever/app/views/research_objects/_rundetails.rhtml (0 => 3276)

Added: branches/wf4ever/app/views/research_objects/_runstats.rhtml (0 => 3276)

Added: branches/wf4ever/app/views/research_objects/_startedby.rhtml (0 => 3276)

Added: branches/wf4ever/app/views/research_objects/_workflow.rhtml (0 => 3276)

Added: branches/wf4ever/app/views/research_objects/wfrun.rhtml (0 => 3276)

Modified: branches/wf4ever/config/routes.rb (3275 => 3276)

Added: branches/wf4ever/public/images/mockup/workflow.jpg (0 => 3276)

Modified: branches/wf4ever/public/stylesheets/styles.css (3275 => 3276)

Modified: branches/wf4ever/public/stylesheets/webfonts.css (3275 => 3276)