cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2012-07-11 14:31:47 +01:00
parent 2c67c079ac
commit bd12ec7a8b
8 changed files with 22 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/browse/changeset.html.erb
View file

@ -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") %>

2
app/views/browse/node.html.erb
View file

@ -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) %>

4
app/views/browse/node_history.html.erb
View file

@ -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") %>

4
app/views/browse/relation.html.erb
View file

@ -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") %>

4
app/views/browse/relation_history.html.erb
View file

@ -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") %>

6
app/views/browse/way.html.erb
View file

@ -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 -%>

4
app/views/browse/way_history.html.erb
View file

@ -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") %>

22
config/locales/en.yml
View file

@ -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}"