Diff
Modified: trunk/app/controllers/announcements_controller.rb (2454 => 2455)
--- trunk/app/controllers/announcements_controller.rb 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/controllers/announcements_controller.rb 2010-07-01 13:02:58 UTC (rev 2455)
@@ -24,8 +24,16 @@
@announcement = Announcement.find(params[:id])
respond_to do |format|
- format.html # show.rhtml
+ format.html {
+ @lod_nir = announcement_url(@announcement)
+ @lod_html = formatted_announcement_url(:id => @announcement.id, :format => 'html')
+ @lod_rdf = formatted_announcement_url(:id => @announcement.id, :format => 'rdf')
+ @lod_xml = formatted_announcement_url(:id => @announcement.id, :format => 'xml')
+ #
+ # show.rhtml
+ }
+
if Conf.rdfgen_enable
format.rdf {
render :inline => `#{Conf.rdfgen_tool} announcements address@hidden
Modified: trunk/app/controllers/blobs_controller.rb (2454 => 2455)
--- trunk/app/controllers/blobs_controller.rb 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/controllers/blobs_controller.rb 2010-07-01 13:02:58 UTC (rev 2455)
@@ -64,8 +64,16 @@
end
respond_to do |format|
- format.html # show.rhtml
+ format.html {
+ @lod_nir = file_url(@blob)
+ @lod_html = formatted_file_url(:id => @blob.id, :format => 'html')
+ @lod_rdf = formatted_file_url(:id => @blob.id, :format => 'rdf')
+ @lod_xml = formatted_file_url(:id => @blob.id, :format => 'xml')
+
+ # show.rhtml
+ }
+
if Conf.rdfgen_enable
format.rdf {
render :inline => `#{Conf.rdfgen_tool} files address@hidden
Modified: trunk/app/controllers/content_types_controller.rb (2454 => 2455)
--- trunk/app/controllers/content_types_controller.rb 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/controllers/content_types_controller.rb 2010-07-01 13:02:58 UTC (rev 2455)
@@ -24,8 +24,17 @@
@total_count = @workflow_count + @blob_count
respond_to do |format|
- format.html # show.rhtml
+ format.html {
+ @lod_nir = content_type_url(@content_type)
+ @lod_html = formatted_content_type_url(:id => @content_type.id, :format => 'html')
+ @lod_rdf = formatted_content_type_url(:id => @content_type.id, :format => 'rdf')
+ @lod_xml = formatted_content_type_url(:id => @content_type.id, :format => 'xml')
+
+ # show.rhtml
+ }
+
+
if Conf.rdfgen_enable
format.rdf {
render :inline => `#{Conf.rdfgen_tool} content_types address@hidden
Modified: trunk/app/controllers/experiments_controller.rb (2454 => 2455)
--- trunk/app/controllers/experiments_controller.rb 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/controllers/experiments_controller.rb 2010-07-01 13:02:58 UTC (rev 2455)
@@ -18,7 +18,15 @@
def show
respond_to do |format|
- format.html # show.rhtml
+ format.html {
+
+ @lod_nir = experiment_url(@experiment)
+ @lod_html = formatted_experiment_url(:id => @experiment.id, :format => 'html')
+ @lod_rdf = formatted_experiment_url(:id => @experiment.id, :format => 'rdf')
+ @lod_xml = formatted_experiment_url(:id => @experiment.id, :format => 'xml')
+
+ # show.rhtml
+ }
if Conf.rdfgen_enable
format.rdf {
Modified: trunk/app/controllers/group_announcements_controller.rb (2454 => 2455)
--- trunk/app/controllers/group_announcements_controller.rb 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/controllers/group_announcements_controller.rb 2010-07-01 13:02:58 UTC (rev 2455)
@@ -28,8 +28,16 @@
# GET /group_announcements/1
def show
respond_to do |format|
- format.html # show.rhtml
+ format.html {
+ @lod_nir = group_announcement_url(:id => @announcement.id, :group_id => @announcement.network_id)
+ @lod_html = formatted_group_announcement_url(:id => @announcement.id, :group_id => @announcement.network_id, :format => 'html')
+ @lod_rdf = formatted_group_announcement_url(:id => @announcement.id, :group_id => @announcement.network_id, :format => 'rdf')
+ @lod_xml = formatted_group_announcement_url(:id => @announcement.id, :group_id => @announcement.network_id, :format => 'xml')
+
+ # show.rhtml
+ }
+
if Conf.rdfgen_enable
format.rdf {
render :inline => `#{Conf.rdfgen_tool} group_announcements address@hidden
Modified: trunk/app/controllers/jobs_controller.rb (2454 => 2455)
--- trunk/app/controllers/jobs_controller.rb 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/controllers/jobs_controller.rb 2010-07-01 13:02:58 UTC (rev 2455)
@@ -38,7 +38,15 @@
@job.refresh_status!
respond_to do |format|
- format.html # show.rhtml
+ format.html {
+
+ @lod_nir = experiment_job_url(:id => @job.id, :experiment_id => @experiment.id)
+ @lod_html = formatted_experiment_job_url(:id => @job.id, :experiment_id => @experiment.id, :format => 'html')
+ @lod_rdf = formatted_experiment_job_url(:id => @job.id, :experiment_id => @experiment.id, :format => 'rdf')
+ @lod_xml = formatted_experiment_job_url(:id => @job.id, :experiment_id => @experiment.id, :format => 'xml')
+
+ # show.rhtml
+ }
if Conf.rdfgen_enable
format.rdf {
Modified: trunk/app/controllers/licenses_controller.rb (2454 => 2455)
--- trunk/app/controllers/licenses_controller.rb 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/controllers/licenses_controller.rb 2010-07-01 13:02:58 UTC (rev 2455)
@@ -13,8 +13,16 @@
@license = License.find(params[:id])
respond_to do |format|
- format.html # show.rhtml
+ format.html {
+ @lod_nir = license_url(@license)
+ @lod_html = formatted_license_url(:id => @license.id, :format => 'html')
+ @lod_rdf = formatted_license_url(:id => @license.id, :format => 'rdf')
+ @lod_xml = formatted_license_url(:id => @license.id, :format => 'xml')
+
+ # show.rhtml
+ }
+
if Conf.rdfgen_enable
format.rdf {
render :inline => `#{Conf.rdfgen_tool} licenses address@hidden
Modified: trunk/app/controllers/memberships_controller.rb (2454 => 2455)
--- trunk/app/controllers/memberships_controller.rb 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/controllers/memberships_controller.rb 2010-07-01 13:02:58 UTC (rev 2455)
@@ -60,8 +60,16 @@
# GET /memberships/1
def show
respond_to do |format|
- format.html # show.rhtml
+ format.html {
+ @lod_nir = user_membership_url(:id => @membership, :user_id => @membership.user_id)
+ @lod_html = formatted_user_membership_url(:id => @membership.id, :user_id => @membership.user_id, :format => 'html')
+ @lod_rdf = formatted_user_membership_url(:id => @membership.id, :user_id => @membership.user_id, :format => 'rdf')
+ @lod_xml = formatted_user_membership_url(:id => @membership.id, :user_id => @membership.user_id, :format => 'xml')
+
+ # show.rhtml
+ }
+
if Conf.rdfgen_enable
format.rdf {
render :inline => `#{Conf.rdfgen_tool} memberships address@hidden
Modified: trunk/app/controllers/messages_controller.rb (2454 => 2455)
--- trunk/app/controllers/messages_controller.rb 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/controllers/messages_controller.rb 2010-07-01 13:02:58 UTC (rev 2455)
@@ -66,7 +66,15 @@
@message_folder = message_folder
respond_to do |format|
- format.html # show.rhtml
+ format.html {
+
+ @lod_nir = message_url(@message)
+ @lod_html = formatted_message_url(:id => @message.id, :format => 'html')
+ @lod_rdf = formatted_message_url(:id => @message.id, :format => 'rdf')
+ @lod_xml = formatted_message_url(:id => @message.id, :format => 'xml')
+
+ # show.rhtml
+ }
if Conf.rdfgen_enable
format.rdf {
Modified: trunk/app/controllers/networks_controller.rb (2454 => 2455)
--- trunk/app/controllers/networks_controller.rb 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/controllers/networks_controller.rb 2010-07-01 13:02:58 UTC (rev 2455)
@@ -331,7 +331,15 @@
end
respond_to do |format|
- format.html # show.rhtml
+ format.html {
+
+ @lod_nir = group_url(@network)
+ @lod_html = formatted_group_url(:id => @network.id, :format => 'html')
+ @lod_rdf = formatted_group_url(:id => @network.id, :format => 'rdf')
+ @lod_xml = formatted_group_url(:id => @network.id, :format => 'xml')
+
+ # show.rhtml
+ }
if Conf.rdfgen_enable
format.rdf {
Modified: trunk/app/controllers/packs_controller.rb (2454 => 2455)
--- trunk/app/controllers/packs_controller.rb 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/controllers/packs_controller.rb 2010-07-01 13:02:58 UTC (rev 2455)
@@ -40,7 +40,15 @@
end
respond_to do |format|
- format.html # show.rhtml
+ format.html {
+
+ @lod_nir = pack_url(@pack)
+ @lod_html = formatted_pack_url(:id => @pack.id, :format => 'html')
+ @lod_rdf = formatted_pack_url(:id => @pack.id, :format => 'rdf')
+ @lod_xml = formatted_pack_url(:id => @pack.id, :format => 'xml')
+
+ # show.rhtml
+ }
if Conf.rdfgen_enable
format.rdf {
Modified: trunk/app/controllers/reviews_controller.rb (2454 => 2455)
--- trunk/app/controllers/reviews_controller.rb 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/controllers/reviews_controller.rb 2010-07-01 13:02:58 UTC (rev 2455)
@@ -29,7 +29,15 @@
def show
respond_to do |format|
- format.html # show.rhtml
+ format.html {
+
+ @lod_nir = review_url(:id => @review.id, :workflow_id => @reviewable.id)
+ @lod_html = formatted_workflow_review_url(:id => @review.id, :workflow_id => @reviewable.id, :format => 'html')
+ @lod_rdf = formatted_workflow_review_url(:id => @review.id, :workflow_id => @reviewable.id, :format => 'rdf')
+ @lod_xml = formatted_workflow_review_url(:id => @review.id, :workflow_id => @reviewable.id, :format => 'xml')
+
+ # show.rhtml
+ }
if Conf.rdfgen_enable
format.rdf {
Modified: trunk/app/controllers/runners_controller.rb (2454 => 2455)
--- trunk/app/controllers/runners_controller.rb 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/controllers/runners_controller.rb 2010-07-01 13:02:58 UTC (rev 2455)
@@ -20,8 +20,16 @@
def show
respond_to do |format|
- format.html # show.rhtml
+ format.html {
+ @lod_nir = runner_url(@runner)
+ @lod_html = formatted_runner_url(:id => @runner.id, :format => 'html')
+ @lod_rdf = formatted_runner_url(:id => @runner.id, :format => 'rdf')
+ @lod_xml = formatted_runner_url(:id => @runner.id, :format => 'xml')
+
+ # show.rhtml
+ }
+
if Conf.rdfgen_enable
format.rdf {
render :inline => `#{Conf.rdfgen_tool} runners address@hidden
Modified: trunk/app/controllers/tags_controller.rb (2454 => 2455)
--- trunk/app/controllers/tags_controller.rb 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/controllers/tags_controller.rb 2010-07-01 13:02:58 UTC (rev 2455)
@@ -17,8 +17,16 @@
def show
respond_to do |format|
- format.html # show.rhtml
+ format.html {
+ @lod_nir = tag_url(@tag)
+ @lod_html = formatted_tag_url(:id => @tag.id, :format => 'html')
+ @lod_rdf = formatted_tag_url(:id => @tag.id, :format => 'rdf')
+ @lod_xml = formatted_tag_url(:id => @tag.id, :format => 'xml')
+
+ # show.rhtml
+ }
+
if Conf.rdfgen_enable
format.rdf {
render :inline => `#{Conf.rdfgen_tool} tags address@hidden
Modified: trunk/app/controllers/users_controller.rb (2454 => 2455)
--- trunk/app/controllers/users_controller.rb 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/controllers/users_controller.rb 2010-07-01 13:02:58 UTC (rev 2455)
@@ -39,6 +39,11 @@
# GET /users/1
def show
+ @lod_nir = user_url(@user)
+ @lod_html = formatted_user_url(:id => @user.id, :format => 'html')
+ @lod_rdf = formatted_user_url(:id => @user.id, :format => 'rdf')
+ @lod_xml = formatted_user_url(:id => @user.id, :format => 'xml')
+
@tab = "News" if @tab.nil?
@user.salt = nil
Modified: trunk/app/controllers/workflows_controller.rb (2454 => 2455)
--- trunk/app/controllers/workflows_controller.rb 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/controllers/workflows_controller.rb 2010-07-01 13:02:58 UTC (rev 2455)
@@ -180,8 +180,23 @@
end
respond_to do |format|
- format.html # show.rhtml
+ format.html {
+ if params[:version]
+ @lod_nir = workflow_version_url(:id => @workflow.id, :version => @viewing_version_number)
+ @lod_html = formatted_workflow_version_url(:id => @workflow.id, :version => @viewing_version_number, :format => 'html')
+ @lod_rdf = formatted_workflow_version_url(:id => @workflow.id, :version => @viewing_version_number, :format => 'rdf')
+ @lod_xml = formatted_workflow_version_url(:id => @workflow.id, :version => @viewing_version_number, :format => 'xml')
+ else
+ @lod_nir = workflow_url(@workflow)
+ @lod_html = formatted_workflow_url(:id => @workflow.id, :format => 'html')
+ @lod_rdf = formatted_workflow_url(:id => @workflow.id, :format => 'rdf')
+ @lod_xml = formatted_workflow_url(:id => @workflow.id, :format => 'xml')
+ end
+
+ # show.rhtml
+ }
+
if Conf.rdfgen_enable
format.rdf {
if params[:version]
Modified: trunk/app/views/announcements/show.rhtml (2454 => 2455)
--- trunk/app/views/announcements/show.rhtml 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/views/announcements/show.rhtml 2010-07-01 13:02:58 UTC (rev 2455)
@@ -34,9 +34,5 @@
</div>
</div>
-<%= render :partial => "contributions/alternative_formats", :locals => {
- :nir => announcement_url(@announcement),
- :html => formatted_announcement_url(:id => @announcement.id, :format => 'html'),
- :rdf => formatted_announcement_url(:id => @announcement.id, :format => 'rdf'),
- :xml => formatted_announcement_url(:id => @announcement.id, :format => 'xml') } %>
+<%= render :partial => "contributions/alternative_formats" %>
Modified: trunk/app/views/blobs/show.rhtml (2454 => 2455)
--- trunk/app/views/blobs/show.rhtml 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/views/blobs/show.rhtml 2010-07-01 13:02:58 UTC (rev 2455)
@@ -175,9 +175,5 @@
<%= render :partial => "comments/comments", :locals => { :commentable => @blob } %>
</div>
-<%= render :partial => "contributions/alternative_formats", :locals => {
- :nir => file_url(@blob),
- :html => formatted_file_url(:id => @blob.id, :format => 'html'),
- :rdf => formatted_file_url(:id => @blob.id, :format => 'rdf'),
- :xml => formatted_file_url(:id => @blob.id, :format => 'xml') } %>
+<%= render :partial => "contributions/alternative_formats" %>
Modified: trunk/app/views/content_types/show.rhtml (2454 => 2455)
--- trunk/app/views/content_types/show.rhtml 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/views/content_types/show.rhtml 2010-07-01 13:02:58 UTC (rev 2455)
@@ -78,9 +78,5 @@
<div class="clearer"> </div>
-<%= render :partial => "contributions/alternative_formats", :locals => {
- :nir => content_type_url(@content_type),
- :html => formatted_content_type_url(:id => @content_type.id, :format => 'html'),
- :rdf => formatted_content_type_url(:id => @content_type.id, :format => 'rdf'),
- :xml => formatted_content_type_url(:id => @content_type.id, :format => 'xml') } %>
+<%= render :partial => "contributions/alternative_formats" %>
Modified: trunk/app/views/contributions/_alternative_formats.rhtml (2454 => 2455)
--- trunk/app/views/contributions/_alternative_formats.rhtml 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/views/contributions/_alternative_formats.rhtml 2010-07-01 13:02:58 UTC (rev 2455)
@@ -2,12 +2,12 @@
<p style="float: right"><a href="" is this?</a></p>
<p style="float: left; font-size: 120%; font-weight: bold">Linked Data</p>
<div style="clear: both"></div>
- <p><b>Non-Information Resource URI:</b> <%= link_to(nir, h(nir)) -%></p>
+ <p><b>Non-Information Resource URI:</b> <%= link_to(@lod_nir, h(@lod_nir)) -%></p>
<br>
<p style="font-size: 110%; font-weight: bold">Alternative Formats</p>
- <div style="width: 33%; float: left; text-align: center"><a href="" html -%>"><img src="" image_path("html_icon.png") -%>" alt="HTML" /></a></div>
- <div style="width: 33%; float: left; text-align: center"><a href="" rdf -%>"><img src="" image_path("rdf_icon.png") -%>" alt="RDF" /></a></div>
- <div style="width: 33%; float: left; text-align: center"><a href="" xml -%>"><img src="" image_path("xml_icon.png") -%>" alt="XML" /></a></div>
+ <div style="width: 33%; float: left; text-align: center"><a href="" @lod_html -%>"><img src="" image_path("html_icon.png") -%>" alt="HTML" /></a></div>
+ <div style="width: 33%; float: left; text-align: center"><a href="" @lod_rdf -%>"><img src="" image_path("rdf_icon.png") -%>" alt="RDF" /></a></div>
+ <div style="width: 33%; float: left; text-align: center"><a href="" @lod_xml -%>"><img src="" image_path("xml_icon.png") -%>" alt="XML" /></a></div>
<div style="clear: both"></div>
</div>
Modified: trunk/app/views/experiments/show.rhtml (2454 => 2455)
--- trunk/app/views/experiments/show.rhtml 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/views/experiments/show.rhtml 2010-07-01 13:02:58 UTC (rev 2455)
@@ -68,9 +68,5 @@
</div>
</div>
-<%= render :partial => "contributions/alternative_formats", :locals => {
- :nir => experiment_url(@experiment),
- :html => formatted_experiment_url(:id => @experiment.id, :format => 'html'),
- :rdf => formatted_experiment_url(:id => @experiment.id, :format => 'rdf'),
- :xml => formatted_experiment_url(:id => @experiment.id, :format => 'xml') } %>
+<%= render :partial => "contributions/alternative_formats" %>
Modified: trunk/app/views/group_announcements/show.rhtml (2454 => 2455)
--- trunk/app/views/group_announcements/show.rhtml 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/views/group_announcements/show.rhtml 2010-07-01 13:02:58 UTC (rev 2455)
@@ -47,9 +47,5 @@
</div>
</div>
-<%= render :partial => "contributions/alternative_formats", :locals => {
- :nir => group_announcement_url(:id => @announcement.id, :group_id => @announcement.network_id),
- :html => formatted_group_announcement_url(:id => @announcement.id, :group_id => @announcement.network_id, :format => 'html'),
- :rdf => formatted_group_announcement_url(:id => @announcement.id, :group_id => @announcement.network_id, :format => 'rdf'),
- :xml => formatted_group_announcement_url(:id => @announcement.id, :group_id => @announcement.network_id, :format => 'xml') } %>
+<%= render :partial => "contributions/alternative_formats" %>
Modified: trunk/app/views/jobs/show.rhtml (2454 => 2455)
--- trunk/app/views/jobs/show.rhtml 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/views/jobs/show.rhtml 2010-07-01 13:02:58 UTC (rev 2455)
@@ -349,9 +349,5 @@
<br/>
-<%= render :partial => "contributions/alternative_formats", :locals => {
- :nir => experiment_job_url(:id => @job.id, :experiment_id => @experiment.id),
- :html => formatted_experiment_job_url(:id => @job.id, :experiment_id => @experiment.id, :format => 'html'),
- :rdf => formatted_experiment_job_url(:id => @job.id, :experiment_id => @experiment.id, :format => 'rdf'),
- :xml => formatted_experiment_job_url(:id => @job.id, :experiment_id => @experiment.id, :format => 'xml') } %>
+<%= render :partial => "contributions/alternative_formats" %>
Modified: trunk/app/views/layouts/_myexperiment.rhtml (2454 => 2455)
--- trunk/app/views/layouts/_myexperiment.rhtml 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/views/layouts/_myexperiment.rhtml 2010-07-01 13:02:58 UTC (rev 2455)
@@ -2,113 +2,120 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
- <%= t :site => "#{Conf.sitename} - #{controller_visible_name(controller.controller_name.humanize)}", :separator => "-" %>
- <link rel="shortcut icon" href="" type="image/x-icon"/>
- <%= stylesheet_link_tag 'reset-fonts-grids' %>
- <%= stylesheet_link_tag 'base-min' %>
- <%= stylesheet_link_tag 'acts_as_taggable_stylesheet' %>
- <%= stylesheet_link_tag 'star_rating' %>
- <%= stylesheet_link_tag Conf.stylesheet %>
- <%= stylesheet_link_tag 'gadgets' %>
-
- <% if controller.action_name.downcase == "timeline" %>
- <script src="" type="text/_javascript_"></script>
- <% end -%>
-
- <%= _javascript__include_tag :defaults %>
- <%= _javascript__include_tag "boxover.js" %>
-
- <%= render :partial => "layouts/feed_link_tags" %>
- </head>
- <body>
- <div id="doc2" class="yui-t4">
- <div id="hd">
- <div id="myexp_header">
- <div class="logo">
- <%= link_to image_tag(Conf.site_logo), "/" %>
- </div>
- <div class="links">
- <div style="text-align: left; float: left; width: 34%; padding-top: 6px;">
- <span><b><%= link_to "About", "http://wiki.myexperiment.org/", :target => '_blank' %></b></span>
- <span> | </span>
- <span><b><%= link_to "Mailing List", "http://lists.nongnu.org/mailman/listinfo/myexperiment-discuss", :target => '_blank' %></b></span>
- <span> | </span>
- <span><b><%= link_to "Publications", "http://wiki.myexperiment.org/index.php/Papers", :target => '_blank' %></b></span>
- </div>
- <div style="text-align: right; float: right; width: 64%;">
- <% if logged_in? -%>
- <span><b><%= signout_link -%></b></span>
- <% else -%>
- <span><b><%= icon "login", new_session_url, nil, nil, "Log in" -%></b></span>
- <span> | </span>
- <span><b><%= icon "user", new_user_url, nil, nil, "Register" -%></b></span>
- <% end %>
- <span> | </span>
- <span><b><%= icon "feedback", "/feedback", nil, nil, "Give us Feedback" -%></b></span>
- <span> | </span>
- <span><b><%= icon "user-invite", invite_users_path, nil, nil, "Invite" -%></b></span>
- </div>
- <div class="clearer"> </div>
- </div>
- <div class="clearer"> </div>
- </div>
- <div>
- <ul class="tabnav">
+ <head>
+ <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
+ <%= t :site => "#{Conf.sitename} - #{controller_visible_name(controller.controller_name.humanize)}", :separator => "-" %>
+<% 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' %>
+ <%= stylesheet_link_tag 'base-min' %>
+ <%= stylesheet_link_tag 'acts_as_taggable_stylesheet' %>
+ <%= stylesheet_link_tag 'star_rating' %>
+ <%= stylesheet_link_tag Conf.stylesheet %>
+ <%= stylesheet_link_tag 'gadgets' %>
+
+ <% if controller.action_name.downcase == "timeline" %>
+ <script src="" type="text/_javascript_"></script>
+ <% end -%>
+
+ <%= _javascript__include_tag :defaults %>
+ <%= _javascript__include_tag "boxover.js" %>
+
+ <%= render :partial => "layouts/feed_link_tags" %>
+
+ <% if @extra_head_content %>
+ <%= @extra_head_content -%>
+ <% end %>
+
+ </head>
+ <body>
+ <div id="doc2" class="yui-t4">
+ <div id="hd">
+ <div id="myexp_header">
+ <div class="logo">
+ <%= link_to image_tag(Conf.site_logo), "/" %>
+ </div>
+ <div class="links">
+ <div style="text-align: left; float: left; width: 34%; padding-top: 6px;">
+ <span><b><%= link_to "About", "http://wiki.myexperiment.org/", :target => '_blank' %></b></span>
+ <span> | </span>
+ <span><b><%= link_to "Mailing List", "http://lists.nongnu.org/mailman/listinfo/myexperiment-discuss", :target => '_blank' %></b></span>
+ <span> | </span>
+ <span><b><%= link_to "Publications", "http://wiki.myexperiment.org/index.php/Papers", :target => '_blank' %></b></span>
+ </div>
+ <div style="text-align: right; float: right; width: 64%;">
+ <% if logged_in? -%>
+ <span><b><%= signout_link -%></b></span>
+ <% else -%>
+ <span><b><%= icon "login", new_session_url, nil, nil, "Log in" -%></b></span>
+ <span> | </span>
+ <span><b><%= icon "user", new_user_url, nil, nil, "Register" -%></b></span>
+ <% end %>
+ <span> | </span>
+ <span><b><%= icon "feedback", "/feedback", nil, nil, "Give us Feedback" -%></b></span>
+ <span> | </span>
+ <span><b><%= icon "user-invite", invite_users_path, nil, nil, "Invite" -%></b></span>
+ </div>
+ <div class="clearer"> </div>
+ </div>
+ <div class="clearer"> </div>
+ </div>
+ <div>
+ <ul class="tabnav">
<% Conf.main_tabs.each do |tab| %>
<li <%= (tab['controller'] && controller.controller_name.match(tab['controller'])) ? 'id="selected_tabnav"' : '' %>>
<%= link_to(tab['label'], tab['link']) -%>
</li>
<% end %>
- </ul>
- </div>
- <div id="myexp_searchbar"><%= render :partial => "layouts/search" %></div>
- </div>
- <div id="bd">
- <div id="yui-main">
- <div class="yui-b">
- <div id="myexp_breadcrumbs_bar">
- <%= render :partial => "layouts/breadcrumbs_bar" %>
- </div>
- <div id="myexp_content">
- <% if flash[:error] %>
- <div id="error_flash" class="box_standout" style="color: red; font-weight: bold; margin-bottom: 1.5em; line-height: 1.4;">
- <%= link_to_function image_tag("close.gif", :style => "float: right;"),
- visual_effect(:toggle_slide, "error_flash", :duration => 0.3) %>
- <%= white_list flash[:error] %>
- </div>
- <% end %>
- <% if flash[:notice] %>
- <div id="notice_flash" class="box_standout" style="color: green; font-weight: bold; margin-bottom: 1.5em; line-height: 1.4;">
- <%= link_to_function image_tag("close.gif", :style => "float: right;"),
- visual_effect(:toggle_slide, "notice_flash", :duration => 0.3) %>
- <%= white_list flash[:notice] %>
- </div>
- <% end %>
-
- <%= render :partial => "subnav" %>
-
- <%= yield :layout %>
- </div>
- </div>
- </div>
- <div id="myexp_sidebar" class="yui-b">
- <%= render :partial => "layouts/sidebar" %>
- </div>
- </div>
- <% cache(:controller => 'global_cache', :action ="" 'footer') do -%>
- <div id="ft">
- <%= render :partial => "layouts/footer" %>
- </div>
- <% end -%>
-
- <%= render :partial => "layouts/debug" if Conf.show_debug %>
- </div>
-
- <%= _javascript__include_tag "tabs.js" %>
- <%= _javascript__include_tag "folds.js" %>
-
- <%= render :partial => "layouts/web_analytics" if Conf.google_web_analytics["enable"] %>
- </body>
+ </ul>
+ </div>
+ <div id="myexp_searchbar"><%= render :partial => "layouts/search" %></div>
+ </div>
+ <div id="bd">
+ <div id="yui-main">
+ <div class="yui-b">
+ <div id="myexp_breadcrumbs_bar">
+ <%= render :partial => "layouts/breadcrumbs_bar" %>
+ </div>
+ <div id="myexp_content">
+ <% if flash[:error] %>
+ <div id="error_flash" class="box_standout" style="color: red; font-weight: bold; margin-bottom: 1.5em; line-height: 1.4;">
+ <%= link_to_function image_tag("close.gif", :style => "float: right;"),
+ visual_effect(:toggle_slide, "error_flash", :duration => 0.3) %>
+ <%= white_list flash[:error] %>
+ </div>
+ <% end %>
+ <% if flash[:notice] %>
+ <div id="notice_flash" class="box_standout" style="color: green; font-weight: bold; margin-bottom: 1.5em; line-height: 1.4;">
+ <%= link_to_function image_tag("close.gif", :style => "float: right;"),
+ visual_effect(:toggle_slide, "notice_flash", :duration => 0.3) %>
+ <%= white_list flash[:notice] %>
+ </div>
+ <% end %>
+
+ <%= render :partial => "subnav" %>
+
+ <%= yield :layout %>
+ </div>
+ </div>
+ </div>
+ <div id="myexp_sidebar" class="yui-b">
+ <%= render :partial => "layouts/sidebar" %>
+ </div>
+ </div>
+ <% cache(:controller => 'global_cache', :action ="" 'footer') do -%>
+ <div id="ft">
+ <%= render :partial => "layouts/footer" %>
+ </div>
+ <% end -%>
+
+ <%= render :partial => "layouts/debug" if Conf.show_debug %>
+ </div>
+
+ <%= _javascript__include_tag "tabs.js" %>
+ <%= _javascript__include_tag "folds.js" %>
+
+ <%= render :partial => "layouts/web_analytics" if Conf.google_web_analytics["enable"] %>
+ </body>
</html>
Modified: trunk/app/views/licenses/show.rhtml (2454 => 2455)
--- trunk/app/views/licenses/show.rhtml 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/views/licenses/show.rhtml 2010-07-01 13:02:58 UTC (rev 2455)
@@ -37,9 +37,5 @@
</div>
</div>
-<%= render :partial => "contributions/alternative_formats", :locals => {
- :nir => license_url(@license),
- :html => formatted_license_url(:id => @license.id, :format => 'html'),
- :rdf => formatted_license_url(:id => @license.id, :format => 'rdf'),
- :xml => formatted_license_url(:id => @license.id, :format => 'xml') } %>
+<%= render :partial => "contributions/alternative_formats" %>
Modified: trunk/app/views/memberships/show.rhtml (2454 => 2455)
--- trunk/app/views/memberships/show.rhtml 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/views/memberships/show.rhtml 2010-07-01 13:02:58 UTC (rev 2455)
@@ -132,9 +132,5 @@
<a name="user_box"></a>
</div>
-<%= render :partial => "contributions/alternative_formats", :locals => {
- :nir => user_membership_url(:id => @membership, :user_id => @membership.user_id),
- :html => formatted_user_membership_url(:id => @membership.id, :user_id => @membership.user_id, :format => 'html'),
- :rdf => formatted_user_membership_url(:id => @membership.id, :user_id => @membership.user_id, :format => 'rdf'),
- :xml => formatted_user_membership_url(:id => @membership.id, :user_id => @membership.user_id, :format => 'xml') } %>
+<%= render :partial => "contributions/alternative_formats" %>
Modified: trunk/app/views/messages/show.rhtml (2454 => 2455)
--- trunk/app/views/messages/show.rhtml 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/views/messages/show.rhtml 2010-07-01 13:02:58 UTC (rev 2455)
@@ -61,9 +61,5 @@
</div>
</div>
-<%= render :partial => "contributions/alternative_formats", :locals => {
- :nir => message_url(@message),
- :html => formatted_message_url(:id => @message.id, :format => 'html'),
- :rdf => formatted_message_url(:id => @message.id, :format => 'rdf'),
- :xml => formatted_message_url(:id => @message.id, :format => 'xml') } %>
+<%= render :partial => "contributions/alternative_formats" %>
Modified: trunk/app/views/networks/show.rhtml (2454 => 2455)
--- trunk/app/views/networks/show.rhtml 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/views/networks/show.rhtml 2010-07-01 13:02:58 UTC (rev 2455)
@@ -253,9 +253,5 @@
<%= render :partial => "comments/comments", :locals => { :commentable => @network } %>
</div>
-<%= render :partial => "contributions/alternative_formats", :locals => {
- :nir => group_url(@network),
- :html => formatted_group_url(:id => @network.id, :format => 'html'),
- :rdf => formatted_group_url(:id => @network.id, :format => 'rdf'),
- :xml => formatted_group_url(:id => @network.id, :format => 'xml') } %>
+<%= render :partial => "contributions/alternative_formats" %>
Modified: trunk/app/views/packs/show.rhtml (2454 => 2455)
--- trunk/app/views/packs/show.rhtml 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/views/packs/show.rhtml 2010-07-01 13:02:58 UTC (rev 2455)
@@ -180,9 +180,5 @@
<%= render :partial => "comments/comments", :locals => { :commentable => @pack } %>
</div>
-<%= render :partial => "contributions/alternative_formats", :locals => {
- :nir => pack_url(@pack),
- :html => formatted_pack_url(:id => @pack.id, :format => 'html'),
- :rdf => formatted_pack_url(:id => @pack.id, :format => 'rdf'),
- :xml => formatted_pack_url(:id => @pack.id, :format => 'xml') } %>
+<%= render :partial => "contributions/alternative_formats" %>
Modified: trunk/app/views/reviews/show.rhtml (2454 => 2455)
--- trunk/app/views/reviews/show.rhtml 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/views/reviews/show.rhtml 2010-07-01 13:02:58 UTC (rev 2455)
@@ -54,9 +54,5 @@
</div>
</div>
-<%= render :partial => "contributions/alternative_formats", :locals => {
- :nir => review_url(:id => @review.id, :workflow_id => @reviewable.id),
- :html => formatted_workflow_review_url(:id => @review.id, :workflow_id => @reviewable.id, :format => 'html'),
- :rdf => formatted_workflow_review_url(:id => @review.id, :workflow_id => @reviewable.id, :format => 'rdf'),
- :xml => formatted_workflow_review_url(:id => @review.id, :workflow_id => @reviewable.id, :format => 'xml') } %>
+<%= render :partial => "contributions/alternative_formats" %>
Modified: trunk/app/views/runners/show.rhtml (2454 => 2455)
--- trunk/app/views/runners/show.rhtml 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/views/runners/show.rhtml 2010-07-01 13:02:58 UTC (rev 2455)
@@ -46,9 +46,5 @@
<% render :partial => "status", :locals => { :service_valid => @runner.service_valid? } -%>
</div>
-<%= render :partial => "contributions/alternative_formats", :locals => {
- :nir => runner_url(@runner),
- :html => formatted_runner_url(:id => @runner.id, :format => 'html'),
- :rdf => formatted_runner_url(:id => @runner.id, :format => 'rdf'),
- :xml => formatted_runner_url(:id => @runner.id, :format => 'xml') } %>
+<%= render :partial => "contributions/alternative_formats" %>
Modified: trunk/app/views/tags/show.rhtml (2454 => 2455)
--- trunk/app/views/tags/show.rhtml 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/views/tags/show.rhtml 2010-07-01 13:02:58 UTC (rev 2455)
@@ -30,11 +30,7 @@
<% end %>
<% end -%>
-<%= render :partial => "contributions/alternative_formats", :locals => {
- :nir => tag_url(@tag),
- :html => formatted_tag_url(:id => @tag.id, :format => 'html'),
- :rdf => formatted_tag_url(:id => @tag.id, :format => 'rdf'),
- :xml => formatted_tag_url(:id => @tag.id, :format => 'xml') } %>
+<%= render :partial => "contributions/alternative_formats" %>
<% if false # legacy... %>
<% if @internal_type -%>
Modified: trunk/app/views/users/show.rhtml (2454 => 2455)
--- trunk/app/views/users/show.rhtml 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/views/users/show.rhtml 2010-07-01 13:02:58 UTC (rev 2455)
@@ -464,11 +464,7 @@
<%= render :partial => "networks/invite", :locals => { :current => current_user, :user => @user } %>
<% end %>
-<%= render :partial => "contributions/alternative_formats", :locals => {
- :nir => user_url(@user),
- :html => formatted_user_url(:id => @user.id, :format => 'html'),
- :rdf => formatted_user_url(:id => @user.id, :format => 'rdf'),
- :xml => formatted_user_url(:id => @user.id, :format => 'xml') } %>
+<%= render :partial => "contributions/alternative_formats" %>
<% unless @tab.blank? -%>
<script>
Modified: trunk/app/views/workflows/show.rhtml (2454 => 2455)
--- trunk/app/views/workflows/show.rhtml 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/app/views/workflows/show.rhtml 2010-07-01 13:02:58 UTC (rev 2455)
@@ -372,11 +372,7 @@
<%= render :partial => "comments/comments", :locals => { :commentable => @workflow } %>
</div>
-<%= render :partial => "contributions/alternative_formats", :locals => {
- :nir => workflow_url(@workflow),
- :html => formatted_workflow_url(:id => @workflow.id, :format => 'html'),
- :rdf => formatted_workflow_url(:id => @workflow.id, :format => 'rdf'),
- :xml => formatted_workflow_url(:id => @workflow.id, :format => 'xml') } %>
+<%= render :partial => "contributions/alternative_formats" %>
<!-- OpenURL context object -->
Modified: trunk/config/routes.rb (2454 => 2455)
--- trunk/config/routes.rb 2010-06-28 11:35:38 UTC (rev 2454)
+++ trunk/config/routes.rb 2010-07-01 13:02:58 UTC (rev 2455)
@@ -118,8 +118,8 @@
end
# workflow redirect for linked data model
- map.connect '/workflows/:id/versions/:version', :controller => 'workflows', :action ="" 'show'
- map.connect '/workflows/:id/versions/:version.:format', :controller => 'workflows', :action ="" 'show'
+ map.workflow_version '/workflows/:id/versions/:version', :conditions => { :method => :get }, :controller => 'workflows', :action ="" 'show'
+ map.formatted_workflow_version '/workflows/:id/versions/:version.:format', :conditions => { :method => :get }, :controller => 'workflows', :action ="" 'show'
# curation
['workflows', 'files', 'packs'].each do |contributable_type|