Diff
Modified: branches/wf4ever/app/controllers/research_objects_controller.rb (3269 => 3270)
--- branches/wf4ever/app/controllers/research_objects_controller.rb 2012-12-14 16:56:34 UTC (rev 3269)
+++ branches/wf4ever/app/controllers/research_objects_controller.rb 2012-12-14 16:56:41 UTC (rev 3270)
@@ -48,6 +48,11 @@
@manifest = @contributable.manifest
+
+ @ro_entry_url = url_for : false,
+ :host => base_host,
+ :id => @research_object.object_id
+
respond_to do |format|
format.html # show.rhtml
end
Modified: branches/wf4ever/app/views/layouts/_myexperiment.rhtml (3269 => 3270)
--- branches/wf4ever/app/views/layouts/_myexperiment.rhtml 2012-12-14 16:56:34 UTC (rev 3269)
+++ branches/wf4ever/app/views/layouts/_myexperiment.rhtml 2012-12-14 16:56:41 UTC (rev 3270)
@@ -8,11 +8,12 @@
<% if @lod_rdf %><link rel="alternate" href="" @lod_rdf -%>" type="application/rdf+xml" title="RDF+XML" /><% end %>
<% if @lod_xml %><link rel="alternate" href="" @lod_xml -%>" type="application/xml" title="REST XML" /><% end %>
<link rel="shortcut icon" href="" type="image/x-icon"/>
- <%= stylesheet_link_tag 'reset-fonts-grids', 'base-min', 'acts_as_taggable_stylesheet', 'star_rating', 'gadgets',
+
+ <%= stylesheet_link_tag 'reset-fonts-grids', 'base-min', 'acts_as_taggable_stylesheet', 'star_rating', 'webfonts', 'gadgets',
'yui/datatable', 'yui/datatable-skin', 'yui/tabview', 'yui/treeview-base', 'yui/treeview-folders', 'yui/yui_override',
- address@hidden"stylesheets"] %>
+ address@hidden"stylesheets"] %>
<%= _javascript__include_tag :defaults, "boxover.js", "yui/yahoo-dom-event.js", "yui/connection.js", "yui/datasource.js",
- "yui/datatable.js", "yui/element.js", "yui/tabview.js", "yui/treeview.js" %>
+ "yui/datatable.js", "yui/element.js", "yui/tabview.js", "yui/treeview.js" %>
<% if controller.action_name.downcase == "timeline" %>
<script src="" type="text/_javascript_"></script>
Added: branches/wf4ever/app/views/research_objects/_annotations.rhtml (0 => 3270)
--- branches/wf4ever/app/views/research_objects/_annotations.rhtml (rev 0)
+++ branches/wf4ever/app/views/research_objects/_annotations.rhtml 2012-12-14 16:56:41 UTC (rev 3270)
@@ -0,0 +1,22 @@
+<% annotations = @contributable.annotations %>
+
+<% if annotations.length > 0 %>
+
+ <h2>Annotations</h2>
+
+ <table class="simple">
+ <tr>
+ <th>Type</th>
+ <th>Value</th>
+ </tr>
+ <% annotations.each do |annotation| %>
+ <tr>
+ <td><%=h annotation[:type] -%></td>
+ <td><%=h annotation[:body] -%></td>
+ </tr>
+ <% end %>
+ </table>
+
+ <br />
+
+<% end %>
\ No newline at end of file
Added: branches/wf4ever/app/views/research_objects/_attribution.rhtml ( => )
Added: branches/wf4ever/app/views/research_objects/_comments.rhtml
===================================================================
--- branches/wf4ever/app/views/research_objects/_comments.rhtml (rev 0)
+++ branches/wf4ever/app/views/research_objects/_comments.rhtml 2012-12-14 16:56:41 UTC (rev 3270)
@@ -0,0 +1,21 @@
+<div id="commentsBox">
+ <script src="" type="text/_javascript_"></script>
+
+<h2>
+ <span class="icon"><img alt="Comments" src="" </span> <span style="vertical-align: middle;">Comments</span>
+ <span class="count_text" style="vertical-align: middle;">(0)</span>
+</h2>
+
+<div class="commentsBox">
+
+
+ <p><i>No comments yet</i></p>
+ <a name="comments"></a>
+
+ <p style="margin-top: 0.6em;"><strong><a href="" in</a> to make a comment </strong></p>
+
+
+</div>
+
+
+</div>
\ No newline at end of file
Added: branches/wf4ever/app/views/research_objects/_credits.rhtml (0 => 3270)
--- branches/wf4ever/app/views/research_objects/_credits.rhtml (rev 0)
+++ branches/wf4ever/app/views/research_objects/_credits.rhtml 2012-12-14 16:56:41 UTC (rev 3270)
@@ -0,0 +1,22 @@
+ <div class="annotation authors">
+ <h3 class="type">Authors</h3>
+ <div class="body">
+ <ul>
+ <li><span class="authoredBy">Khalid Belhajjame</span>
+ <span class="authoredOn">(last authored on 2012-12-24 18:40)</span</li>
+ </li>
+ </ul>
+ </div>
+ </div>
+
+ <div class="annotation contributors">
+ <h3 class="type">Contributors</h3>
+ <div class="body">
+ <ul>
+ <li><span class="contributedBy">Stian Soiland-Reyes</span>
+ <span class="contributedOn">(last contributed on 2012-11-10 11:21)</span</li>
+ <li><span class="contributedBy">Fred Bloggs</span>
+ <span class="contributedOn">(last contributed on 2011-09-15 03:40)</span</li>
+ </ul>
+ </div>
+ </div>
\ No newline at end of file
Added: branches/wf4ever/app/views/research_objects/_description.rhtml (0 => 3270)
--- branches/wf4ever/app/views/research_objects/_description.rhtml (rev 0)
+++ branches/wf4ever/app/views/research_objects/_description.rhtml 2012-12-14 16:56:41 UTC (rev 3270)
@@ -0,0 +1,12 @@
+ <div class="annotation">
+ <h3 class="type">Description</h3>
+ <div class="body">
+ This research object shows a Hello World workflow. This is particularly interesting because
+ it is difficult to create a much simpler research object, but still expose most of the RO
+ functionality.
+ </div>
+ <div class="provenance">
+ <span class="authoredBy">Stian Soiland-Reyes</span> on
+ <span class="authoredOn">2012-12-24 15:04</span>
+ </div>
+ </div>
Added: branches/wf4ever/app/views/research_objects/_diagram.rhtml (0 => 3270)
--- branches/wf4ever/app/views/research_objects/_diagram.rhtml (rev 0)
+++ branches/wf4ever/app/views/research_objects/_diagram.rhtml 2012-12-14 16:56:41 UTC (rev 3270)
@@ -0,0 +1,11 @@
+ <div class="annotation">
+ <h3 class="type">Research diagram</h3>
+ <div class="body">
+ <div class="todo">What to call this section?</div>
+ <img src="" />
+ </div>
+ <div class="provenance">
+ <span class="authoredBy">Pique</span> on
+ <span class="authoredOn">2012-12-24 15:04</span>
+ </div>
+ </div>
Added: branches/wf4ever/app/views/research_objects/_evolution.rhtml (0 => 3270)
--- branches/wf4ever/app/views/research_objects/_evolution.rhtml (rev 0)
+++ branches/wf4ever/app/views/research_objects/_evolution.rhtml 2012-12-14 16:56:41 UTC (rev 3270)
@@ -0,0 +1,64 @@
+
+ <div class="evolution">
+<h2>
+ <span class="icon"><img alt="Comments" src="" </span> <span style="vertical-align: middle;">Evolution</span>
+</h2>
+
+ <a name="version_history"></a>
+ <p>In chronological order:</p>
+
+<ol class="version_history">
+ <li>
+ <div class="title">
+ <a href="" PDB entries in Jmol for hits found for HIV in Bio2RDF</a>
+ </div>
+ <div class="metadata">
+
+ <p>
+ Created
+ by <a href="" title="">Egon Willighagen</a>
+ on Sunday 11 October 2009 @ 21:25:58 (GMT)
+ </p>
+ </div>
+ </li>
+
+ <li>
+ <div class="title">
+ <a href="" PDB entries in Jmol for hits found for HIV in Bio2RDF</a>
+ </div>
+ <div class="metadata">
+ <p>
+ Created
+ by <a href="" title="header=[] body=[Egon Willighagen] cssheader=[boxoverTooltipHeader] cssbody=[boxoverTooltipBody] delay=[200]">Egon Willighagen</a>
+ on Sunday 14 March 2010 @ 21:26:05 (GMT)
+ </p>
+ <p>
+ </p><div>Revision comment:</div>
+ <div class="comment">
+ <p>Version for Bioclipse 2.4. Use version 1 for Bioclipse 2.2.</p>
+ </div>
+ <p></p>
+
+ </div>
+ </li>
+
+ <li>
+ <div class="title">
+ <a href="" PDB entries in Jmol for hits found for HIV in Bio2RDF</a>
+ </div>
+ <div class="metadata">
+ <p>
+ Created
+ by <a href="" title="header=[] body=[Egon Willighagen] cssheader=[boxoverTooltipHeader] cssbody=[boxoverTooltipBody] delay=[200]">Egon Willighagen</a>
+ on Wednesday 23 June 2010 @ 20:20:40 (GMT)
+ </p>
+ <p>
+ </p><div>Revision comment:</div>
+ <div class="comment">
+ <p> Updated URI for Bio2RDF SPARQL end point.</p>
+ </div>
+ <p></p>
+ </div>
+ </li>
+</ol>
+ </div>
\ No newline at end of file
Copied: branches/wf4ever/app/views/research_objects/_manifest.rhtml (from rev 3269, branches/wf4ever/app/views/research_objects/_resources.rhtml) (0 => 3270)
--- branches/wf4ever/app/views/research_objects/_manifest.rhtml (rev 0)
+++ branches/wf4ever/app/views/research_objects/_manifest.rhtml 2012-12-14 16:56:41 UTC (rev 3270)
@@ -0,0 +1,35 @@
+<h2>Resources from manifest</h2>
+
+<table class="simple">
+
+ <tr>
+ <td>created_at</td>
+ <td><%=h @contributable.created_at -%></td>
+ </tr>
+
+ <tr>
+ <td>updated_at</td>
+ <td><%=h @contributable.updated_at -%></td>
+ </tr>
+
+ <tr>
+ <td>URL</td>
+ <td><%=h @contributable.url -%></td>
+ </tr>
+
+ <tr>
+ <td>title</td>
+ <td><%=h @contributable.title -%></td>
+ </tr>
+
+ <tr>
+ <td>description</td>
+ <td><%= @contributable.description_html -%></td>
+ </tr>
+
+ <tr>
+ <td>RDF statement count</td>
+ <td><%= @contributable.statements.length -%></td>
+ </tr>
+
+</table>
\ No newline at end of file
Modified: branches/wf4ever/app/views/research_objects/_resources.rhtml (3269 => 3270)
--- branches/wf4ever/app/views/research_objects/_resources.rhtml 2012-12-14 16:56:34 UTC (rev 3269)
+++ branches/wf4ever/app/views/research_objects/_resources.rhtml 2012-12-14 16:56:41 UTC (rev 3270)
@@ -1,69 +1,9 @@
-
-
-<h2>Resources from manifest</h2>
-
-<table class="simple">
-
- <tr>
- <td>created_at</td>
- <td><%=h @contributable.created_at -%></td>
- </tr>
-
- <tr>
- <td>updated_at</td>
- <td><%=h @contributable.updated_at -%></td>
- </tr>
-
- <tr>
- <td>URL</td>
- <td><%=h @contributable.url -%></td>
- </tr>
-
- <tr>
- <td>title</td>
- <td><%=h @contributable.title -%></td>
- </tr>
-
- <tr>
- <td>description</td>
- <td><%= @contributable.description_html -%></td>
- </tr>
-
- <tr>
- <td>RDF statement count</td>
- <td><%= @contributable.statements.length -%></td>
- </tr>
-
-</table>
-
<% resources = @contributable.wf4ever_resources %>
-<% annotations = @contributable.annotations %>
<% if resources.length > 0 %>
- <h2>Pack Items</h2>
+ <h2>Aggregated resources</h2>
<%= research_object_resources(@contributable) -%>
<% end %>
-
-<% if annotations.length > 0 %>
-
- <h2>Annotations</h2>
-
- <table class="simple">
- <tr>
- <th>Type</th>
- <th>Value</th>
- </tr>
- <% annotations.each do |annotation| %>
- <tr>
- <td><%=h annotation[:type] -%></td>
- <td><%=h annotation[:body] -%></td>
- </tr>
- <% end %>
- </table>
-
- <br />
-
-<% end %>
\ No newline at end of file
Added: branches/wf4ever/app/views/research_objects/_reviews.rhtml (0 => 3270)
--- branches/wf4ever/app/views/research_objects/_reviews.rhtml (rev 0)
+++ branches/wf4ever/app/views/research_objects/_reviews.rhtml 2012-12-14 16:56:41 UTC (rev 3270)
@@ -0,0 +1,87 @@
+<div id="ratingsBox">
+ <script src="" type="text/_javascript_"></script>
+<script src="" type="text/_javascript_"></script>
+
+<h2>
+ <span class="icon"><img alt="Reviews" src="" </span> <span style="vertical-align: middle;"><a href=""
+ <span class="count_text" style="vertical-align: middle;">(1)</span>
+</h2>
+
+<div class="reviewsBox">
+
+
+ <ul class="sectionIcons">
+ <li><span class="icon"><a href="" alt="Review" src="" Write your own Review</a></span></li>
+ </ul>
+ <a name="reviews"></a>
+
+
+ <table class="alt_table">
+
+
+ <tbody><tr class="odd_row">
+ <td width="80px" style="text-align: center;">
+ <b>By</b>
+ <div style="text-align:center; width: 66px; line-height: 1.2em; padding: 0.2em 0;">
+ <a href="" alt="Avatar" class="framed" height="60" src="" title="Peter Ansell" width="60"></a>
+ <span style="display:block;margin-top:2px;text-align:center;">
+
+ <img alt="Au" src="" style="vertical-align:middle; margin-right: 0.3em;" title="header=[] body=[<b>Location: </b>Brisbane, Australia] cssheader=[boxoverTooltipHeader] cssbody=[boxoverTooltipBody] delay=[200]">
+
+
+
+ <a href="" title="header=[] body=[Peter Ansell] cssheader=[boxoverTooltipHeader] cssbody=[boxoverTooltipBody] delay=[200]">Peter Ansell</a>
+
+
+
+
+ </span>
+</div>
+
+ </td>
+ <td class="mid" style="text-align: left;">
+ <p style="margin-top:0; padding-top:0; font-weight:bold; font-size: 108%;">
+ <span class="icon"><img alt="Review" src="" </span>
+ Title: <a href="" way to do this</a>
+ </p>
+
+ <p>
+ <b>Rating: </b>
+
+ <span class="none_text">not yet rated</span>
+
+ </p>
+
+ <p style="font-size: 85%; color: #666666;">
+ <b>Created:</b> 11/05/10 @ 00:40:53
+ |
+ <b>Updated:</b> 11/05/10 @ 00:40:53
+ </p>
+
+ <div class="desc" style="font-size: 85%;">
+
+ Have you tried using the following URL?
+http://bio2rdf.org/searchns/pdb/HIV
+Cheers,
+Peter
+
+ <p style="text-align: right;">
+ [ <a href="" ]
+ </p>
+ </div>
+ </td>
+ <td class="actions" style="width: 80px;">
+ <span class="icon"><a href="" alt="Show" src="" View</a></span>
+
+ </td>
+ </tr>
+
+ </tbody></table>
+
+
+
+
+
+</div>
+
+</div>
\ No newline at end of file
Added: branches/wf4ever/app/views/research_objects/_status.rhtml (0 => 3270)
--- branches/wf4ever/app/views/research_objects/_status.rhtml (rev 0)
+++ branches/wf4ever/app/views/research_objects/_status.rhtml 2012-12-14 16:56:41 UTC (rev 3270)
@@ -0,0 +1,8 @@
+<div class="contribution_section_box">
+ <h3 class="heading">
+ RO status
+ </h3>
+ <div class="status live">
+ Live
+ </div>
+ </div>
Added: branches/wf4ever/app/views/research_objects/_tags.rhtml (0 => 3270)
--- branches/wf4ever/app/views/research_objects/_tags.rhtml (rev 0)
+++ branches/wf4ever/app/views/research_objects/_tags.rhtml 2012-12-14 16:56:41 UTC (rev 3270)
@@ -0,0 +1,22 @@
+ <div class="tags">
+ <h3>Tags</h3>
+ <div class="tags">
+ <div class="hTagcloud">
+ <ul class="popularity">
+ <li><a href="" class="vv-popular">bio2rdf</a></li>
+<li> | </li>
+ <li><a href="" class="vv-popular">bioclipse</a></li>
+<li> | </li>
+ <li><a href="" class="vvvv-popular">cheminformatics</a></li>
+<li> | </li>
+ <li><a href="" class="popular">drug development</a></li>
+<li> | </li>
+ <li><a href="" class="popular">proteins</a></li>
+<li> | </li>
+ <li><a href="" class="vv-popular">rdf</a></li>
+<li> | </li>
+ <li><a href="" class="v-popular">sparql</a></li>
+ </ul>
+ </div>
+ </div>
+ </div>
\ No newline at end of file
Added: branches/wf4ever/app/views/research_objects/_title.rhtml (0 => 3270)
--- branches/wf4ever/app/views/research_objects/_title.rhtml (rev 0)
+++ branches/wf4ever/app/views/research_objects/_title.rhtml 2012-12-14 16:56:41 UTC (rev 3270)
@@ -0,0 +1,8 @@
+ <div class="annotation">
+ <span class="type">Title:</span>
+ <span class="title">Hello World</span>
+ <div class="provenance">
+ <span class="authoredBy">Stian Soiland-Reyes</span> on
+ <span class="authoredOn">2012-05-14 17:05</span>
+ </div>
+ </div>
\ No newline at end of file
Added: branches/wf4ever/app/views/research_objects/_tree.rhtml (0 => 3270)
--- branches/wf4ever/app/views/research_objects/_tree.rhtml (rev 0)
+++ branches/wf4ever/app/views/research_objects/_tree.rhtml 2012-12-14 16:56:41 UTC (rev 3270)
@@ -0,0 +1,12 @@
+<div class="contribution_section_box tree">
+ <h3 class="heading">
+ Navigate RO
+ </h3>
+
+ <div class="rotree">
+
+ This is the tree
+
+ </div>
+
+</div>
\ No newline at end of file
Added: branches/wf4ever/app/views/research_objects/_uploader.rhtml (0 => 3270)
--- branches/wf4ever/app/views/research_objects/_uploader.rhtml (rev 0)
+++ branches/wf4ever/app/views/research_objects/_uploader.rhtml 2012-12-14 16:56:41 UTC (rev 3270)
@@ -0,0 +1,11 @@
+ <div class="annotation uploaders">
+ <h3 class="type">Uploaded by</h3>
+ <div class="body">
+ <ul>
+ <li><span class="createdBy">Stian Soiland-Reyes</span>
+ <span class="createdOn">(last uploaded on 2012-12-24 18:40)</span</li>
+ <li><span class="createdBy">Khalid Belhajjame</span>
+ <span class="createdOn">(last uploaded on 2012-11-02 18:40)</span</li>
+ </ul>
+ </div>
+ </div>
\ No newline at end of file
Modified: branches/wf4ever/app/views/research_objects/show.rhtml (3269 => 3270)
--- branches/wf4ever/app/views/research_objects/show.rhtml 2012-12-14 16:56:34 UTC (rev 3269)
+++ branches/wf4ever/app/views/research_objects/show.rhtml 2012-12-14 16:56:41 UTC (rev 3270)
@@ -35,39 +35,58 @@
<div class="contribution_left_box">
<div class="contribution_version_box">
-<%= render :partial => "research_objects/versions", :locals => { :contributable => @contributable } -%>
-
+
+ <%= render :partial => "research_objects/versions", :locals => { :contributable => @contributable } -%>
- <div class="contribution_version_inner_box">
- <div class="annotation">
- <span class="type">Title:</span>
- <span class="title">Hello World</span>
- <div class="provenance">
- <span class="authoredBy">Stian Soiland-Reyes</span> on
- <span class="authoredOn">2012-05-14 17:05</span>
- </div>
- </div>
-
- <div class="annotation">
- <h3 class="type">Description</h3>
- <div class="body">
- This research object shows a Hello World workflow. This is particularly interesting because
- it is difficult to create a much simpler research object, but still expose most of the RO
- functionality.
- </div>
- <div class="provenance">
- <span class="authoredBy">Stian Soiland-Reyes</span> on
- <span class="authoredOn">2012-12-24 15:04</span>
- </div>
- </div>
- </div>
-
- </div>
+ <div class="contribution_version_inner_box">
+ <%= render :partial => "research_objects/title", :locals => { :contributable => @contributable } -%>
+ <%= render :partial => "research_objects/uploader", :locals => { :contributable => @contributable } -%>
+ <%= render :partial => "research_objects/description", :locals => { :contributable => @contributable } -%>
+ <%= render :partial => "research_objects/credits", :locals => { :contributable => @contributable } -%>
+ <%= render :partial => "research_objects/tags", :locals => { :contributable => @contributable } -%>
+ <%= render :partial => "research_objects/diagram", :locals => { :contributable => @contributable } -%>
+ <%= render :partial => "research_objects/attribution", :locals => { :contributable => @contributable } -%>
+ <%= render :partial => "research_objects/resources", :locals => { :contributable => @contributable } -%>
+
<% if false %>
- <%= render :partial => "research_objects/resources", :locals => { :contributable => @contributable } -%>
+ <%= render :partial => "research_objects/manifest", :locals => { :contributable => @contributable } -%>
+ <%= render :partial => "research_objects/annotations", :locals => { :contributable => @contributable } -%>
<%= render :partial => "research_objects/statements", :locals => { :contributable => @contributable } -%>
+
<% end %>
+
+ </div>
+ </div><!-- End of version -->
+
+
+
+ <%= render :partial => "research_objects/evolution", :locals => { :contributable => @contributable } -%>
+
+
+ <div id="ratingsBox">
+ <%= render :partial => "research_objects/reviews", :locals => { :reviewable => @contributable } %>
+ </div>
+
+ <div id="commentsBox">
+ <%= render :partial => "research_objects/comments", :locals => { :commentable => @contributable } %>
+ </div>
+
+
</div>
+<div class="contribution_right_box">
+
+ <%= render :partial => "research_objects/status", :locals => { :contributable => @contributable } -%>
+
+ <%= render :partial => "research_objects/tree", :locals => { :contributable => @contributable } -%>
+
+
+ <%= render :partial => "contributions/uploader_box", :locals => { :contributable => @contributable } %>
+
+ <%= render :partial => "contributions/shared_with_groups_box", :locals => { :contributable => @contributable } %>
+
+ <%= render :partial => "contributions/in_packs_box", :locals => { :contributable => @contributable, :contributable_url => @ro_entry_url } %>
+
+</div>
\ No newline at end of file
Added: branches/wf4ever/public/images/mockup/schema-pique.png (0 => 3270)
--- branches/wf4ever/public/images/mockup/schema-pique.png (rev 0)
+++ branches/wf4ever/public/images/mockup/schema-pique.png 2012-12-14 16:56:41 UTC (rev 3270)
@@ -0,0 +1,573 @@
+\x89PNG
+
+
+IHDR \x90 \xE8 \xC1\xB9\xB2\xD4 bKGD \xFF \xFF \xFF\xA0\xBD\xA7\x93 pHYs \xC2 \xC2n\xD0u>