Present links at the bottom of data browser pages in a consistent way

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index aff873e4528ac419e0dae4a768be770769baae8c..2796f7c5f15e01fdcd2752fe5245a3350d0beae8 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -8,5 +8,5 @@
 <% end %>
 <%= render :partial => "changeset_details", :object => @changeset %>
 <hr />
-<%= raw t 'browse.changeset.download', :changeset_xml_link => link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read"), 
-                                       :osmchange_xml_link => link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %>
+<%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %>
+| <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %>

diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb
index df777c9609ccde37745bb40d734fb6f857d8d1a0..8f0a2001b14c189072ea725e05c4d54b0796d9d4 100644 (file)
--- a/app/views/browse/node.html.erb
+++ b/app/views/browse/node.html.erb
@@ -12,7 +12,7 @@
 <% end -%>
 <%= render :partial => "node_details", :object => @node %>
 <hr />
-<%= link_to(t('browse.node.download_xml'), :controller => "old_node", :action => "version", :version => @node.version) %>
+<%= link_to(t('browse.node.download_xml'), :controller => "node", :action => "read") %>
 | <%= link_to(t('browse.node.view_history'), :action => "node_history") %>
 <% if @node.visible -%>
 | <%= link_to(t('browse.node.edit'), :controller => "site", :action => "edit", :lat => @node.lat, :lon => @node.lon, :zoom => 18, :node => @node.id) %>

diff --git a/app/views/browse/node_history.html.erb b/app/views/browse/node_history.html.erb
index 5f70492b4cec932790d0e232fb4765f8067fa60f..937ad7dc083931418ea12392f65c9be3af3fbf83 100644 (file)
--- a/app/views/browse/node_history.html.erb
+++ b/app/views/browse/node_history.html.erb
@@ -10,5 +10,5 @@
   <%= render :partial => "node_details", :object => node %>
   <hr />
 <% end %>
-<%= raw t 'browse.node_history.download', :download_xml_link => link_to(t('browse.node_history.download_xml'), :controller => "old_node", :action => "history"),
-                                          :view_details_link => link_to(t('browse.node_history.view_details'), :action => "node") %>
+<%= link_to(t('browse.node_history.download_xml'), :controller => "old_node", :action => "history") %>
+| <%= link_to(t('browse.node_history.view_details'), :action => "node") %>

diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb
index 2128d18a9ab226189ee3991f064401c0bb5cf1be..28e251ac2e1565aa498827ca2554f488159df3ca 100644 (file)
--- a/app/views/browse/relation.html.erb
+++ b/app/views/browse/relation.html.erb
@@ -10,5 +10,5 @@
 <%= render :partial => "map", :object => @relation %>
 <%= render :partial => "relation_details", :object => @relation %>
 <hr />
-<%= raw t'browse.relation.download', :download_xml_link => link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read"),
-                                     :view_history_link => link_to(t('browse.relation.view_history'), :action => "relation_history") %>
+<%= link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read") %>
+| <%= link_to(t('browse.relation.view_history'), :action => "relation_history") %>

diff --git a/app/views/browse/relation_history.html.erb b/app/views/browse/relation_history.html.erb
index 4080bccb7a4095e716e5b563bc746f318d685450..8fb08e6e9c9c94f7d6d31e615c3d17edc058a3fd 100644 (file)
--- a/app/views/browse/relation_history.html.erb
+++ b/app/views/browse/relation_history.html.erb
@@ -8,5 +8,5 @@
   <%= render :partial => "relation_details", :object => relation %>
   <hr />
 <% end %>
-<%= raw t'browse.relation_history.download', :download_xml_link => link_to(t('browse.relation_history.download_xml'), :controller => "old_relation", :action => "history"), 
-                                             :view_details_link => link_to(t('browse.relation_history.view_details'), :action => "relation") %>
+<%= link_to(t('browse.relation_history.download_xml'), :controller => "old_relation", :action => "history") %>
+| <%= link_to(t('browse.relation_history.view_details'), :action => "relation") %>

diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb
index 41341fef8d4c30d32cb69478e9faaa35981ea45b..167ac6959f02fb14aec6a301e3e40a8c2d62ba5a 100644 (file)
--- a/app/views/browse/way.html.erb
+++ b/app/views/browse/way.html.erb
@@ -12,6 +12,6 @@
 <hr />
 <%= link_to(t('browse.way.download_xml'), :controller => "way", :action => "read") %>
 | <%= link_to(t('browse.way.view_history'), :action => "way_history") %>
-<% unless @midnode.nil? %>
-  | <%= link_to(t('browse.way.edit'), :controller => "site", :action => "edit", :way => @way.id, :lat => @midnode.lat, :lon => @midnode.lon, :zoom => 16) %>
-<% end %>
+<% unless @midnode.nil? -%>
+| <%= link_to(t('browse.way.edit'), :controller => "site", :action => "edit", :way => @way.id, :lat => @midnode.lat, :lon => @midnode.lon, :zoom => 16) %>
+<% end -%>

diff --git a/app/views/browse/way_history.html.erb b/app/views/browse/way_history.html.erb
index 2245017db67f5161391cfee31cc332bd7070ec57..f581dd189611d62bcd7598963e5c411c340b562e 100644 (file)
--- a/app/views/browse/way_history.html.erb
+++ b/app/views/browse/way_history.html.erb
@@ -8,5 +8,5 @@
   <%= render :partial => "way_details", :object => way %>
   <hr />
 <% end %>
-<%= raw t'browse.way_history.download', :download_xml_link => link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history"), 
-                                        :view_details_link => link_to(t('browse.way_history.view_details'), :action => "way") %>
+<%= link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history") %>
+| <%= link_to(t('browse.way_history.view_details'), :action => "way") %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6108b7207b50ff6ef6138802b44760534b94d243..e1f7f416a0114f53c37f27fa6d07a251f4b578ad 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -94,7 +94,6 @@ en:
     changeset:
       title: "Changeset"
       changeset: "Changeset: %{id}"
-      download: "Download %{changeset_xml_link} or %{osmchange_xml_link}"
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
       feed:
@@ -168,15 +167,14 @@ en:
     node_history:
       node_history: "Node History"
       node_history_title: "Node History: %{node_name}"
-      download: "%{download_xml_link} or %{view_details_link}"
       download_xml: "Download XML"
-      view_details: "view details"
+      view_details: "View details"
     node:
       node: "Node"
       node_title: "Node: %{node_name}"
       download_xml: "Download XML"
-      view_history: "view history"
-      edit: "edit"
+      view_history: "View history"
+      edit: "Edit node"
     not_found:
       sorry: "Sorry, the %{type} with the id %{id}, could not be found."
       type:
@@ -207,9 +205,8 @@ en:
     relation_history:
       relation_history: "Relation History"
       relation_history_title: "Relation History: %{relation_name}"
-      download: "%{download_xml_link} or %{view_details_link}"
       download_xml: "Download XML"
-      view_details: "view details"
+      view_details: "View details"
     relation_member:
       entry: "%{type} %{name}"
       entry_role: "%{type} %{name} as %{role}"
@@ -220,9 +217,8 @@ en:
     relation:
       relation: "Relation"
       relation_title: "Relation: %{relation_name}"
-      download: "%{download_xml_link} or %{view_history_link}"
       download_xml: "Download XML"
-      view_history: "view history"
+      view_history: "View history"
     start:
       view_data: "View data for current map view"
       manually_select: "Manually select a different area"
@@ -278,16 +274,14 @@ en:
     way_history:
       way_history: "Way History"
       way_history_title: "Way History: %{way_name}"
-      download: "%{download_xml_link} or %{view_details_link}"
       download_xml: "Download XML"
-      view_details: "view details"
+      view_details: "View details"
     way:
       way: "Way"
       way_title: "Way: %{way_name}"
-      download: "%{download_xml_link}, %{view_history_link} or %{edit_link}"
       download_xml: "Download XML"
-      view_history: "view history"
-      edit: "edit"
+      view_history: "View history"
+      edit: "Edit way"
   changeset:
     changeset_paging_nav:
       showing_page: "Showing page %{page}"