- <% if common_details.visible? %> -

<%= t 'browse.common_details.edited_at' %>

- <% else %> -

<%= t 'browse.common_details.deleted_at' %>

- <% end %> -

<%= l common_details.timestamp %>

- - <% if common_details.changeset.user.data_public? %> -

- <% if common_details.visible? %> -

<%= t 'browse.common_details.edited_by' %>

- <% else %> -

<%= t 'browse.common_details.deleted_by' %>

- <% end %> -

<%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %>

+ <% if common_details.changeset.tags['comment'].present? %> + <%= linkify(h(common_details.changeset.tags['comment'])) %> + <% else %> + <%= t 'browse.no_comment' %> <% end %> +

<%= t 'browse.common_details.version' %>

<%= h(common_details.version) %>

- -

<%= t 'browse.common_details.in_changeset' %>

<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>

+ <%= + t "browse.#{common_details.visible? ? :edited : :deleted}_by_html", + :time => distance_of_time_in_words_to_now(common_details.timestamp), + :user => changeset_user_link(common_details.changeset), + :title => l(common_details.timestamp) + %> +

- <% if common_details.changeset.tags['comment'].present? %> -

<%= t 'browse.common_details.changeset_comment' %>

<%= linkify(h(common_details.changeset.tags['comment'])) %>

- <% end %> +

+ <%= t 'browse.version' %> + #<%= h(common_details.version) %> + · + <%= t 'browse.in_changeset' %> + #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>

-<%= render :partial => "tag_details", :object => common_details %> + +<%= render :partial => "tag_details", :object => common_details.tags %> diff --git a/app/views/browse/_map.html.erb b/app/views/browse/_map.html.erb deleted file mode 100644 index ed703665d..000000000 --- a/app/views/browse/_map.html.erb +++ /dev/null @@ -1,78 +0,0 @@ -

- <% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible? %> - - <% content_for :head do %> - <%= javascript_include_tag "browse" %> - <% end %> - - <% - if map.instance_of? Changeset - bbox = map.bbox.to_unscaled - data = { - :type => "changeset", - :id => map.id, - :minlon => bbox.min_lon, - :minlat => bbox.min_lat, - :maxlon => bbox.max_lon, - :maxlat => bbox.max_lat - } - elsif map.instance_of? Note - data = { - :type => "note", - :id => map.id, - :lon => map.lon, - :lat => map.lat - } - else - data = { - :type => map.class.name.downcase, - :id => map.id, - :version => map.version, - :visible => map.visible - } - end - %> - <%= content_tag "div", "", :id => "small_map", :data => data %> - <%= t 'browse.map.loading' %> - -

- <% if map.instance_of? Note -%> - <%= link_to t("browse.map.larger.area"), - root_path(:notes => "yes"), - :id => "area_larger_map", - :class => "geolink bbox" %> - <% else -%> - <%= link_to t("browse.map.larger.area"), - root_path(:box => "yes"), - :id => "area_larger_map", - :class => "geolink bbox" %> - <% end -%> -
- <%= render :partial => 'layouts/edit_menu', - :locals => { :link_text => t("browse.map.edit.area"), - :link_class => 'bbox' } %> -

- - <% unless map.instance_of? Changeset %> -

- <%= link_to t("browse.map.larger." + map.class.to_s.downcase), - root_path, - :id => "object_larger_map", - :class => "geolink object" %> -
- <%= render :partial => 'layouts/edit_menu', - :locals => { :link_text => t("browse.map.edit." + map.class.to_s.downcase), - :link_class => 'object' } %> -

- <% end %> - - <% else %> - <%= t 'browse.map.deleted' %> - <% end %> -

diff --git a/app/views/browse/_navigation.html.erb b/app/views/browse/_navigation.html.erb deleted file mode 100644 index 0856044c8..000000000 --- a/app/views/browse/_navigation.html.erb +++ /dev/null @@ -1,43 +0,0 @@ -<% type = (@next || @prev).class.name.downcase %> - - <% if @next_by_user or @prev_by_user %> - - <% end %> diff --git a/app/views/browse/_node.html.erb b/app/views/browse/_node.html.erb new file mode 100644 index 000000000..5b29865db --- /dev/null +++ b/app/views/browse/_node.html.erb @@ -0,0 +1,21 @@ +

+ <% if node.redacted? %> + <%= t 'browse.redacted.message_html', + :type => t('browse.redacted.type.node'), + :version => node.version, + :redaction_link => link_to(t('browse.redacted.redaction', + :id => node.redaction.id), node.redaction) %> + <% else %> + <%= render :partial => "common_details", :object => node %> + + <% unless node.ways.empty? and node.containing_relation_members.empty? %> +

<%= t 'browse.part_of' %>

<%= link_to h(printable_name(way)), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %>

+ <% end %> + <% end %> +

diff --git a/app/views/browse/_node_details.html.erb b/app/views/browse/_node_details.html.erb deleted file mode 100644 index 8dec338d6..000000000 --- a/app/views/browse/_node_details.html.erb +++ /dev/null @@ -1,28 +0,0 @@ -

-<% if node_details.redacted? %> -

- <%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.node'), :redaction_link => link_to(t('browse.redacted.redaction', :id => node_details.redaction.id), node_details.redaction), :version => node_details.version %> -

-<% else %> - <%= render :partial => "common_details", :object => node_details %> - - <% if node_details.visible -%> -

<%= t 'browse.node_details.coordinates' %>

<%= link_to(content_tag(:span, number_with_delimiter(node_details.lat), :class => "latitude") + ", " + content_tag(:span, number_with_delimiter(node_details.lon), :class => "longitude"), {:controller => 'site', :action => 'index', :lat => h(node_details.lat), :lon => h(node_details.lon), :zoom => "18"}) %>

- <% end -%> - - <% unless node_details.ways.empty? and node_details.containing_relation_members.empty? %> -

<%= t 'browse.node_details.part_of' %>

<%= link_to h(printable_name(way)), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %>

- <% end %> -<% end %> -

diff --git a/app/views/browse/_paging_nav.html.erb b/app/views/browse/_paging_nav.html.erb index f236b4465..67f1c75a3 100644 --- a/app/views/browse/_paging_nav.html.erb +++ b/app/views/browse/_paging_nav.html.erb @@ -1,14 +1,5 @@ -

-<% current_page = pages.current_page %> - -<%= t'browse.paging_nav.showing_page' %> -<%= current_page.number %> (<%= current_page.first_item %><% -if (current_page.first_item < current_page.last_item) # if more than 1 trace on page - %>-<%= current_page.last_item %><% -end %> -<%= t'browse.paging_nav.of'%> <%= pages.item_count %>) - <% if pages.page_count > 1 %> -| <%= raw pagination_links_each(pages, {}) { |n| link_to_page(n, page_param) } %> + + <%= raw pagination_links_each(pages, {}) { |n| link_to(n, page_param => n) } %> + <% end %> -

\ No newline at end of file diff --git a/app/views/browse/_relation.html.erb b/app/views/browse/_relation.html.erb new file mode 100644 index 000000000..e8f9a4f51 --- /dev/null +++ b/app/views/browse/_relation.html.erb @@ -0,0 +1,21 @@ +

+ <% if relation.redacted? %> + <%= t 'browse.redacted.message_html', + :type => t('browse.redacted.type.relation'), + :version => relation.version, + :redaction_link => link_to(t('browse.redacted.redaction', + :id => relation.redaction.id), relation.redaction) %>< + <% else %> + <%= render :partial => "common_details", :object => relation %> + + <% unless relation.relation_members.empty? %> +

<%= t'browse.relation.members' %>

<%= render :partial => "relation_member", :collection => relation.relation_members %> + <% end %> + + <% unless relation.containing_relation_members.empty? %> +

<%= t'browse.part_of' %>

<%= render :partial => "containing_relation", :collection => relation.containing_relation_members %> + <% end %> + <% end %> +

diff --git a/app/views/browse/_relation_details.html.erb b/app/views/browse/_relation_details.html.erb deleted file mode 100644 index 1c0f4c93c..000000000 --- a/app/views/browse/_relation_details.html.erb +++ /dev/null @@ -1,23 +0,0 @@ -

-<% if relation_details.redacted? %> -

- <%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.relation'), :redaction_link => link_to(t('browse.redacted.redaction', :id => relation_details.redaction.id), relation_details.redaction), :version => relation_details.version %>< -

-<% else %> - <%= render :partial => "common_details", :object => relation_details %> - - <% unless relation_details.relation_members.empty? %> -

<%= t'browse.relation_details.members' %>

<%= render :partial => "relation_member", :collection => relation_details.relation_members %> -

- <% end %> - - <% unless relation_details.containing_relation_members.empty? %> -

<%= t'browse.relation_details.part_of' %>

<%= render :partial => "containing_relation", :collection => relation_details.containing_relation_members %> -

- <% end %> -<% end %> -

diff --git a/app/views/browse/_tag.html.erb b/app/views/browse/_tag.html.erb index 298331832..b9296fa48 100644 --- a/app/views/browse/_tag.html.erb +++ b/app/views/browse/_tag.html.erb @@ -1 +1,4 @@ -

<%= format_key(tag[0]) %> = <%= format_value(tag[0], tag[1]) %>

\ No newline at end of file +

+ <%= format_key(tag[0]) %> + <%= format_value(tag[0], tag[1]) %> +

diff --git a/app/views/browse/_tag_details.html.erb b/app/views/browse/_tag_details.html.erb index 9d0a2af54..090a23e7c 100644 --- a/app/views/browse/_tag_details.html.erb +++ b/app/views/browse/_tag_details.html.erb @@ -1,6 +1,6 @@ -<% unless tag_details.tags.empty? %> -

<%= t'browse.tag_details.tags' %>

<%= render :partial => "tag", :collection => tag_details.tags.sort %> -

-<% end %> \ No newline at end of file +<% unless tag_details.empty? %> +

<%= t 'browse.tag_details.tags' %>

+ +<% end %> diff --git a/app/views/browse/_way.html.erb b/app/views/browse/_way.html.erb new file mode 100644 index 000000000..9156d2399 --- /dev/null +++ b/app/views/browse/_way.html.erb @@ -0,0 +1,33 @@ +

+ <% if way.redacted? %> + <%= t 'browse.redacted.message_html', + :type => t('browse.redacted.type.way'), + :version => way.version, + :redaction_link => link_to(t('browse.redacted.redaction', + :id => way.redaction.id), way.redaction) %> + <% else %> + <%= render :partial => "common_details", :object => way %> + + <% unless way.way_nodes.empty? %> +

<%= t'browse.way.nodes' %>

+ <%= link_to h(printable_name(wn.node)), { :action => "node", :id => wn.node_id.to_s }, :class => link_class('node', wn.node), :title => link_title(wn.node) %> + <% related_ways = wn.node.ways.reject { |w| w.id == wn.way_id } %> + <% if related_ways.size > 0 then %> + (<%= raw t 'browse.way.also_part_of', :count => related_ways.size, :related_ways => related_ways.map { |w| link_to(h(printable_name(w)), { :action => "way", :id => w.id.to_s }, :class => link_class('way', w), :title => link_title(w) ) }.to_sentence %>) + <% end %> +

+ <% end %> + + <% unless way.containing_relation_members.empty? %> +

<%= t'browse.part_of' %>

+ <%= render :partial => "containing_relation", :collection => way.containing_relation_members %> + + <% end %> + <% end %> +

diff --git a/app/views/browse/_way_details.html.erb b/app/views/browse/_way_details.html.erb deleted file mode 100644 index 6bff887b3..000000000 --- a/app/views/browse/_way_details.html.erb +++ /dev/null @@ -1,34 +0,0 @@ -

-<% if way_details.redacted? %> -

- <%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.way'), :redaction_link => link_to(t('browse.redacted.redaction', :id => way_details.redaction.id), way_details.redaction), :version => way_details.version %> -

-<% else %> - <%= render :partial => "common_details", :object => way_details %> - - <% unless way_details.way_nodes.empty? %> -

<%= t'browse.way_details.nodes' %>

- <%= link_to h(printable_name(wn.node)), { :action => "node", :id => wn.node_id.to_s }, :class => link_class('node', wn.node), :title => link_title(wn.node) %> - <% related_ways = wn.node.ways.reject { |w| w.id == wn.way_id } %> - <% if related_ways.size > 0 then %> - (<%= raw t 'browse.way_details.also_part_of', :count => related_ways.size, :related_ways => related_ways.map { |w| link_to(h(printable_name(w)), { :action => "way", :id => w.id.to_s }, :class => link_class('way', w), :title => link_title(w) ) }.to_sentence %>) - <% end %> -

- <% end %> - - <% unless way_details.containing_relation_members.empty? %> -

<%= t'browse.way_details.part_of' %>

- <%= render :partial => "containing_relation", :collection => way_details.containing_relation_members %> - - <% end %> -<% end %> -

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index 96a5280a5..aa333cfff 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -1,18 +1,55 @@ -<% content_for :head do %> -<%= stylesheet_link_tag 'browse' %> -<% end %> +<% set_title(t('browse.changeset.title', :id => @changeset.id)) %> -<% content_for :heading do %> -

<%= t 'browse.changeset.changeset', :id => @changeset.id %>

<%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %>
<%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %>

-<% end %> +

+ + <%= t('browse.changeset.title', :id => @changeset.id) %> +

-<%= render :partial => "navigation" %> +

<%= @changeset.tags['comment'].to_s.presence || t('browse.no_comment') %>

<%= changeset_details(@changeset) %>

-<% if @changeset.has_valid_bbox? %> -<%= render :partial => "map", :object => @changeset %> -<% end %> -<%= render :partial => "changeset_details", :object => @changeset %> \ No newline at end of file + <%= render :partial => "tag_details", :object => @changeset.tags.except('comment') %> + + <% unless @ways.empty? %> +

+ <%= type_and_paginated_count('way', @way_pages) %> + <%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %> +

<%= link_to h(printable_name(way, true)), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %>

+ <% end %> + + <% unless @relations.empty? %> +

+ <%= type_and_paginated_count('relation', @relation_pages) %> + <%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %> +

<%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %>

+ <% end %> + + <% unless @nodes.empty? %> +

+ <%= type_and_paginated_count('node', @node_pages) %> + <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %> +

<%= link_to h(printable_name(node, true)), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %>

+ <% end %> +

+ +

+ <%= 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/feature.html.erb b/app/views/browse/feature.html.erb new file mode 100644 index 000000000..1e0f118d8 --- /dev/null +++ b/app/views/browse/feature.html.erb @@ -0,0 +1,14 @@ +<% set_title(t("browse.#{@type}.title", :name => printable_name(@feature))) %> + +

+ + <%= t("browse.#{@type}.title", :name => printable_name(@feature)) %> +

+ +<%= render :partial => @type, :object => @feature %> + +

+ <%= link_to(t('browse.download_xml'), :controller => @type, :action => "read") %> + · + <%= link_to(t('browse.view_history'), :action => "#{@type}_history") %> +

diff --git a/app/views/browse/history.html.erb b/app/views/browse/history.html.erb new file mode 100644 index 000000000..fa483bfb0 --- /dev/null +++ b/app/views/browse/history.html.erb @@ -0,0 +1,14 @@ +<% set_title(t("browse.#{@type}.history_title", :name => printable_name(@feature))) %> + +

+ + <%= t("browse.#{@type}.history_title", :name => printable_name(@feature)) %> +

+ +<%= render :partial => @type, :collection => @feature.send("old_#{@type}s").reverse %> + +

+ <%= link_to(t('browse.download_xml'), :controller => "old_#{@type}", :action => "history") %> + · + <%= link_to(t('browse.view_details'), :action => @type) %> +

diff --git a/app/views/browse/new_note.html.erb b/app/views/browse/new_note.html.erb new file mode 100644 index 000000000..49922494e --- /dev/null +++ b/app/views/browse/new_note.html.erb @@ -0,0 +1,18 @@ +<% set_title(t "browse.note.new_note") %> + +

+ + <%= t "browse.note.new_note" %> +

+ +

<%= t('javascripts.notes.new.intro') %>

+ +

diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb deleted file mode 100644 index f41562a7f..000000000 --- a/app/views/browse/node.html.erb +++ /dev/null @@ -1,27 +0,0 @@ -<% -@name = printable_name @node -@title = t('browse.node.node') + ' | ' + @name -%> -<% content_for :head do %> -<%= stylesheet_link_tag 'browse' %> -<% end %> - -<% content_for :heading do %> -

<%= t'browse.node.node_title', :node_name => @name %>

<%= link_to(t('browse.node.download_xml'), :controller => "node", :action => "read") %>
<%= link_to(t('browse.node.view_history'), :action => "node_history") %>
<%= link_to(t('browse.node.edit'), :controller => "site", :action => "edit", :lat => @node.lat, :lon => @node.lon, :zoom => 18, :node => @node.id) %>

-<% end %> -<%= render :partial => "navigation" %> - -<% if @node.visible -%> -<%= render :partial => "map", :object => @node %> -<% end -%> - -

- <%= render :partial => "node_details", :object => @node %> -

\ No newline at end of file diff --git a/app/views/browse/node_history.html.erb b/app/views/browse/node_history.html.erb deleted file mode 100644 index e37f0e037..000000000 --- a/app/views/browse/node_history.html.erb +++ /dev/null @@ -1,25 +0,0 @@ -<% -@name = printable_name @node -@title = t('browse.node_history.node_history') + ' | ' + @name -%> -<% content_for :head do %> -<%= stylesheet_link_tag 'browse' %> -<% end %> - -<% content_for :heading do %> -

<%= raw t'browse.node_history.node_history_title', :node_name => link_to(h(@name), :action => "node", :id => @node.id) %>

<%= link_to(t('browse.node_history.download_xml'), :controller => "old_node", :action => "history") %>
<%= link_to(t('browse.node_history.view_details'), :action => "node") %>

-<% end %> - -<% if @node.visible -%> - <%= render :partial => "map", :object => @node %> -<% end -%> - -

- <% @node.old_nodes.reverse.each do |node| %> - <%= render :partial => "node_details", :object => node %> - <% end %> -

diff --git a/app/views/browse/not_found.html.erb b/app/views/browse/not_found.html.erb index f536ef9ff..a8974b474 100644 --- a/app/views/browse/not_found.html.erb +++ b/app/views/browse/not_found.html.erb @@ -6,4 +6,7 @@ 'changeset' => I18n.t('browse.not_found.type.changeset'), }; %> -

<%= t'browse.not_found.sorry', :type=> browse_not_found_type[@type] , :id => params[:id] %>

+ +

+ + <%= t'browse.not_found.sorry', :type=> browse_not_found_type[@type] , :id => params[:id] %>

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb index 31fd00f01..90d34b574 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -1,67 +1,57 @@ -<% content_for :head do %> -<%= stylesheet_link_tag 'browse' %> -<% end %> +<% set_title("#{t('browse.note.title')} | #{@note.id}") %> -<% content_for :heading do %> -

- <%= image_tag "#{@note.status}_note_marker.png", :alt => @note.status %> - <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %> -

-<% end %> +

+ + <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %> +

-<%= render :partial => "navigation" %> - -<%= render :partial => "map", :object => @note %> - -

- - <% if @note.comments.find { |comment| comment.author.nil? } -%> -

<%= t "javascripts.notes.show.anonymous_warning" %>

<%= t('browse.note.mine.description') %>

+ <%= h(@note.comments.first.body.to_html) %>

- <% end -%> - -

<%= t "browse.note.opened" %>

<%= note_event(@note.created_at, @note.author) %>

+ <%= note_event('open', @note.created_at, @note.author) %> <% if @note.status == "closed" %> -

<%= t "browse.note.closed" %>

<%= note_event(@note.closed_at, @note.comments.last.author) %>

- <% elsif @note.comments.length > 1 %> -

<%= t "browse.note.last_modified" %>

<%= note_event(@note.updated_at, @note.comments.last.author) %>

+
+ <%= note_event(@note.status, @note.closed_at, @note.comments.last.author) %> <% end %> - -

<%= t "browse.note.description" %>

<%= h(@note.comments.first.body.to_html) %>

- -

<%= t "browse.node_details.coordinates" %>

<%= link_to ("#{number_with_delimiter(@note.lat)}, #{number_with_delimiter(@note.lon)}".html_safe), {:controller => 'site', :action => 'index', :lat => h(@note.lat), :lon => h(@note.lon), :zoom => "18"} %>

+ <% if @note.comments.find { |comment| comment.author.nil? } -%> +

<%= t "javascripts.notes.show.anonymous_warning" %>

+ <% end -%> + <% if @note.comments.length > 1 %> -

<%= t "browse.note.comments" %>

+ <%= note_event(comment.event, comment.created_at, comment.author) %> <%= comment.body.to_html %> - <%= note_event(comment.created_at, comment.author) %>

<% end %> + <% if @note.status == "open" %> + + <% else %> + + <% end %>

diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb deleted file mode 100644 index 3ba355054..000000000 --- a/app/views/browse/relation.html.erb +++ /dev/null @@ -1,21 +0,0 @@ -<% -@name = printable_name @relation -@title = t('browse.relation.relation') + ' | ' + @name -%> -<% content_for :head do %> -<%= stylesheet_link_tag 'browse' %> -<% end %> - -<% content_for :heading do %> -

<%= t'browse.relation.relation_title', :relation_name => @name %>

<%= link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read") %>
<%= link_to(t('browse.relation.view_history'), :action => "relation_history") %>

-<% end %> -<%= render :partial => "navigation" %> -<%= render :partial => "map", :object => @relation %> - -

- <%= render :partial => "relation_details", :object => @relation %> -

\ No newline at end of file diff --git a/app/views/browse/relation_history.html.erb b/app/views/browse/relation_history.html.erb deleted file mode 100644 index e0640d900..000000000 --- a/app/views/browse/relation_history.html.erb +++ /dev/null @@ -1,22 +0,0 @@ -<% -@name = printable_name @relation -@title = t('browse.relation_history.relation_history') + ' | ' + @name -%> -<% content_for :head do %> -<%= stylesheet_link_tag 'browse' %> -<% end %> - -<% content_for :heading do %> -

<%= raw t'browse.relation_history.relation_history_title', :relation_name => link_to(h(@name), :action => "relation", :id => @relation.id) %>

<%= link_to(t('browse.relation_history.download_xml'), :controller => "old_relation", :action => "history") %>
<%= link_to(t('browse.relation_history.view_details'), :action => "relation") %>

-<% end %> - -<%= render :partial => "map", :object => @relation %> -

-<% @relation.old_relations.reverse.each do |relation| %> - <%= render :partial => "relation_details", :object => relation %> -<% end %> -

\ No newline at end of file diff --git a/app/views/browse/start.html.erb b/app/views/browse/start.html.erb deleted file mode 100644 index 12012a029..000000000 --- a/app/views/browse/start.html.erb +++ /dev/null @@ -1,6 +0,0 @@ -

- <%= t'browse.start_rjs.manually_select' %> - <%= t'browse.start_rjs.hide_areas' %> -

diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb deleted file mode 100644 index 15a0dcad8..000000000 --- a/app/views/browse/way.html.erb +++ /dev/null @@ -1,23 +0,0 @@ -<% -@name = printable_name @way -@title = t('browse.way.way') + ' | ' + @name -%> -<% content_for :head do %> -<%= stylesheet_link_tag 'browse' %> -<% end %> - -<% content_for :heading do %> -

<%= t'browse.way.way_title', :way_name => @name %>

<%= link_to(t('browse.way.download_xml'), :controller => "way", :action => "read") %>
<%= link_to(t('browse.way.view_history'), :action => "way_history") %>
<%= link_to(t('browse.way.edit'), :controller => "site", :action => "edit", :way => @way.id) %>

-<% end %> - -<%= render :partial => "navigation" %> -<%= render :partial => "map", :object => @way %> - -

- <%= render :partial => "way_details", :object => @way %> -

\ No newline at end of file diff --git a/app/views/browse/way_history.html.erb b/app/views/browse/way_history.html.erb deleted file mode 100644 index 49058edc1..000000000 --- a/app/views/browse/way_history.html.erb +++ /dev/null @@ -1,22 +0,0 @@ -<% -@name = printable_name @way -@title = t('browse.way_history.way_history') + ' | ' + @name -%> -<% content_for :head do %> -<%= stylesheet_link_tag 'browse' %> -<% end %> - -<% content_for :heading do %> -

<%= raw t'browse.way_history.way_history_title', :way_name => link_to(h(@name), :action => "way", :id => @way.id) %>

<%= link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history") %>
<%= link_to(t('browse.way_history.view_details'), :action => "way") %>

-<% end %> - -<%= render :partial => "map", :object => @way %> -

-<% @way.old_ways.reverse.each do |way| %> - <%= render :partial => "way_details", :object => way %> -<% end %> -

\ No newline at end of file diff --git a/app/views/changeset/_changeset.html.erb b/app/views/changeset/_changeset.html.erb index 3e4871ec0..5c5ad670b 100644 --- a/app/views/changeset/_changeset.html.erb +++ b/app/views/changeset/_changeset.html.erb @@ -12,39 +12,19 @@ end %> -<%= content_tag "ul", :class => 'changeset_item', :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %> -

- - - <%= - link_to(changeset.id, - {:controller => 'browse', :action => 'changeset', :id => changeset.id}, - {:title => t('changeset.changeset.view_changeset_details')}) - %> - - - - <% if changeset.closed_at > DateTime.now %> <%= t'changeset.changeset.still_editing' %> - <% else %><%= l changeset.closed_at, :format => :long %><% end %> - - - <%if showusername %> - - <% if changeset.user.data_public? %> - <%= link_to h(changeset.user.display_name), :controller => "changeset", :action => "list", :display_name => changeset.user.display_name %> - <% else %> - <%= t'changeset.changeset.anonymous' %> - <% end %> - - <% end %> -

- -

- <% if changeset.tags['comment'].to_s != '' %> - <%= linkify(h(changeset.tags['comment'])) %> - <% else %> - <%= t'changeset.changeset.no_comment' %> - <% end %> -

- +<%= content_tag "li", :id => "changeset_#{changeset.id}", :data => {:changeset => changeset_data} do %> +

+ + <% if changeset.tags['comment'].to_s != '' %> + <%= linkify(h(changeset.tags['comment'])) %> + <% else %> + <%= t 'browse.no_comment' %> + <% end %> + +

+ <%= changeset_details(changeset) %> + · + #<%= changeset.id %> +

<% end %> diff --git a/app/views/changeset/_changeset_paging_nav.html.erb b/app/views/changeset/_changeset_paging_nav.html.erb deleted file mode 100644 index 46b4635c8..000000000 --- a/app/views/changeset/_changeset_paging_nav.html.erb +++ /dev/null @@ -1,15 +0,0 @@ - \ No newline at end of file diff --git a/app/views/changeset/_changesets.html.erb b/app/views/changeset/_changesets.html.erb deleted file mode 100644 index fe8da2b38..000000000 --- a/app/views/changeset/_changesets.html.erb +++ /dev/null @@ -1,4 +0,0 @@ -<% showusername = true if showusername.nil? %> -

- <%= render :partial => 'changeset', :locals => {:showusername => showusername}, :collection => @edits unless @edits.nil? %> -

diff --git a/app/views/changeset/_map.html.erb b/app/views/changeset/_map.html.erb deleted file mode 100644 index 9730059ee..000000000 --- a/app/views/changeset/_map.html.erb +++ /dev/null @@ -1,2 +0,0 @@ -

diff --git a/app/views/changeset/_user.html.erb b/app/views/changeset/_user.html.erb deleted file mode 100644 index 0e9507650..000000000 --- a/app/views/changeset/_user.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%= link_to user.display_name, :controller => "user", :action => "view", :display_name => user.display_name %> diff --git a/app/views/changeset/history.html.erb b/app/views/changeset/history.html.erb new file mode 100644 index 000000000..23fee589c --- /dev/null +++ b/app/views/changeset/history.html.erb @@ -0,0 +1,30 @@ +<% content_for :head do -%> + <% unless params[:friends] or params[:nearby] -%> + <%= auto_discovery_link_tag :atom, params.merge({ :page => nil, :action => :feed }) %> + <% end -%> +<% end -%> + +<% + if params[:friends] and @user + set_title(t 'changeset.list.title_friend') + @heading = t 'changeset.list.title_friend' + elsif params[:nearby] and @user + set_title(t 'changeset.list.title_nearby') + @heading = t 'changeset.list.title_nearby' + elsif params[:display_name] + set_title(t 'changeset.list.title_user', :user => params[:display_name]) + @heading = t('changeset.list.title_user', :user => link_to(params[:display_name], :controller => "user", :action => "view", :display_name => params[:display_name])).html_safe + else + set_title(t 'changeset.list.title') + @heading = t 'changeset.list.title' + end +%> + +

+ + <%= @heading %> +

+ +

+ <%= image_tag "searching.gif", :class => "loader" %> +

diff --git a/app/views/changeset/list.atom.builder b/app/views/changeset/list.atom.builder index 591f269b6..619dc4a08 100644 --- a/app/views/changeset/list.atom.builder +++ b/app/views/changeset/list.atom.builder @@ -4,12 +4,6 @@ atom_feed(:language => I18n.locale, :schema_date => 2009, "xmlns:georss" => "http://www.georss.org/georss") do |feed| feed.title @title - feed.subtitle :type => 'xhtml' do |xhtml| - xhtml.p do |p| - p << @description - end - end - feed.updated @edits.map {|e| [e.created_at, e.closed_at].max }.max feed.icon "http://#{SERVER_URL}/favicon.ico" feed.logo "http://#{SERVER_URL}/images/mag_map-rss2.0.png" @@ -46,16 +40,16 @@ atom_feed(:language => I18n.locale, :schema_date => 2009, xhtml.style "th { text-align: left } tr { vertical-align: top }" xhtml.table do |table| table.tr do |tr| - tr.th t("browse.changeset_details.created_at") + tr.th t("browse.created") tr.td l(changeset.created_at) end table.tr do |tr| - tr.th t("browse.changeset_details.closed_at") + tr.th t("browse.closed") tr.td l(changeset.closed_at) end if changeset.user.data_public? table.tr do |tr| - tr.th t("browse.changeset_details.belongs_to") + tr.th t("browse.changeset.belongs_to") tr.td do |td| td.a h(changeset.user.display_name), :href => url_for(:controller => "user", :action => "view", :display_name => changeset.user.display_name, :only_path => false) end diff --git a/app/views/changeset/list.html.erb b/app/views/changeset/list.html.erb index ee8610574..b0ccf67dc 100644 --- a/app/views/changeset/list.html.erb +++ b/app/views/changeset/list.html.erb @@ -1,37 +1,13 @@ -<% content_for :head do -%> - <%= javascript_include_tag "changeset" %> -<% end -%> - -<% content_for :heading do %> - -

<%= @heading %>

<%= raw(@description) %>
<%= atom_link_to params.merge({ :page => nil, :action => :feed }) %>

- -<% end %> - -<%= render :partial => 'changeset_paging_nav' %> - -<% if @edits.size > 0 %> -

- <%= render :partial => 'map' %> -

- <%= render :partial => 'changesets', :locals => { :showusername => !params.has_key?(:display_name) } %> +<% if @edits.present? %> +

+ <%= render :partial => 'changeset', :collection => @edits %> + +

+ <%= link_to t('changeset.list.load_more'), url_for(params.merge(:max_id => @edits.last.id - 1)), :class => "button load_more" %> + <%= image_tag "searching.gif", :class => "loader", :style => "display: none;" %>

- <%= render :partial => 'changeset_paging_nav' %> -<% elsif @user and @user.display_name == params[:display_name] %> -

<%= t('changeset.list.empty_user_html') %>

+<% elsif params[:max_id] %> +

<%= t('changeset.list.no_more') %>

<% else %> -

<%= t('changeset.list.empty_anon_html') %>

<%= t('changeset.list.empty') %>

<% end %> - -<% unless params[:friends] or params[:nearby] -%> - <% content_for :head do -%> - <%= auto_discovery_link_tag :atom, params.merge({ :page => nil, :action => :feed }) %> - <% end -%> -<% end -%> \ No newline at end of file diff --git a/app/views/diary_entry/comments.html.erb b/app/views/diary_entry/comments.html.erb index fd90b7501..9dc800cff 100644 --- a/app/views/diary_entry/comments.html.erb +++ b/app/views/diary_entry/comments.html.erb @@ -18,7 +18,7 @@ <% end -%> -

<%= link_to t('diary_entry.comments.older_comments') , { :page => @comment_pages.current.next} if @comment_pages.current.next %>
<%= link_to t('diary_entry.comments.newer_comments'), { :page => @comment_pages.current.previous } if @comment_pages.current.previous %>

+ <%= link_to t('diary_entry.comments.older_comments') , { :page => @comment_pages.current.next} if @comment_pages.current.next %> + <%= link_to t('diary_entry.comments.newer_comments'), { :page => @comment_pages.current.previous } if @comment_pages.current.previous %> +

diff --git a/app/views/diary_entry/list.html.erb b/app/views/diary_entry/list.html.erb index 2939ec7e6..0767bd402 100644 --- a/app/views/diary_entry/list.html.erb +++ b/app/views/diary_entry/list.html.erb @@ -3,7 +3,7 @@ <% if @this_user %> <%= user_image @this_user %> <% end %> -

<%= h(@title) %>

- <%= text_field_tag('maxlat', nil, :size => 10, :class => "export_bound") %> -
- <%= text_field_tag('minlon', nil, :size => 10, :class => "export_bound") %> - <%= text_field_tag('maxlon', nil, :size => 10, :class => "export_bound") %> -
- <%= text_field_tag('minlat', nil, :size => 10, :class => "export_bound") %> -

- <%= t'export.start.manually_select' %> -

<%= t'export.start.licence' %>

- -

<%= raw t'export.start.export_details' %>

- -

<%= t'export.start.too_large.heading' %>

- -

<%= t'export.start.too_large.body' %>

<%= t'export.start.too_large.planet.title' %>: <%= t'export.start.too_large.planet.description' %>
<%= t'export.start.too_large.geofabrik.title' %>: <%= t'export.start.too_large.geofabrik.description' %>
<%= t'export.start.too_large.metro.title' %>: <%= t'export.start.too_large.metro.description' %>
<%= t'export.start.too_large.other.title' %>: <%= t'export.start.too_large.other.description' %>

- <%= submit_tag t('export.start.export_button'), :id => "export_commit" %> -

<%= t 'geocoder.results.no_results' %>

<%= result_to_html(result) %>

<%= result_to_html(result) %>

<% if @more_params %>

- <%= link_to t('geocoder.results.more_results'), url_for(@more_params), :class => "button" %> -

- <%= image_tag "searching.gif", :class => ["search_searching", "hidden"] %> + <%= link_to t('geocoder.results.more_results'), url_for(@more_params), :class => "button load_more" %> + <%= image_tag "searching.gif", :class => "loader", :style => "display: none;" %>

<% end %> <% end %> diff --git a/app/views/geocoder/search.html.erb b/app/views/geocoder/search.html.erb index 6e25588b6..ac655147a 100644 --- a/app/views/geocoder/search.html.erb +++ b/app/views/geocoder/search.html.erb @@ -1,9 +1,10 @@ +

+ + <%= t('site.sidebar.search_results') %> +

<% @sources.each do |source| %> -

<%= raw(t "geocoder.search.title.#{source}") %>

"> - <%= image_tag "searching.gif", :class => "search_searching" %> +

<%= raw(t "geocoder.search.title.#{source}") %>

"> + <%= image_tag "searching.gif", :class => "loader" %>

- <% end %> diff --git a/app/views/layouts/_content.html.erb b/app/views/layouts/_content.html.erb new file mode 100644 index 000000000..a4d93cc0e --- /dev/null +++ b/app/views/layouts/_content.html.erb @@ -0,0 +1,19 @@ +

+ <% if content_for? :content %> + <%= yield :content %> + <% else %> + <%= render :partial => "layouts/flash", :locals => { :flash => flash } %> + <% if content_for? :heading %> +

+ <%= yield :heading %> +

+ <% end %> +

+ <%= yield %> +

+ <% end %> +

diff --git a/app/views/layouts/_edit_menu.html.erb b/app/views/layouts/_edit_menu.html.erb deleted file mode 100644 index b7d9d7fdf..000000000 --- a/app/views/layouts/_edit_menu.html.erb +++ /dev/null @@ -1,19 +0,0 @@ - diff --git a/app/views/layouts/_flash.html.erb b/app/views/layouts/_flash.html.erb index a3cbbc207..51ef3fe41 100644 --- a/app/views/layouts/_flash.html.erb +++ b/app/views/layouts/_flash.html.erb @@ -1,11 +1,20 @@ <% if flash[:error] %> -

<%=image_tag("notice.png", :class => "small_icon", :border=>0)%><%= raw flash[:error] %>

+ <%= image_tag("notice.png", :class => "small_icon", :border => 0) %> + <%= raw flash[:error] %> +

<% end %> <% if flash[:warning] %> -

<%=image_tag("notice.png", :class => "small_icon", :border=>0)%><%= raw flash[:warning] %>

+ <%= image_tag("notice.png", :class => "small_icon", :border => 0) %> + <%= raw flash[:warning] %> +

<% end %> <% if flash[:notice] %> -

<%=image_tag("notice.png", :class => "small_icon", :border=>0)%><%= raw flash[:notice] %>

+ <%= image_tag("notice.png", :class => "small_icon", :border => 0) %> + <%= raw flash[:notice] %> +

<% end %> diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb index 0a4fb143f..1897cfff3 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -1,9 +1,10 @@ + <%= javascript_include_tag "application" %> - <%= stylesheet_link_tag "small-#{dir}", :media => "only screen and (max-width:641px)" %> - <%= stylesheet_link_tag "large-#{dir}", :media => "screen and (min-width: 642px)" %> + <%= stylesheet_link_tag "small-#{dir}", :media => "only screen and (max-width:721px)" %> + <%= stylesheet_link_tag "large-#{dir}", :media => "screen and (min-width: 722px)" %> <%= stylesheet_link_tag "print-#{dir}", :media => "print" %> <%= stylesheet_link_tag "leaflet-all", :media => "screen, print" %> <% if t('license_page.legal_babble', :locale => I18n.locale) != t('license_page.legal_babble', :locale => :en) %> -

<%= t 'license_page.native.title' %>

<%= raw t 'license_page.native.text', :native_link => link_to(t('license_page.native.native_link'), @@ -19,7 +19,7 @@ <% else %> <% if t('license_page.legal_babble', :locale => @locale) != t('license_page.legal_babble', :locale => :en) %> -

<%= t 'license_page.foreign.title' %>

<%= raw t 'license_page.foreign.text', :english_original_link => link_to(t('license_page.foreign.english_link'), @@ -31,7 +31,7 @@ <% end %> <% end %> -

<%= t "license_page.legal_babble.title_html", :locale => @locale %>

<% end %> diff --git a/app/views/site/edit.html.erb b/app/views/site/edit.html.erb index 761975466..ae313e1f2 100644 --- a/app/views/site/edit.html.erb +++ b/app/views/site/edit.html.erb @@ -1,21 +1,13 @@ -<% if STATUS == :database_offline or STATUS == :api_offline %> -

<%= t 'layouts.osm_offline' %> -

-<% elsif STATUS == :database_readonly or STATUS == :api_readonly %> -

<%= t 'layouts.osm_read_only' %> -

-<% elsif !@user.data_public? %> -

<%= t 'site.edit.not_public' %>

<%= raw t 'site.edit.not_public_description', :user_page => (link_to t('site.edit.user_page_link'), {:controller => 'user', :action => 'account', :display_name => @user.display_name, :anchor => 'public'}) %>

<%= raw t 'site.edit.anon_edits', :link => link_to(t('site.edit.anon_edits_link_text'), t('site.edit.anon_edits_link')) %>

-<% else %> -<% content_for :head do %> - <%= javascript_include_tag "edit" %> -<% end %> - -<%= render :partial => 'home_link' %> -<%= render :partial => 'sidebar' %> -<%= render :partial => 'search' %> - -<%= render :partial => preferred_editor %> +<% content_for :content do %> + <% if STATUS == :database_offline or STATUS == :api_offline %> +

<%= t 'layouts.osm_offline' %>

+ <% elsif STATUS == :database_readonly or STATUS == :api_readonly %> +

<%= t 'layouts.osm_read_only' %>

+ <% elsif !@user.data_public? %> +

<%= t 'site.edit.not_public' %>

<%= raw t 'site.edit.anon_edits', :link => link_to(t('site.edit.anon_edits_link_text'), t('site.edit.anon_edits_link')) %>

+ <% else %> + <%= render :partial => preferred_editor %> + <% end %> <% end %> diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb new file mode 100644 index 000000000..4ac5ec4d9 --- /dev/null +++ b/app/views/site/export.html.erb @@ -0,0 +1,47 @@ +<% set_title(t('export.title')) %> + +

+ + <%= t 'export.title' %> +

+ +<%= form_tag({:controller => "export", :action => "finish"}, :class => "export_form") do %> + <%= hidden_field_tag 'format', 'osm' %> + +

+ <%= text_field_tag('maxlat', nil, :size => 10, :class => "export_bound") %> +
+ <%= text_field_tag('minlon', nil, :size => 10, :class => "export_bound") %> + <%= text_field_tag('maxlon', nil, :size => 10, :class => "export_bound") %> +

+ <%= text_field_tag('minlat', nil, :size => 10, :class => "export_bound") %> +

+ <%= t'export.start.manually_select' %> +

+ +

<%= t'export.start.licence' %>

<%= raw t 'export.start.export_details' %>

+ +

<%= t'export.start.too_large.heading' %>

<%= t'export.start.too_large.body' %>

<%= t'export.start.too_large.planet.title' %>: <%= t'export.start.too_large.planet.description' %>
<%= t'export.start.too_large.geofabrik.title' %>: <%= t'export.start.too_large.geofabrik.description' %>
<%= t'export.start.too_large.metro.title' %>: <%= t'export.start.too_large.metro.description' %>
<%= t'export.start.too_large.other.title' %>: <%= t'export.start.too_large.other.description' %>

+ +

+ <%= submit_tag t('export.start.export_button'), :id => "export_commit" %> +

+<% end %> diff --git a/app/views/site/help.html.erb b/app/views/site/help.html.erb new file mode 100644 index 000000000..a1b1adb92 --- /dev/null +++ b/app/views/site/help.html.erb @@ -0,0 +1,18 @@ +<% content_for :heading do %> +

<%= t "help_page.title" %>

+<% end %> + +

<%= t "help_page.introduction" %>

+ +<% ['welcome', 'help', 'wiki'].each do |site| %> + <% unless site == 'welcome' && !@user %> +

+ + <%= t "help_page.#{site}.title" %> + +

<%= t "help_page.#{site}.description" %>

+ <% end %> +<% end %> diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb index fde4a07cd..fa47bb00c 100644 --- a/app/views/site/id.html.erb +++ b/app/views/site/id.html.erb @@ -33,24 +33,15 @@ }); id.map().on('move.embed', parent.$.throttle(250, function() { - var extent = id.map().extent(), - zoom = ~~id.map().zoom(), - center = id.map().center(); + var zoom = ~~id.map().zoom(), + center = id.map().center(), + llz = { lon: center[0], lat: center[1], zoom: zoom }; - parent.updatelinks({ - lon: center[0], - lat: center[1] - }, - zoom, - null, - [[extent[0][1], - extent[0][0]], - [extent[1][1], - extent[1][0]]]); + parent.updatelinks(llz, zoom); // Manually resolve URL to avoid iframe JS context weirdness. // http://bl.ocks.org/jfirebaugh/5439412 - var hash = parent.OSM.formatHash({ lon: center[0], lat: center[1], zoom: zoom }); + var hash = parent.OSM.formatHash(llz); if (hash !== parent.location.hash) { parent.location.replace(parent.location.href.replace(/(#.*|$)/, hash)); } diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb index 73e1382d3..6f215235c 100644 --- a/app/views/site/index.html.erb +++ b/app/views/site/index.html.erb @@ -1,33 +1,13 @@ -<% content_for :head do %> - <%= javascript_include_tag "index" %> -<% end %> - -<%= render :partial => 'home_link' %> -<%= render :partial => 'sidebar' %> -<%= render :partial => 'search' %> - -

<%= t 'site.index.js_1' %>

<%= t 'site.index.js_2' %>

+<% + set_title() + content_for(:content_class) { "overlay-sidebar" } +%> + +<% unless @user %> +

<%= t 'layouts.intro_header' %>

<%= t 'layouts.intro_text' %>

+ <%= t('layouts.learn_more') %> +

- -

- - - - - - - - -

<%= t'site.index.license.license_url' %>	<%= t'site.index.license.project_url' %>
<%= t'site.index.license.copyright' %>

- +<% end %> diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb index da775e339..4edcf361e 100644 --- a/app/views/site/welcome.html.erb +++ b/app/views/site/welcome.html.erb @@ -3,7 +3,7 @@ <% end %> <% content_for :heading do %> -

<%= t "welcome_page.title" %>

<% end %>

<%= t "welcome_page.introduction_html" %>

@@ -51,7 +51,7 @@

<%= t "welcome_page.questions.title" %>

<%= t "welcome_page.questions.paragraph_1_html" %>

<%= t "welcome_page.questions.paragraph_1_html", :help_url => help_path %>

@@ -64,4 +64,4 @@

<%= t "welcome_page.add_a_note.paragraph_1_html" %>

<%= t "welcome_page.add_a_note.paragraph_2_html", :map_url => root_path %>

\ No newline at end of file +

diff --git a/app/views/user/_contact.html.erb b/app/views/user/_contact.html.erb index 9d719b52f..4811389f1 100644 --- a/app/views/user/_contact.html.erb +++ b/app/views/user/_contact.html.erb @@ -24,7 +24,7 @@ <% changeset = contact.changesets.first %> <% if changeset %> <%= t('user.view.latest edit', :ago => t('user.view.ago', :time_in_words_ago => time_ago_in_words(changeset.created_at))) %> - <% comment = changeset.tags['comment'].to_s != '' ? changeset.tags['comment'] : t('changeset.changeset.no_comment') %> + <% comment = changeset.tags['comment'].to_s != '' ? changeset.tags['comment'] : t('browse.no_comment') %> "<%= link_to(comment, {:controller => 'browse', :action => 'changeset', :id => changeset.id}, {:title => t('changeset.changeset.view_changeset_details')}) diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb index e5cbe22b5..94183ff42 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -1,5 +1,5 @@ <% content_for :heading do %> -

<%= t 'user.account.my settings' %>

<%= link_to t('user.account.return to profile'), :controller => 'user', :action => 'view', :display_name => @user.display_name %>
<%= link_to t('user.view.oauth settings'), :controller => 'oauth_clients', :action => 'index' %>

<%= t 'user.confirm.heading' %>

<%= t 'user.no_such_user.heading', :user => h(@not_found_user) %>

<%= t 'user.no_such_user.body', :user => h(@not_found_user) %>

<%= user_image @this_user %>

<%= @this_user.display_name %><%= role_icons(@this_user) %>

<% if @user and @this_user.id == @user.id %> - +

<%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name %> @@ -45,7 +45,7 @@

<% else %> - +

diff --git a/config/environments/production.rb b/config/environments/production.rb index 47358b387..2db9f2366 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -69,12 +69,13 @@ OpenStreetMap::Application.configure do # Precompile additional assets. # application.js, application.css, and all non-JS/CSS in app/assets folder are already added. - config.assets.precompile += %w( index.js edit.js browse.js changeset.js welcome.js ) + config.assets.precompile += %w( index.js browse.js welcome.js ) config.assets.precompile += %w( user.js diary_entry.js swfobject.js ) config.assets.precompile += %w( large-ltr.css small-ltr.css print-ltr.css ) config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css ) - config.assets.precompile += %w( browse.css leaflet-all.css leaflet.ie.css ) + config.assets.precompile += %w( leaflet-all.css leaflet.ie.css ) config.assets.precompile += %w( embed.js embed.css ) + config.assets.precompile += %w( html5shiv.js ) config.assets.precompile += %w( images/marker-*.png img/*-handle.png ) config.assets.precompile += %w( potlatch2.swf ) config.assets.precompile += %w( potlatch2/assets.zip ) diff --git a/config/locales/en.yml b/config/locales/en.yml index d7411e997..3fc045865 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -95,96 +95,62 @@ en: name: "Remote Control" description: "Remote Control (JOSM or Merkaartor)" browse: + created: "Created" + closed: "Closed" + created_html: "Created %{time} ago" + closed_html: "Closed %{time} ago" + created_by_html: "Created %{time} ago by %{user}" + deleted_by_html: "Deleted %{time} ago by %{user}" + edited_by_html: "Edited %{time} ago by %{user}" + closed_by_html: "Closed %{time} ago by %{user}" + version: "Version" + in_changeset: "Changeset" + anonymous: "anonymous" + no_comment: "(no comment)" + part_of: "Part of" + download_xml: "Download XML" + view_history: "View History" + view_details: "View Details" changeset: - title: "Changeset" - changeset: "Changeset: %{id}" + title: "Changeset %{id}" + belongs_to: "Author" + node: "Nodes (%{count})" + node_paginated: "Nodes (%{x}-%{y} of %{count})" + way: "Ways (%{count})" + way_paginated: "Ways (%{x}-%{y} of %{count})" + relation: "Relations (%{count})" + relation_paginated: "Relations (%{x}-%{y} of %{count})" changesetxml: "Changeset XML" osmchangexml: "osmChange XML" feed: title: "Changeset %{id}" title_comment: "Changeset %{id} - %{comment}" - navigation: - paging: - user: - prev: "Â« %{id}" - next: "%{id} Â»" - all: - prev: "Â« %{id}" - next: "%{id} Â»" - user: - name_changeset_tooltip: "View edits by %{user}" - prev_changeset_tooltip: "Previous edit by %{user}" - next_changeset_tooltip: "Next edit by %{user}" - all: - prev_node_tooltip: "Previous node" - next_node_tooltip: "Next node" - prev_way_tooltip: "Previous way" - next_way_tooltip: "Next way" - prev_relation_tooltip: "Previous relation" - next_relation_tooltip: "Next relation" - prev_changeset_tooltip: "Previous changeset" - next_changeset_tooltip: "Next changeset" - prev_note_tooltip: "Previous note" - next_note_tooltip: "Next note" - changeset_details: - created_at: "Created at:" - closed_at: "Closed at:" - belongs_to: "Belongs to:" - bounding_box: "Bounding box:" - no_bounding_box: "No bounding box has been stored for this changeset." - show_area_box: "Show Area Box" - box: "box" - has_nodes: - one: "Has the following %{count} node:" - other: "Has the following %{count} nodes:" - has_ways: - one: "Has the following %{count} way:" - other: "Has the following %{count} ways:" - has_relations: - one: "Has the following %{count} relation:" - other: "Has the following %{count} relations:" - common_details: - edited_at: "Edited at:" - edited_by: "Edited by:" - deleted_at: "Deleted at:" - deleted_by: "Deleted by:" - version: "Version:" - in_changeset: "In changeset:" - changeset_comment: "Comment:" + node: + title: "Node: %{name}" + history_title: "Node History: %{name}" + way: + title: "Way: %{name}" + history_title: "Way History: %{name}" + nodes: "Nodes" + also_part_of: + one: "part of way %{related_ways}" + other: "part of ways %{related_ways}" + relation: + title: "Relation: %{name}" + history_title: "Relation History: %{name}" + members: "Members" + relation_member: + entry: "%{type} %{name}" + entry_role: "%{type} %{name} as %{role}" + type: + node: "Node" + way: "Way" + relation: "Relation" containing_relation: entry: "Relation %{relation_name}" entry_role: "Relation %{relation_name} (as %{relation_role})" - map: - loading: "Loading..." - deleted: "Deleted" - larger: - area: "View area on larger map" - node: "View node on larger map" - way: "View way on larger map" - relation: "View relation on larger map" - note: "View note on larger map" - edit: - area: "Edit area" - node: "Edit node" - way: "Edit way" - relation: "Edit relation" - note: "Edit note" - node_details: - coordinates: "Coordinates:" - part_of: "Part of:" - node_history: - node_history: "Node History" - node_history_title: "Node History: %{node_name}" - download_xml: "Download XML" - view_details: "View details" - node: - node: "Node" - node_title: "Node: %{node_name}" - download_xml: "Download XML" - view_history: "View history" - edit: "Edit node" not_found: - sorry: "Sorry, the %{type} with the id %{id}, could not be found." + sorry: "Sorry, %{type} #%{id} could not be found." type: node: node way: way @@ -197,9 +163,6 @@ en: way: way relation: relation changeset: changeset - paging_nav: - showing_page: "page" - of: "of" redacted: redaction: "Redaction %{id}" message_html: "Version %{version} of this %{type} cannot be shown as it has been redacted. Please see %{redaction_link} for details." @@ -207,110 +170,38 @@ en: node: "node" way: "way" relation: "relation" - relation_details: - members: "Members:" - part_of: "Part of:" - relation_history: - relation_history: "Relation History" - relation_history_title: "Relation History: %{relation_name}" - download_xml: "Download XML" - view_details: "View details" - relation_member: - entry: "%{type} %{name}" - entry_role: "%{type} %{name} as %{role}" - type: - node: "Node" - way: "Way" - relation: "Relation" - relation: - relation: "Relation" - relation_title: "Relation: %{relation_name}" - download_xml: "Download XML" - view_history: "View history" start_rjs: - notes_layer_name: "Browse Notes" - data_layer_name: "Browse Map Data" - data_frame_title: "Data" - zoom_or_select: "Zoom in or select an area of the map to view" - view_data: "View data for current map view" - manually_select: "Manually select a different area" - hide_areas: "Hide areas" - show_areas: "Show areas" - loaded_an_area_with_num_features: "You have loaded an area which contains %{num_features} features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than %{max_features} features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below." + loaded_an_area_with_num_features: "Loading %{num_features} features, which may make your browser slow or unresponsive. Are sure you want to display this data?" load_data: "Load Data" - unable_to_load_size: "Unable to load: Bounding box size of %{bbox_size} is too large (must be smaller than %{max_bbox_size})" + unable_to_load_size: "Unable to load map data, too large of an area (%{bbox_size}). Area must be smaller than %{max_bbox_size} square degrees." loading: "Loading..." - show_history: "Show History" - wait: "Wait..." - history_for_feature: "History for %{feature}" - details: "Details" - private_user: "private user" - edited_by_user_at_timestamp: "Edited by %{user} at %{timestamp}" - object_list: - heading: "Object list" - back: "Back to object list" - type: - node: "Node" - way: "Way" - # There is no 'relation' type because it is not represented in OpenLayers - api: "Retrieve this area from the API" - details: "Details" - selected: - type: - node: "Node %{id}" - way: "Way %{id}" - # There is no 'relation' type because it is not represented in OpenLayers - history: - type: - node: "Node %{id}" - way: "Way %{id}" - # There is no 'relation' type because it is not represented in OpenLayers tag_details: - tags: "Tags:" + tags: "Tags" wiki_link: key: "The wiki description page for the %{key} tag" tag: "The wiki description page for the %{key}=%{value} tag" wikipedia_link: "The %{page} article on Wikipedia" - way_details: - nodes: "Nodes:" - part_of: "Part of:" - also_part_of: - one: "part of way %{related_ways}" - other: "part of ways %{related_ways}" - way_history: - way_history: "Way History" - way_history_title: "Way History: %{way_name}" - download_xml: "Download XML" - view_details: "View details" - way: - way: "Way" - way_title: "Way: %{way_name}" - download_xml: "Download XML" - view_history: "View history" - edit: "Edit way" note: title: "Note" - open_title: "Unresolved note: %{note_name}" - closed_title: "Resolved note: %{note_name}" - opened: "Opened:" - last_modified: "Last modified:" - closed: "Closed:" - at_html: "%{when} ago" - at_by_html: "%{when} ago by %{user}" - description: "Description:" - comments: "Comments:" + new_note: "New Note" + open_title: "Unresolved note #%{note_name}" + closed_title: "Resolved note #%{note_name}" + open_by: "Created by %{user} %{when} ago" + open_by_anonymous: "Created by anonymous %{when} ago" + commented_by: "Comment from %{user} %{when} ago" + commented_by_anonymous: "Comment from anonymous %{when} ago" + closed_by: "Resolved by %{user} %{when} ago" + closed_by_anonymous: "Resolved by anonymous %{when} ago" + reopened_by: "Reactivated by %{user} %{when} ago" + reopened_by_anonymous: "Reactivated by anonymous %{when} ago" changeset: changeset_paging_nav: showing_page: "Page %{page}" next: "Next Â»" previous: "Â« Previous" changeset: - still_editing: "(still editing)" anonymous: "Anonymous" - no_comment: "(none)" no_edits: "(no edits)" - show_area_box: "show area box" - big_area: "(big)" view_changeset_details: "View changeset details" changesets: id: "ID" @@ -321,24 +212,11 @@ en: list: title: "Changesets" title_user: "Changesets by %{user}" - title_bbox: "Changesets within %{bbox}" - title_user_bbox: "Changesets by %{user} within %{bbox}" title_friend: "Changesets by your friends" title_nearby: "Changesets by nearby users" - heading: "Changesets" - heading_user: "Changesets" - heading_bbox: "Changesets" - heading_user_bbox: "Changesets" - heading_friend: "Changesets" - heading_nearby: "Changesets" - description: "Browse recent contributions to the map" - description_user: "Changesets by %{user}" - description_bbox: "Changesets within %{bbox}" - description_user_bbox: "Changesets by %{user} within %{bbox}" - description_friend: "Changesets by your friends" - description_nearby: "Changesets by nearby users" - empty_user_html: "It looks you haven't made any edits yet. To get started, check out the Beginners Guide." - empty_anon_html: "No edits made yet." + empty: "No changesets in this area." + no_more: "No more changesets in this area." + load_more: "Load more" timeout: sorry: "Sorry, the list of changesets you requested took too long to retrieve." diary_entry: @@ -416,6 +294,7 @@ en: newer_comments: "Newer Comments" older_comments: "Older Comments" export: + title: "Export" start: area_to_export: "Area to Export" manually_select: "Manually select a different area" @@ -452,13 +331,6 @@ en: output: "Output" paste_html: "Paste HTML to embed in website" export_button: "Export" - start_rjs: - export: "Export" - drag_a_box: "Drag a box on the map to select an area" - manually_select: "Manually select a different area" - click_add_marker: "Click on the map to add a marker" - change_marker: "Change marker position" - add_marker: "Add a marker to the map" geocoder: search: title: @@ -1000,14 +872,13 @@ en: alt_text: OpenStreetMap logo home: Go to Home Location logout: Logout - log_in: log in + log_in: Log In log_in_tooltip: Log in with an existing account - sign_up: sign up + sign_up: Sign Up sign_up_tooltip: Create an account for editing - view: View - view_tooltip: View the map edit: Edit history: History + export: Export data: Data export_data: Export Data gps_traces: GPS Traces @@ -1016,13 +887,9 @@ en: user_diaries_tooltip: View user diaries edit_with: Edit with %{editor} tag_line: The Free Wiki World Map - intro_1: "OpenStreetMap is a free worldwide map, created by people like you." - intro_2_html: "The data is free to %{download} and %{use} under its %{license}. %{create_account} to improve the map." + intro_header: Welcome to OpenStreetMap! + intro_text: OpenStreetMap is an editable map of the world created by people like you and free to use under an open license. intro_2_create_account: "Create a user account" - intro_2_license: "open license" - intro_2_use: "use" - intro_2_download: "download" - intro_2_use_url: "http://wiki.openstreetmap.org/wiki/Using_OpenStreetMap" partners_html: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}." partners_ucl: "the UCL VR Centre" partners_ic: "Imperial College London" @@ -1032,16 +899,8 @@ en: osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out." osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out." donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund." - donate_link_text: donating help: Help - help_centre: Help Centre - help_url: http://help.openstreetmap.org/ - help_title: Help site for the project - wiki: Wiki - wiki_url: http://wiki.openstreetmap.org/ - wiki_title: Wiki site for the project - documentation: Documentation - documentation_title: Documentation for the project + about: About copyright: "Copyright & License" community: Community community_blogs: "Community Blogs" @@ -1051,7 +910,7 @@ en: make_a_donation: title: Support OpenStreetMap with a monetary donation text: Make a Donation - + learn_more: "Learn More" license_page: foreign: title: About this translation @@ -1197,8 +1056,9 @@ en: questions: title: Any questions? paragraph_1_html: | - Need help mapping, or not clear on how to use OpenStreetMap? Get your questions answered - on the help website. + OpenStreetMap has several resources for learning about the project, asking and answering + questions, and collaboratively discussing and documenting mapping topics. + Get help here. start_mapping: Start Mapping add_a_note: title: No Time To Edit? Add a Note! @@ -1209,6 +1069,52 @@ en: Just go to the map and click the note icon: . This will add a marker to the map, which you can move by dragging. Add your message, then click save, and other mappers will investigate. + help_page: + title: Getting Help + introduction: | + OpenStreetMap has several resources for learning about the project, asking and answering questions, + and collaboratively discussing and documenting mapping topics. + welcome: + url: /welcome + title: Welcome to OSM + description: Start with this quick guide covering the OpenStreetMap basics. + help: + url: https://help.openstreetmap.org/ + title: help.openstreetmap.org + description: Ask a question or look up answers on OSM's question-and-answer site. + wiki: + url: http://wiki.openstreetmap.org/ + title: wiki.openstreetmap.org + description: Browse the wiki for in-depth OSM documentation. + about_page: + next: Next + copyright_html: ©OpenStreetMap
contributors + used_by: "%{name} powers map data on hundreds of web sites, mobile apps, and hardware devices" + lede_text: | + OpenStreetMap is built by a community of mappers that contribute and maintain data + about roads, trails, cafÃ©s, railway stations, and much more, all over the world. + local_knowledge_title: Local Knowledge + local_knowledge_html: | + OpenStreetMap emphasizes local knowledge. Contributors use + aerial imagery, GPS devices, and low-tech field maps to verify that OSM + is accurate and up to date. + community_driven_title: Community Driven + community_driven_html: | + OpenStreetMap's community is diverse, passionate, and growing every day. + Our contributors include enthusiast mappers, GIS professionals, engineers + running the OSM servers, humanitarians mapping disaster-affected areas, + and many more. + To learn more about the community, see the user diaries, + community blogs, and + the OSM Foundation website. + open_data_title: Open Data + open_data_html: | + OpenStreetMap is open data: you are free to use it for any purpose + as long as you credit OpenStreetMap and its contributors. If you alter or + build upon the data in certain ways, you may distribute the result only + under the same licence. See the Copyright and + License page for details. + partners_title: Partners notifier: diary_comment_notification: subject: "[OpenStreetMap] %{user} commented on your diary entry" @@ -1385,7 +1291,6 @@ en: where_am_i: "Where am I?" where_am_i_title: Describe the current location using the search engine submit_text: "Go" - search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near LÃ¼nen' more examples..." key: table: entry: @@ -2141,13 +2046,14 @@ en: overlays: Enable overlays for troubleshooting the map title: "Layers" copyright: "Â© OpenStreetMap contributors" + donate_link_text: "Make a Donation" site: edit_tooltip: Edit the map edit_disabled_tooltip: Zoom in to edit the map - history_tooltip: View edits for this area - history_disabled_tooltip: Zoom in to view edits for this area createnote_tooltip: Add a note to the map createnote_disabled_tooltip: Zoom in to add a note to the map + map_notes_zoom_in_tooltip: Zoom in to see map notes + map_data_zoom_in_tooltip: Zoom in to see map data notes: new: intro: "In order to improve the map the information you enter is shown to other mappers, so please be as descriptive and precise as possible when moving the marker to the correct position and entering your note below." diff --git a/config/routes.rb b/config/routes.rb index 81548af12..59c5b6803 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -102,23 +102,24 @@ OpenStreetMap::Application.routes.draw do end # Data browsing - match '/browse/start' => 'browse#start', :via => :get - match '/browse/way/:id' => 'browse#way', :via => :get, :id => /\d+/ + match '/browse/way/:id' => 'browse#way', :via => :get, :id => /\d+/, :as => :way match '/browse/way/:id/history' => 'browse#way_history', :via => :get, :id => /\d+/ - match '/browse/node/:id' => 'browse#node', :via => :get, :id => /\d+/ + match '/browse/node/:id' => 'browse#node', :via => :get, :id => /\d+/, :as => :node match '/browse/node/:id/history' => 'browse#node_history', :via => :get, :id => /\d+/ - match '/browse/relation/:id' => 'browse#relation', :via => :get, :id => /\d+/ + match '/browse/relation/:id' => 'browse#relation', :via => :get, :id => /\d+/, :as => :relation match '/browse/relation/:id/history' => 'browse#relation_history', :via => :get, :id => /\d+/ match '/browse/changeset/:id' => 'browse#changeset', :via => :get, :as => :changeset, :id => /\d+/ match '/browse/note/:id' => 'browse#note', :via => :get, :id => /\d+/, :as => "browse_note" + match '/new_note' => 'browse#new_note', :via => :get match '/user/:display_name/edits' => 'changeset#list', :via => :get match '/user/:display_name/edits/feed' => 'changeset#feed', :via => :get, :defaults => { :format => :atom } match '/user/:display_name/notes' => 'notes#mine', :via => :get match '/browse/friends' => 'changeset#list', :via => :get, :friends => true, :as => "friend_changesets" match '/browse/nearby' => 'changeset#list', :via => :get, :nearby => true, :as => "nearby_changesets" - match '/browse/changesets' => 'changeset#list', :via => :get - match '/browse/changesets/feed' => 'changeset#feed', :via => :get, :defaults => { :format => :atom } - match '/browse' => 'changeset#list', :via => :get + + get '/browse/changesets/feed', :to => redirect('/history/feed') + get '/browse/changesets', :to => redirect('/history') + get '/browse', :to => redirect('/history') # web site root :to => 'site#index', :via => [:get, :post] @@ -126,9 +127,11 @@ OpenStreetMap::Application.routes.draw do match '/copyright/:copyright_locale' => 'site#copyright', :via => :get match '/copyright' => 'site#copyright', :via => :get match '/welcome' => 'site#welcome', :via => :get, :as => :welcome + match '/help' => 'site#help', :via => :get, :as => :help + match '/about' => 'site#about', :via => :get, :as => :about match '/history' => 'changeset#list', :via => :get match '/history/feed' => 'changeset#feed', :via => :get, :defaults => { :format => :atom } - match '/export' => 'site#index', :export => true, :via => :get + match '/export' => 'site#export', :via => :get match '/login' => 'user#login', :via => [:get, :post] match '/logout' => 'user#logout', :via => [:get, :post] match '/offline' => 'site#offline', :via => :get @@ -213,7 +216,7 @@ OpenStreetMap::Application.routes.draw do match '/users/:status' => 'user#list', :via => [:get, :post] # geocoder - match '/geocoder/search' => 'geocoder#search', :via => :post + match '/search' => 'geocoder#search', :via => :get, :as => :search match '/geocoder/search_latlon' => 'geocoder#search_latlon', :via => :get match '/geocoder/search_us_postcode' => 'geocoder#search_us_postcode', :via => :get match '/geocoder/search_uk_postcode' => 'geocoder#search_uk_postcode', :via => :get @@ -224,7 +227,6 @@ OpenStreetMap::Application.routes.draw do match '/geocoder/search_geonames_reverse' => 'geocoder#search_geonames_reverse', :via => :get # export - match '/export/start' => 'export#start', :via => :get match '/export/finish' => 'export#finish', :via => :post match '/export/embed' => 'export#embed', :via => :get diff --git a/test/functional/browse_controller_test.rb b/test/functional/browse_controller_test.rb index e2937c5d8..0f1ff6855 100644 --- a/test/functional/browse_controller_test.rb +++ b/test/functional/browse_controller_test.rb @@ -7,10 +7,6 @@ class BrowseControllerTest < ActionController::TestCase ## # test all routes which lead to this controller def test_routes - assert_routing( - { :path => "/browse/start", :method => :get }, - { :controller => "browse", :action => "start" } - ) assert_routing( { :path => "/browse/node/1", :method => :get }, { :controller => "browse", :action => "node", :id => "1" } diff --git a/test/functional/export_controller_test.rb b/test/functional/export_controller_test.rb index 0e7529b77..d36f0cfd8 100644 --- a/test/functional/export_controller_test.rb +++ b/test/functional/export_controller_test.rb @@ -5,10 +5,6 @@ class ExportControllerTest < ActionController::TestCase ## # test all routes which lead to this controller def test_routes - assert_routing( - { :path => "/export/start", :method => :get }, - { :controller => "export", :action => "start" } - ) assert_routing( { :path => "/export/finish", :method => :post }, { :controller => "export", :action => "finish" } @@ -19,14 +15,6 @@ class ExportControllerTest < ActionController::TestCase ) end - ## - # test the start action - def test_start - xhr :get, :start - assert_response :success - assert_template "export/start" - end - ### # test the finish action for raw OSM data def test_finish_osm diff --git a/vendor/assets/javascripts/html5shiv.js b/vendor/assets/javascripts/html5shiv.js new file mode 100644 index 000000000..94324d7c8 --- /dev/null +++ b/vendor/assets/javascripts/html5shiv.js @@ -0,0 +1,301 @@ +/** +* @preserve HTML5 Shiv prev3.7.1 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed +*/ +;(function(window, document) { +/*jshint evil:true */ + /** version */ + var version = '3.7.0'; + + /** Preset options */ + var options = window.html5 || {}; + + /** Used to skip problem elements */ + var reSkip = /^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i; + + /** Not all elements can be cloned in IE **/ + var saveClones = /^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i; + + /** Detect whether the browser supports default html5 styles */ + var supportsHtml5Styles; + + /** Name of the expando, to work with multiple documents or to re-shiv one document */ + var expando = '_html5shiv'; + + /** The id for the the documents expando */ + var expanID = 0; + + /** Cached data for each document */ + var expandoData = {}; + + /** Detect whether the browser supports unknown elements */ + var supportsUnknownElements; + + (function() { + try { + var a = document.createElement('a'); + a.innerHTML = ''; + //if the hidden property is implemented we can assume, that the browser supports basic HTML5 Styles + supportsHtml5Styles = ('hidden' in a); + + supportsUnknownElements = a.childNodes.length == 1 || (function() { + // assign a false positive if unable to shiv + (document.createElement)('a'); + var frag = document.createDocumentFragment(); + return ( + typeof frag.cloneNode == 'undefined' || + typeof frag.createDocumentFragment == 'undefined' || + typeof frag.createElement == 'undefined' + ); + }()); + } catch(e) { + // assign a false positive if detection fails => unable to shiv + supportsHtml5Styles = true; + supportsUnknownElements = true; + } + + }()); + + /*--------------------------------------------------------------------------*/ + + /** + * Creates a style sheet with the given CSS text and adds it to the document. + * @private + * @param {Document} ownerDocument The document. + * @param {String} cssText The CSS text. + * @returns {StyleSheet} The style element. + */ + function addStyleSheet(ownerDocument, cssText) { + var p = ownerDocument.createElement('p'), + parent = ownerDocument.getElementsByTagName('head')[0] || ownerDocument.documentElement; + + p.innerHTML = 'x'; + return parent.insertBefore(p.lastChild, parent.firstChild); + } + + /** + * Returns the value of `html5.elements` as an array. + * @private + * @returns {Array} An array of shived element node names. + */ + function getElements() { + var elements = html5.elements; + return typeof elements == 'string' ? elements.split(' ') : elements; + } + + /** + * Returns the data associated to the given document + * @private + * @param {Document} ownerDocument The document. + * @returns {Object} An object of data. + */ + function getExpandoData(ownerDocument) { + var data = expandoData[ownerDocument[expando]]; + if (!data) { + data = {}; + expanID++; + ownerDocument[expando] = expanID; + expandoData[expanID] = data; + } + return data; + } + + /** + * returns a shived element for the given nodeName and document + * @memberOf html5 + * @param {String} nodeName name of the element + * @param {Document} ownerDocument The context document. + * @returns {Object} The shived element. + */ + function createElement(nodeName, ownerDocument, data){ + if (!ownerDocument) { + ownerDocument = document; + } + if(supportsUnknownElements){ + return ownerDocument.createElement(nodeName); + } + if (!data) { + data = getExpandoData(ownerDocument); + } + var node; + + if (data.cache[nodeName]) { + node = data.cache[nodeName].cloneNode(); + } else if (saveClones.test(nodeName)) { + node = (data.cache[nodeName] = data.createElem(nodeName)).cloneNode(); + } else { + node = data.createElem(nodeName); + } + + // Avoid adding some elements to fragments in IE < 9 because + // * Attributes like `name` or `type` cannot be set/changed once an element + // is inserted into a document/fragment + // * Link elements with `src` attributes that are inaccessible, as with + // a 403 response, will cause the tab/window to crash + // * Script elements appended to fragments will execute when their `src` + // or `text` property is set + return node.canHaveChildren && !reSkip.test(nodeName) && !node.tagUrn ? data.frag.appendChild(node) : node; + } + + /** + * returns a shived DocumentFragment for the given document + * @memberOf html5 + * @param {Document} ownerDocument The context document. + * @returns {Object} The shived DocumentFragment. + */ + function createDocumentFragment(ownerDocument, data){ + if (!ownerDocument) { + ownerDocument = document; + } + if(supportsUnknownElements){ + return ownerDocument.createDocumentFragment(); + } + data = data || getExpandoData(ownerDocument); + var clone = data.frag.cloneNode(), + i = 0, + elems = getElements(), + l = elems.length; + for(;i 7); - })(); - - L.Hash = function(map) { - this.onHashChange = L.Util.bind(this.onHashChange, this); - - if (map) { - this.init(map); - } - }; - - L.Hash.parseHash = function(hash) { - if(hash.indexOf('#') === 0) { - hash = hash.substr(1); - } - var args = hash.split("/"); - if (args.length == 3) { - var zoom = parseInt(args[0], 10), - lat = parseFloat(args[1]), - lon = parseFloat(args[2]); - if (isNaN(zoom) || isNaN(lat) || isNaN(lon)) { - return false; - } else { - return { - center: new L.LatLng(lat, lon), - zoom: zoom - }; - } - } else { - return false; - } - }; - - L.Hash.formatHash = function(map) { - var center = map.getCenter(), - zoom = map.getZoom(), - precision = Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2)); - - return "#" + [zoom, - center.lat.toFixed(precision), - center.lng.toFixed(precision) - ].join("/"); - }, - - L.Hash.prototype = { - map: null, - lastHash: null, - - parseHash: L.Hash.parseHash, - formatHash: L.Hash.formatHash, - - init: function(map) { - this.map = map; - - // reset the hash - this.lastHash = null; - this.onHashChange(); - - if (!this.isListening) { - this.startListening(); - } - }, - - removeFrom: function(map) { - if (this.changeTimeout) { - clearTimeout(this.changeTimeout); - } - - if (this.isListening) { - this.stopListening(); - } - - this.map = null; - }, - - onMapMove: function() { - // bail if we're moving the map (updating from a hash), - // or if the map is not yet loaded - - if (this.movingMap || !this.map._loaded) { - return false; - } - - var hash = this.formatHash(this.map); - if (this.lastHash != hash) { - location.replace(hash); - this.lastHash = hash; - } - }, - - movingMap: false, - update: function() { - var hash = location.hash; - if (hash === this.lastHash) { - return; - } - var parsed = this.parseHash(hash); - if (parsed) { - this.movingMap = true; - - this.map.setView(parsed.center, parsed.zoom); - - this.movingMap = false; - } else { - this.onMapMove(this.map); - } - }, - - // defer hash change updates every 100ms - changeDefer: 100, - changeTimeout: null, - onHashChange: function() { - // throttle calls to update() so that they only happen every - // `changeDefer` ms - if (!this.changeTimeout) { - var that = this; - this.changeTimeout = setTimeout(function() { - that.update(); - that.changeTimeout = null; - }, this.changeDefer); - } - }, - - isListening: false, - hashChangeInterval: null, - startListening: function() { - this.map.on("moveend", this.onMapMove, this); - - if (HAS_HASHCHANGE) { - L.DomEvent.addListener(window, "hashchange", this.onHashChange); - } else { - clearInterval(this.hashChangeInterval); - this.hashChangeInterval = setInterval(this.onHashChange, 50); - } - this.isListening = true; - }, - - stopListening: function() { - this.map.off("moveend", this.onMapMove, this); - - if (HAS_HASHCHANGE) { - L.DomEvent.removeListener(window, "hashchange", this.onHashChange); - } else { - clearInterval(this.hashChangeInterval); - } - this.isListening = false; - } - }; - L.hash = function(map) { - return new L.Hash(map); - }; - L.Map.prototype.addHash = function() { - this._hash = L.hash(this); - }; - L.Map.prototype.removeHash = function() { - this._hash.removeFrom(); - }; -})(window); diff --git a/vendor/assets/leaflet/leaflet.js b/vendor/assets/leaflet/leaflet.js index fa26f6e2c..2b66295fc 100644 --- a/vendor/assets/leaflet/leaflet.js +++ b/vendor/assets/leaflet/leaflet.js @@ -9188,4 +9188,4 @@ L.Map.include({ }); -}(window, document)); \ No newline at end of file +}(window, document));

<%- name %>

<%- I18n.t("browse.start_rjs.history_for_feature", {feature: name}) %>

<%- I18n.t('browse.start_rjs.object_list.heading') %>

<%= t 'browse.changeset_details.created_at' %>

<%= t 'browse.changeset_details.closed_at' %>

<%= t 'browse.changeset_details.belongs_to' %>

<%= t 'browse.changeset_details.bounding_box' %>

<%= t 'browse.changeset_details.has_nodes', :count => @node_pages.item_count %>

<%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %>

<%= t 'browse.changeset_details.has_relations', :count => @relation_pages.item_count %>

<%= t 'browse.common_details.edited_at' %>

<%= t 'browse.common_details.deleted_at' %>

<%= t 'browse.common_details.edited_by' %>

<%= t 'browse.common_details.deleted_by' %>

+ <% if common_details.changeset.tags['comment'].present? %> + <%= linkify(h(common_details.changeset.tags['comment'])) %> + <% else %> + <%= t 'browse.no_comment' %> <% end %> +

<%= t 'browse.common_details.version' %>

<%= t 'browse.common_details.in_changeset' %>

<%= t 'browse.common_details.changeset_comment' %>

<%= t 'browse.part_of' %>

<%= t 'browse.node_details.coordinates' %>

<%= t 'browse.node_details.part_of' %>

<%= t'browse.relation.members' %>

<%= t'browse.part_of' %>

<%= t'browse.relation_details.members' %>

<%= t'browse.relation_details.part_of' %>

<%= t'browse.tag_details.tags' %>

<%= t 'browse.tag_details.tags' %>

<%= t'browse.way.nodes' %>

<%= t'browse.part_of' %>

<%= t'browse.way_details.nodes' %>

<%= t'browse.way_details.part_of' %>

<%= t 'browse.changeset.changeset', :id => @changeset.id %>

+ + <%= t('browse.changeset.title', :id => @changeset.id) %> +

<%= @changeset.tags['comment'].to_s.presence || t('browse.no_comment') %>

+ <%= type_and_paginated_count('way', @way_pages) %> + <%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %> +

+ <%= type_and_paginated_count('relation', @relation_pages) %> + <%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %> +

+ <%= type_and_paginated_count('node', @node_pages) %> + <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %> +

+ + <%= t("browse.#{@type}.title", :name => printable_name(@feature)) %> +

+ + <%= t("browse.#{@type}.history_title", :name => printable_name(@feature)) %> +

+ + <%= t "browse.note.new_note" %> +

<%= t'browse.node.node_title', :node_name => @name %>

<%= raw t'browse.node_history.node_history_title', :node_name => link_to(h(@name), :action => "node", :id => @node.id) %>

+ + <%= t'browse.not_found.sorry', :type=> browse_not_found_type[@type] , :id => params[:id] %>

- <%= image_tag "#{@note.status}_note_marker.png", :alt => @note.status %> - <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %> -

+ + <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %> +

<%= t('browse.note.mine.description') %>

<%= t "browse.note.opened" %>

<%= t "browse.note.closed" %>

<%= t "browse.note.last_modified" %>

<%= t "browse.note.description" %>

<%= t "browse.node_details.coordinates" %>

<%= t "browse.note.comments" %>

<%= t'browse.relation.relation_title', :relation_name => @name %>

<%= raw t'browse.relation_history.relation_history_title', :relation_name => link_to(h(@name), :action => "relation", :id => @relation.id) %>

<%= t'browse.way.way_title', :way_name => @name %>

<%= raw t'browse.way_history.way_history_title', :way_name => link_to(h(@name), :action => "way", :id => @way.id) %>

+ + <% if changeset.tags['comment'].to_s != '' %> + <%= linkify(h(changeset.tags['comment'])) %> + <% else %> + <%= t 'browse.no_comment' %> + <% end %> + +

+ + <%= @heading %> +

<%= @heading %>

<%= t('changeset.list.empty_user_html') %>

<%= t('changeset.list.empty_anon_html') %>

<%= h(@title) %>

<%= h(@title) %>

<%= t'export.start.licence' %>

<%= t'export.start.too_large.heading' %>

+ + <%= t('site.sidebar.search_results') %> +

<%= raw(t "geocoder.search.title.#{source}") %>

<%= raw(t "geocoder.search.title.#{source}") %>

<%= t 'license_page.native.title' %>

<%= t 'license_page.native.title' %>

<%= t 'license_page.foreign.title' %>

<%= t 'license_page.foreign.title' %>

<%= t "license_page.legal_babble.title_html", :locale => @locale %>

<%= t "license_page.legal_babble.title_html", :locale => @locale %>

+ + <%= t 'export.title' %> +

<%= t'export.start.licence' %>

<%= t'export.start.too_large.heading' %>

<%= t "help_page.title" %>

+ + <%= t "help_page.#{site}.title" %> + +

<%= t "welcome_page.title" %>