[myexperiment-hackers] [2886] branches/datasets/app: Added some info text and exposed more metadata

[noreply]

Revision

2886

Author

fbacall

Date

2011-12-21 05:32:07 -0500 (Wed, 21 Dec 2011)

Log Message

Added some info text and exposed more metadata

Modified Paths

• branches/datasets/app/models/data_set.rb
• branches/datasets/app/views/data_sets/_data_set.rhtml

Diff

Modified: branches/datasets/app/models/data_set.rb (2885 => 2886)

--- branches/datasets/app/models/data_set.rb	2011-12-20 18:19:48 UTC (rev 2885)
+++ branches/datasets/app/models/data_set.rb	2011-12-21 10:32:07 UTC (rev 2886)
@@ -11,7 +11,7 @@
   include ActionController::UrlWriter #To generate URLs for the metadata file of the zip archive
   default_url_options[:host] = URI.parse(Conf.base_uri).host
 
-  acts_as_site_entity
+  acts_as_site_entity :owner_text => 'Creator'
   acts_as_contributable
 
   validates_presence_of :title, :workflow, :contributor

Modified: branches/datasets/app/views/data_sets/_data_set.rhtml (2885 => 2886)

--- branches/datasets/app/views/data_sets/_data_set.rhtml	2011-12-20 18:19:48 UTC (rev 2885)
+++ branches/datasets/app/views/data_sets/_data_set.rhtml	2011-12-21 10:32:07 UTC (rev 2886)
@@ -1,6 +1,13 @@
 <div class="data_set">
-  <h1><%= @data_set.title %></h1>
-
+  <div style="overflow: auto">
+    <div style="float:left; width: 45em;">
+      <h1><%= @data_set.title %></h1>
+      <%= render :partial => "contributions/datetime_info", :locals => { :contributable => @data_set } -%>
+    </div>
+    <div style="float:right; width: 10em;">
+      <%= render :partial => "contributions/uploader_box", :locals => { :contributable => @data_set } -%>
+    </div>
+  </div>
   <% if @data_set.workflow_version != @workflow.current_version %>
     <div class="box_infotext">
       <img src=""
@@ -20,7 +27,11 @@
     </p>
   <% end %>
 
-  <h3>Input data</h3>
+  <h3>
+    Input data
+    <%= info_icon_with_tooltip("Input data can be supplied here along with the specific workflow port it can be fed in to.<br/>"+
+                               "Users can download and use this data to execute the workflow.") -%>
+  </h3>
   <table>
     <tbody>
       <% (@data_set.data_items.select{|r| r.input?}).each do |i| %>
@@ -53,8 +64,11 @@
     </ul>
   <% end %>
 
-  <h3>Output data</h3>
-
+  <h3>
+    Output data
+    <%= info_icon_with_tooltip("Output data can be supplied here along with the specific workflow port it is produced from.<br/>"+
+                               "This data can be used for the purpose of <b>comparison</b> against the actual data that the workflow produces") -%>
+  </h3>
   <table>
     <tbody>
       <% (@data_set.data_items.select{|r| r.output?}).each do |o| %>