Diff
Modified: branches/rails2/app/controllers/announcements_controller.rb (2758 => 2759)
--- branches/rails2/app/controllers/announcements_controller.rb 2011-10-24 21:07:27 UTC (rev 2758)
+++ branches/rails2/app/controllers/announcements_controller.rb 2011-10-24 21:08:08 UTC (rev 2759)
@@ -27,9 +27,9 @@
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')
+ @lod_html = announcement_url(:id => @announcement.id, :format => 'html')
+ @lod_rdf = announcement_url(:id => @announcement.id, :format => 'rdf')
+ @lod_xml = announcement_url(:id => @announcement.id, :format => 'xml')
#
# show.rhtml
}
Modified: branches/rails2/app/controllers/blobs_controller.rb (2758 => 2759)
--- branches/rails2/app/controllers/blobs_controller.rb 2011-10-24 21:07:27 UTC (rev 2758)
+++ branches/rails2/app/controllers/blobs_controller.rb 2011-10-24 21:08:08 UTC (rev 2759)
@@ -88,9 +88,9 @@
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')
+ @lod_html = file_url(:id => @blob.id, :format => 'html')
+ @lod_rdf = file_url(:id => @blob.id, :format => 'rdf')
+ @lod_xml = file_url(:id => @blob.id, :format => 'xml')
# show.rhtml
}
Modified: branches/rails2/app/controllers/content_types_controller.rb (2758 => 2759)
--- branches/rails2/app/controllers/content_types_controller.rb 2011-10-24 21:07:27 UTC (rev 2758)
+++ branches/rails2/app/controllers/content_types_controller.rb 2011-10-24 21:08:08 UTC (rev 2759)
@@ -27,9 +27,9 @@
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')
+ @lod_html = content_type_url(:id => @content_type.id, :format => 'html')
+ @lod_rdf = content_type_url(:id => @content_type.id, :format => 'rdf')
+ @lod_xml = content_type_url(:id => @content_type.id, :format => 'xml')
# show.rhtml
}
Modified: branches/rails2/app/controllers/experiments_controller.rb (2758 => 2759)
--- branches/rails2/app/controllers/experiments_controller.rb 2011-10-24 21:07:27 UTC (rev 2758)
+++ branches/rails2/app/controllers/experiments_controller.rb 2011-10-24 21:08:08 UTC (rev 2759)
@@ -21,9 +21,9 @@
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')
+ @lod_html = experiment_url(:id => @experiment.id, :format => 'html')
+ @lod_rdf = experiment_url(:id => @experiment.id, :format => 'rdf')
+ @lod_xml = experiment_url(:id => @experiment.id, :format => 'xml')
# show.rhtml
}
Modified: branches/rails2/app/controllers/group_announcements_controller.rb (2758 => 2759)
--- branches/rails2/app/controllers/group_announcements_controller.rb 2011-10-24 21:07:27 UTC (rev 2758)
+++ branches/rails2/app/controllers/group_announcements_controller.rb 2011-10-24 21:08:08 UTC (rev 2759)
@@ -31,9 +31,9 @@
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')
+ @lod_html = group_announcement_url(:id => @announcement.id, :group_id => @announcement.network_id, :format => 'html')
+ @lod_rdf = group_announcement_url(:id => @announcement.id, :group_id => @announcement.network_id, :format => 'rdf')
+ @lod_xml = group_announcement_url(:id => @announcement.id, :group_id => @announcement.network_id, :format => 'xml')
# show.rhtml
}
Modified: branches/rails2/app/controllers/jobs_controller.rb (2758 => 2759)
--- branches/rails2/app/controllers/jobs_controller.rb 2011-10-24 21:07:27 UTC (rev 2758)
+++ branches/rails2/app/controllers/jobs_controller.rb 2011-10-24 21:08:08 UTC (rev 2759)
@@ -41,9 +41,9 @@
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')
+ @lod_html = experiment_job_url(:id => @job.id, :experiment_id => @experiment.id, :format => 'html')
+ @lod_rdf = experiment_job_url(:id => @job.id, :experiment_id => @experiment.id, :format => 'rdf')
+ @lod_xml = experiment_job_url(:id => @job.id, :experiment_id => @experiment.id, :format => 'xml')
# show.rhtml
}
Modified: branches/rails2/app/controllers/licenses_controller.rb (2758 => 2759)
--- branches/rails2/app/controllers/licenses_controller.rb 2011-10-24 21:07:27 UTC (rev 2758)
+++ branches/rails2/app/controllers/licenses_controller.rb 2011-10-24 21:08:08 UTC (rev 2759)
@@ -16,9 +16,9 @@
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')
+ @lod_html = license_url(:id => @license.id, :format => 'html')
+ @lod_rdf = license_url(:id => @license.id, :format => 'rdf')
+ @lod_xml = license_url(:id => @license.id, :format => 'xml')
# show.rhtml
}
Modified: branches/rails2/app/controllers/memberships_controller.rb (2758 => 2759)
--- branches/rails2/app/controllers/memberships_controller.rb 2011-10-24 21:07:27 UTC (rev 2758)
+++ branches/rails2/app/controllers/memberships_controller.rb 2011-10-24 21:08:08 UTC (rev 2759)
@@ -104,9 +104,9 @@
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')
+ @lod_html = user_membership_url(:id => @membership.id, :user_id => @membership.user_id, :format => 'html')
+ @lod_rdf = user_membership_url(:id => @membership.id, :user_id => @membership.user_id, :format => 'rdf')
+ @lod_xml = user_membership_url(:id => @membership.id, :user_id => @membership.user_id, :format => 'xml')
# show.rhtml
}
Modified: branches/rails2/app/controllers/messages_controller.rb (2758 => 2759)
--- branches/rails2/app/controllers/messages_controller.rb 2011-10-24 21:07:27 UTC (rev 2758)
+++ branches/rails2/app/controllers/messages_controller.rb 2011-10-24 21:08:08 UTC (rev 2759)
@@ -69,9 +69,9 @@
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')
+ @lod_html = message_url(:id => @message.id, :format => 'html')
+ @lod_rdf = message_url(:id => @message.id, :format => 'rdf')
+ @lod_xml = message_url(:id => @message.id, :format => 'xml')
# show.rhtml
}
Modified: branches/rails2/app/controllers/networks_controller.rb (2758 => 2759)
--- branches/rails2/app/controllers/networks_controller.rb 2011-10-24 21:07:27 UTC (rev 2758)
+++ branches/rails2/app/controllers/networks_controller.rb 2011-10-24 21:08:08 UTC (rev 2759)
@@ -335,9 +335,9 @@
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')
+ @lod_html = group_url(:id => @network.id, :format => 'html')
+ @lod_rdf = group_url(:id => @network.id, :format => 'rdf')
+ @lod_xml = group_url(:id => @network.id, :format => 'xml')
# show.rhtml
}
Modified: branches/rails2/app/controllers/packs_controller.rb (2758 => 2759)
--- branches/rails2/app/controllers/packs_controller.rb 2011-10-24 21:07:27 UTC (rev 2758)
+++ branches/rails2/app/controllers/packs_controller.rb 2011-10-24 21:08:08 UTC (rev 2759)
@@ -61,9 +61,9 @@
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')
+ @lod_html = pack_url(:id => @pack.id, :format => 'html')
+ @lod_rdf = pack_url(:id => @pack.id, :format => 'rdf')
+ @lod_xml = pack_url(:id => @pack.id, :format => 'xml')
# show.rhtml
}
Modified: branches/rails2/app/controllers/reviews_controller.rb (2758 => 2759)
--- branches/rails2/app/controllers/reviews_controller.rb 2011-10-24 21:07:27 UTC (rev 2758)
+++ branches/rails2/app/controllers/reviews_controller.rb 2011-10-24 21:08:08 UTC (rev 2759)
@@ -32,9 +32,9 @@
format.html {
@lod_nir = workflow_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')
+ @lod_html = workflow_review_url(:id => @review.id, :workflow_id => @reviewable.id, :format => 'html')
+ @lod_rdf = workflow_review_url(:id => @review.id, :workflow_id => @reviewable.id, :format => 'rdf')
+ @lod_xml = workflow_review_url(:id => @review.id, :workflow_id => @reviewable.id, :format => 'xml')
# show.rhtml
}
Modified: branches/rails2/app/controllers/runners_controller.rb (2758 => 2759)
--- branches/rails2/app/controllers/runners_controller.rb 2011-10-24 21:07:27 UTC (rev 2758)
+++ branches/rails2/app/controllers/runners_controller.rb 2011-10-24 21:08:08 UTC (rev 2759)
@@ -23,9 +23,9 @@
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')
+ @lod_html = runner_url(:id => @runner.id, :format => 'html')
+ @lod_rdf = runner_url(:id => @runner.id, :format => 'rdf')
+ @lod_xml = runner_url(:id => @runner.id, :format => 'xml')
# show.rhtml
}
Modified: branches/rails2/app/controllers/tags_controller.rb (2758 => 2759)
--- branches/rails2/app/controllers/tags_controller.rb 2011-10-24 21:07:27 UTC (rev 2758)
+++ branches/rails2/app/controllers/tags_controller.rb 2011-10-24 21:08:08 UTC (rev 2759)
@@ -20,9 +20,9 @@
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')
+ @lod_html = tag_url(:id => @tag.id, :format => 'html')
+ @lod_rdf = tag_url(:id => @tag.id, :format => 'rdf')
+ @lod_xml = tag_url(:id => @tag.id, :format => 'xml')
# show.rhtml
}
Modified: branches/rails2/app/controllers/users_controller.rb (2758 => 2759)
--- branches/rails2/app/controllers/users_controller.rb 2011-10-24 21:07:27 UTC (rev 2758)
+++ branches/rails2/app/controllers/users_controller.rb 2011-10-24 21:08:08 UTC (rev 2759)
@@ -40,9 +40,9 @@
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')
+ @lod_html = user_url(:id => @user.id, :format => 'html')
+ @lod_rdf = user_url(:id => @user.id, :format => 'rdf')
+ @lod_xml = user_url(:id => @user.id, :format => 'xml')
@user.salt = nil
@user.crypted_password = nil
Modified: branches/rails2/app/controllers/workflows_controller.rb (2758 => 2759)
--- branches/rails2/app/controllers/workflows_controller.rb 2011-10-24 21:07:27 UTC (rev 2758)
+++ branches/rails2/app/controllers/workflows_controller.rb 2011-10-24 21:08:08 UTC (rev 2759)
@@ -245,14 +245,14 @@
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')
+ @lod_html = workflow_version_url(:id => @workflow.id, :version => @viewing_version_number, :format => 'html')
+ @lod_rdf = workflow_version_url(:id => @workflow.id, :version => @viewing_version_number, :format => 'rdf')
+ @lod_xml = 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')
+ @lod_html = workflow_url(:id => @workflow.id, :format => 'html')
+ @lod_rdf = workflow_url(:id => @workflow.id, :format => 'rdf')
+ @lod_xml = workflow_url(:id => @workflow.id, :format => 'xml')
end
# show.rhtml
Modified: branches/rails2/app/views/announcements/index.rhtml (2758 => 2759)
--- branches/rails2/app/views/announcements/index.rhtml 2011-10-24 21:07:27 UTC (rev 2758)
+++ branches/rails2/app/views/announcements/index.rhtml 2011-10-24 21:08:08 UTC (rev 2759)
@@ -1,5 +1,5 @@
<h1>
- <%= feed_icon_tag "Site Announcements", formatted_announcements_path(:rss) %>
+ <%= feed_icon_tag "Site Announcements", announcements_path(:format => :rss) %>
Site Announcements (<%= @announcements.length %>)
</h1>
Modified: branches/rails2/app/views/contributions/_most_tabs.rhtml (2758 => 2759)
--- branches/rails2/app/views/contributions/_most_tabs.rhtml 2011-10-24 21:07:27 UTC (rev 2758)
+++ branches/rails2/app/views/contributions/_most_tabs.rhtml 2011-10-24 21:08:08 UTC (rev 2759)
@@ -4,7 +4,7 @@
<div class="tabContainer">
<div class="tabTitle">
<% if controller.controller_name.downcase == 'workflows' -%>
- <%= feed_icon_tag "Latest Workflows", formatted_workflows_path(:rss), "margin-right: 0.2em;" %>
+ <%= feed_icon_tag "Latest Workflows", workflows_path(:format => :rss), "margin-right: 0.2em;" %>
<% end -%>
Latest
</div>
@@ -50,4 +50,4 @@
<%= render :partial => "contributions/list", :locals => { :collection => most_f, :table => true } %>
</div>
</div>
-<% end %>
\ No newline at end of file
+<% end %>
Modified: branches/rails2/app/views/group_announcements/index.rhtml (2758 => 2759)
--- branches/rails2/app/views/group_announcements/index.rhtml 2011-10-24 21:07:27 UTC (rev 2758)
+++ branches/rails2/app/views/group_announcements/index.rhtml 2011-10-24 21:08:08 UTC (rev 2759)
@@ -5,7 +5,7 @@
<% end %>
<h1>
- <%= feed_icon_tag "Group #{h(@group.title)} Announcements", formatted_group_announcements_path(@group, :rss) %>
+ <%= feed_icon_tag "Group #{h(@group.title)} Announcements", group_announcements_path(@group, :format => :rss) %>
<%= @group.announcements_in_public_mode_for_user(current_user) ? "Public " : "All " -%> Group Announcements (<%= @announcements.length %>)
<br/>
<span style="font-size: 77%;">for group: <%= link_to_function h(@group.title) + expand_image, visual_effect(:toggle_blind, "group_box", :duration => 0.3) -%></span>
Modified: branches/rails2/app/views/home/_announcements.rhtml (2758 => 2759)
--- branches/rails2/app/views/home/_announcements.rhtml 2011-10-24 21:07:27 UTC (rev 2758)
+++ branches/rails2/app/views/home/_announcements.rhtml 2011-10-24 21:08:08 UTC (rev 2759)
@@ -2,7 +2,7 @@
<div class="box">
<b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"></b></b>
<div class="title">
- <%= feed_icon_tag "Site Announcements", formatted_announcements_path(:rss) %>
+ <%= feed_icon_tag "Site Announcements", announcements_path(:format => :rss) %>
Site Announcements
</div>
<div class="content">
@@ -30,4 +30,4 @@
</p>
</div>
<b class="xbottom"><b class="xb5"></b><b class="xb6"></b><b class="xb7"></b><b class="xb1"></b></b>
-</div>
\ No newline at end of file
+</div>
Modified: branches/rails2/app/views/layouts/_feed_link_tags.rhtml (2758 => 2759)
--- branches/rails2/app/views/layouts/_feed_link_tags.rhtml 2011-10-24 21:07:27 UTC (rev 2758)
+++ branches/rails2/app/views/layouts/_feed_link_tags.rhtml 2011-10-24 21:08:08 UTC (rev 2759)
@@ -7,5 +7,5 @@
<% end -%>
<% if controller.controller_name.to_s == "packs" and controller.action_name.to_s == "show" -%>
- <link href="" formatted_items_pack_path(@pack, :rss) -%>" rel="alternate" type="application/rss+xml" title="<%= Conf.sitename %> - Pack items feed" />
+ <link href="" items_pack_path(@pack, :format => :rss) -%>" rel="alternate" type="application/rss+xml" title="<%= Conf.sitename %> - Pack items feed" />
<% end -%>
Modified: branches/rails2/app/views/networks/_announcements.rhtml (2758 => 2759)
--- branches/rails2/app/views/networks/_announcements.rhtml 2011-10-24 21:07:27 UTC (rev 2758)
+++ branches/rails2/app/views/networks/_announcements.rhtml 2011-10-24 21:08:08 UTC (rev 2759)
@@ -6,7 +6,7 @@
<p class="heading" style="margin: 0;">
<span style="position: relative; z-index: 1000; float: left;">
- <%= feed_icon_tag "#{h(group.title)} Group Announcements", formatted_group_announcements_path(group, :rss) -%>
+ <%= feed_icon_tag "#{h(group.title)} Group Announcements", group_announcements_path(group, :format => :rss) -%>
</span>
<a name="group_announcements"></a>
<%= link_to "Announcements", group_announcements_url(group) -%>
Modified: branches/rails2/app/views/packs/show.rhtml (2758 => 2759)
--- branches/rails2/app/views/packs/show.rhtml 2011-10-24 21:07:27 UTC (rev 2758)
+++ branches/rails2/app/views/packs/show.rhtml 2011-10-24 21:08:08 UTC (rev 2759)
@@ -71,7 +71,7 @@
<div class="contribution_version_box" style="background-color: #EEEEEE;">
<div class="contribution_version_inner_box">
<h4>
- <%= feed_icon_tag "RSS feed for items in this pack", formatted_items_pack_path(@pack, :rss), "float: right;" %>
+ <%= feed_icon_tag "RSS feed for items in this pack", items_pack_path(@pack, :format => :rss), "float: right;" %>
<% if @authorised_to_download %>
<%= download_icon_tag "Download all items in the pack as a single .zip archive", download_pack_path(@pack), "float: right; margin-right: 0.5em;" -%>
<% end %>