Refactor common element version view code

diff --git a/app/views/browse/_version_actions.erb b/app/views/browse/_version_actions.erb
new file mode 100644 (file)
index 0000000..46bfd0d
--- /dev/null
+++ b/app/views/browse/_version_actions.erb
@@ -0,0 +1,32 @@
+<div class='secondary-actions'>
+  <%= link_to t("browse.view_details"), :controller => :browse, :action => @type %>
+  <% if !@feature.redacted? %>
+    &middot;
+    <%= link_to t("browse.download_xml"), :controller => "api/old_#{@type.pluralize}", :action => :version %>
+  <% elsif current_user&.moderator? %>
+    &middot;
+    <% if !params[:show_redactions] %>
+      <%= link_to t("browse.view_redacted_data"), :params => { :show_redactions => true } %>
+    <% else %>
+      <%= link_to t("browse.view_redaction_message") %>
+    <% end %>
+  <% end %>
+</div>
+
+<div class='secondary-actions'>
+  <% if @feature.version > 1 %>
+    <%= link_to({ :version => @feature.version - 1 }, { :class => "icon-link" }) do %>
+      <%= previous_page_svg_tag :height => 11 %>
+      <%= "#{t('browse.version')} ##{@feature.version - 1}" %>
+    <% end %>
+    &middot;
+  <% end %>
+  <%= link_to t("browse.view_history"), :controller => :browse, :action => "#{@type}_history" %>
+  <% unless @feature.latest_version? %>
+    &middot;
+    <%= link_to({ :version => @feature.version + 1 }, { :class => "icon-link" }) do %>
+      <%= "#{t('browse.version')} ##{@feature.version + 1}" %>
+      <%= next_page_svg_tag :height => 11 %>
+    <% end %>
+  <% end %>
+</div>

diff --git a/app/views/old_nodes/show.html.erb b/app/views/old_nodes/show.html.erb
index 3cf9828d8bd2ceff02ab194e23544874c9786a93..093a3e7c15c962c45ca5694adbeebf45c71737ba 100644 (file)
--- a/app/views/old_nodes/show.html.erb
+++ b/app/views/old_nodes/show.html.erb
@@ -4,35 +4,4 @@
 
 <%= render :partial => "browse/node", :object => @feature %>
 
-<div class='secondary-actions'>
-  <%= link_to t("browse.view_details"), node_path(@feature.node_id) %>
-  <% if !@feature.redacted? %>
-    &middot;
-    <%= link_to t("browse.download_xml"), node_version_path(*@feature.id) %>
-  <% elsif current_user&.moderator? %>
-    &middot;
-    <% if !params[:show_redactions] %>
-      <%= link_to t("browse.view_redacted_data"), old_node_path(*@feature.id, :params => { :show_redactions => true }) %>
-    <% else %>
-      <%= link_to t("browse.view_redaction_message"), old_node_path(*@feature.id) %>
-    <% end %>
-  <% end %>
-</div>
-
-<div class='secondary-actions'>
-  <% if @feature.version > 1 %>
-    <%= link_to old_node_path(@feature.node_id, @feature.version - 1), :class => "icon-link" do %>
-      <%= previous_page_svg_tag :height => 11 %>
-      <%= "#{t('browse.version')} ##{@feature.version - 1}" %>
-    <% end %>
-    &middot;
-  <% end %>
-  <%= link_to t("browse.view_history"), node_history_path(@feature.node_id) %>
-  <% if @feature.version < @feature.current_node.version %>
-    &middot;
-    <%= link_to old_node_path(@feature.node_id, @feature.version + 1), :class => "icon-link" do %>
-      <%= "#{t('browse.version')} ##{@feature.version + 1}" %>
-      <%= next_page_svg_tag :height => 11 %>
-    <% end %>
-  <% end %>
-</div>
+<%= render :partial => "browse/version_actions" %>

diff --git a/app/views/old_relations/show.html.erb b/app/views/old_relations/show.html.erb
index a0dfae2507b0c37e69c7f901dcc5cfbf7680a12a..94e3674d8759432efae525c54c215141791c2774 100644 (file)
--- a/app/views/old_relations/show.html.erb
+++ b/app/views/old_relations/show.html.erb
@@ -4,35 +4,4 @@
 
 <%= render :partial => "browse/relation", :object => @feature %>
 
-<div class='secondary-actions'>
-  <%= link_to t("browse.view_details"), relation_path(@feature.relation_id) %>
-  <% if !@feature.redacted? %>
-    &middot;
-    <%= link_to t("browse.download_xml"), relation_version_path(*@feature.id) %>
-  <% elsif current_user&.moderator? %>
-    &middot;
-    <% if !params[:show_redactions] %>
-      <%= link_to t("browse.view_redacted_data"), old_relation_path(*@feature.id, :params => { :show_redactions => true }) %>
-    <% else %>
-      <%= link_to t("browse.view_redaction_message"), old_relation_path(*@feature.id) %>
-    <% end %>
-  <% end %>
-</div>
-
-<div class='secondary-actions'>
-  <% if @feature.version > 1 %>
-    <%= link_to old_relation_path(@feature.relation_id, @feature.version - 1), :class => "icon-link" do %>
-      <%= previous_page_svg_tag :height => 11 %>
-      <%= "#{t('browse.version')} ##{@feature.version - 1}" %>
-    <% end %>
-    &middot;
-  <% end %>
-  <%= link_to t("browse.view_history"), relation_history_path(@feature.relation_id) %>
-  <% if @feature.version < @feature.current_relation.version %>
-    &middot;
-    <%= link_to old_relation_path(@feature.relation_id, @feature.version + 1), :class => "icon-link" do %>
-      <%= "#{t('browse.version')} ##{@feature.version + 1}" %>
-      <%= next_page_svg_tag :height => 11 %>
-    <% end %>
-  <% end %>
-</div>
+<%= render :partial => "browse/version_actions" %>

diff --git a/app/views/old_ways/show.html.erb b/app/views/old_ways/show.html.erb
index ecbc6246933c69bd612d076c757f3e8c13e0e815..1e4d14c805ceb079d53d3eeba02d858e445d2ac8 100644 (file)
--- a/app/views/old_ways/show.html.erb
+++ b/app/views/old_ways/show.html.erb
@@ -4,35 +4,4 @@
 
 <%= render :partial => "browse/way", :object => @feature %>
 
-<div class='secondary-actions'>
-  <%= link_to t("browse.view_details"), way_path(@feature.way_id) %>
-  <% if !@feature.redacted? %>
-    &middot;
-    <%= link_to t("browse.download_xml"), way_version_path(*@feature.id) %>
-  <% elsif current_user&.moderator? %>
-    &middot;
-    <% if !params[:show_redactions] %>
-      <%= link_to t("browse.view_redacted_data"), old_way_path(*@feature.id, :params => { :show_redactions => true }) %>
-    <% else %>
-      <%= link_to t("browse.view_redaction_message"), old_way_path(*@feature.id) %>
-    <% end %>
-  <% end %>
-</div>
-
-<div class='secondary-actions'>
-  <% if @feature.version > 1 %>
-    <%= link_to old_way_path(@feature.way_id, @feature.version - 1), :class => "icon-link" do %>
-      <%= previous_page_svg_tag :height => 11 %>
-      <%= "#{t('browse.version')} ##{@feature.version - 1}" %>
-    <% end %>
-    &middot;
-  <% end %>
-  <%= link_to t("browse.view_history"), way_history_path(@feature.way_id) %>
-  <% if @feature.version < @feature.current_way.version %>
-    &middot;
-    <%= link_to old_way_path(@feature.way_id, @feature.version + 1), :class => "icon-link" do %>
-      <%= "#{t('browse.version')} ##{@feature.version + 1}" %>
-      <%= next_page_svg_tag :height => 11 %>
-    <% end %>
-  <% end %>
-</div>
+<%= render :partial => "browse/version_actions" %>