Modified: branches/wf4ever/app/controllers/packs_controller.rb (3501 => 3502)
--- branches/wf4ever/app/controllers/packs_controller.rb 2013-04-11 15:06:03 UTC (rev 3501)
+++ branches/wf4ever/app/controllers/packs_controller.rb 2013-04-11 16:07:25 UTC (rev 3502)
@@ -88,6 +88,10 @@
@sketch = @all_annotations.query([nil, RDF::type, RDF::URI.parse("http://purl.org/wf4ever/roterms#Sketch")]).map do |s, p, o| s.to_s end
+ @hypothesis = @all_annotations.query([nil, RDF::type, RDF::URI.parse("http://purl.org/wf4ever/roterms#Hypothesis")]).map do |s, p, o| s.to_s end
+
+ @conclusions = @all_annotations.query([nil, RDF::type, RDF::URI.parse("http://purl.org/wf4ever/roterms#Conclusions")]).map do |s, p, o| s.to_s end
+
if allow_statistics_logging(@pack)
@viewing = Viewing.create(:contribution => @pack.contribution, :user => (logged_in? ? current_user : nil), :user_agent => request.env['HTTP_USER_AGENT'], :accessed_from_site => accessed_from_website?())
end
Modified: branches/wf4ever/app/views/packs/show.rhtml (3501 => 3502)
--- branches/wf4ever/app/views/packs/show.rhtml 2013-04-11 15:06:03 UTC (rev 3501)
+++ branches/wf4ever/app/views/packs/show.rhtml 2013-04-11 16:07:25 UTC (rev 3502)
@@ -98,12 +98,27 @@
<%= render :partial => "research_objects/tags", :locals => { :contributable => @pack } -%>
<% end %>
- <% # FIXME diagram should not have to be rendered after items %>
<%= render :partial => "research_objects/diagram", :locals => { :contributable => @pack } -%>
-
<%= render :partial => "research_objects/attribution", :locals => { :contributable => @pack } -%>
+<% if @hypothesis.count > 0 %>
+ <h3>Hypothesis</h3>
+ <ul>
+ <% @hypothesis.each do |resource| %>
+ <li><%= link_to(h(resource), resource) -%></li>
+ <% end %>
+ </ul>
+<% end %>
+<% if @conclusions.count > 0 %>
+ <h3>Conclusions</h3>
+ <ul>
+ <% @conclusions.each do |resource| %>
+ <li><%= link_to(h(resource), resource) -%></li>
+ <% end %>
+ </ul>
+<% end %>
+
<div class="contribution_version_box" style="background-color: #EEEEEE;">
<div class="contribution_version_inner_box">
<h4>