Modified: branches/wf4ever/app/views/packs/show.rhtml (3500 => 3501)
--- branches/wf4ever/app/views/packs/show.rhtml 2013-04-11 15:04:46 UTC (rev 3500)
+++ branches/wf4ever/app/views/packs/show.rhtml 2013-04-11 15:06:03 UTC (rev 3501)
@@ -86,8 +86,8 @@
<% end %>
- <%= render :partial => "research_objects/uploader", :locals => { :contributable => @pack } -%>
- <%= render :partial => "research_objects/credits", :locals => { :contributable => @pack } -%>
+ <%= render :partial => "research_objects/uploader", :locals => { :contributable => @pack, :graph => @annotations.graph, :subject => @pack.ro_uri } -%>
+ <%= render :partial => "research_objects/credits", :locals => { :contributable => @pack, :graph => @annotations.graph, :subject => @pack.ro_uri } -%>
</div>
</div>
@@ -98,6 +98,9 @@
<%= 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 } -%>
@@ -116,9 +119,6 @@
<div id="pack_items">
<%= render :partial => "items", :locals => { :pack => @pack, :contributable_entries => contributable_entries, :remote_entries => remote_entries, :authorised_to_edit => @authorised_to_edit } -%>
</div>
- <% # FIXME diagram should not have to be rendered after items %>
- <%= render :partial => "research_objects/diagram", :locals => { :contributable => @pack } -%>
-
<br/><br/>
<h4>
Modified: branches/wf4ever/app/views/research_objects/_credits.rhtml (3500 => 3501)
--- branches/wf4ever/app/views/research_objects/_credits.rhtml 2013-04-11 15:04:46 UTC (rev 3500)
+++ branches/wf4ever/app/views/research_objects/_credits.rhtml 2013-04-11 15:06:03 UTC (rev 3501)
@@ -1,23 +1,31 @@
- <div class="annotation authors mockup">
- <h3 class="type">Authors</h3>
- <div class="body">
- <ul>
- <li><span class="authoredBy">Kristina Hettne</span>
- <span class="authoredOn">(last authored on 2012-12-24 18:40)</span</li>
- </li>
- <li><span class="authoredBy">Marco Roos</span>
- <span class="authoredOn">(last authored on 2012-10-15 11:24)</span</li>
- </li>
- </ul>
- </div>
- </div>
-
- <div class="annotation contributors mockup">
- <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>
- </ul>
- </div>
- </div>
\ No newline at end of file
+<% creators = graph.query([nil, RDF::DC.creator, nil]) %>
+<% contributors = graph.query([nil, RDF::DC.contributor, nil]) %>
+
+<% if creators.count > 0 %>
+ <h3 class="type">Authors</h3>
+ <div class="body">
+ <ul>
+ <% graph.query([nil, RDF::DC.creator, nil]).each do |statement| %>
+ <li>
+ <span class="authoredBy"><%= user_link(statement.object.to_s) -%></span>
+ <% if false %><span class="authoredOn">(last authored on 2012-12-24 18:40)</span><% end %>
+ </li>
+ <% end %>
+ </ul>
+ </div>
+<% end %>
+
+<% if contributors.count > 0 %>
+ <h3 class="type">Contributors</h3>
+ <div class="body">
+ <ul>
+ <% graph.query([nil, RDF::DC.contributor, nil]).each do |statement| %>
+ <li>
+ <span class="contributedBy"><%= user_link(statement.object.to_s) -%></span>
+ <% if false %><span class="contributedOn">(last authored on 2012-12-24 18:40)</span><% end %>
+ </li>
+ <% end %>
+ </ul>
+ </div>
+<% end %>
+