From: John Firebaugh Date: Tue, 12 Nov 2013 01:57:38 +0000 (-0800) Subject: Improve browse design X-Git-Tag: live~4648^2~113 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c4090bb150e0eb866151ba0477e50b0421d60527?hp=bd19e75214a05c2cc4cd36dd63d30cace2ab1f8e Improve browse design --- diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 3845c5b31..e6862f954 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -624,15 +624,15 @@ nav.secondary { float: left; width: $sidebarWidth; background: #fff; + font-size: 13px; - h2, h3, h4 { + h2 { padding: $lineheight $lineheight $lineheight/2; } - h4 { - font-weight: normal; - color: #666; - font-size: 12px; + h3, h4 { + margin-top: $lineheight; + margin-bottom: $lineheight/2; } .icon.close { @@ -937,7 +937,7 @@ header .search_form { } } -/* Rules for search results which appear in the popout sidebar */ +/* Rules for search sidebar */ .search_results_entry { ul li { @@ -959,6 +959,7 @@ header .search_form { } /* Rules for entity history */ + #sidebar_content { .browse_details { position: relative; @@ -970,7 +971,7 @@ header .search_form { display: none; } -/* Rules for the changeset list shown by the history tab */ +/* Rules for the history sidebar */ #sidebar .changesets { li { @@ -980,34 +981,32 @@ header .search_form { &.selected { background: #FFFFE6; } /* color is derived from changeset bbox fillColor in history.js */ - - h4 { - padding: 0; - } } - .comment a { - font-weight: 500; - color: #000; + h4 { + margin-top: 0; + a { + color: #000; + } } } -/* Rules for the data browser */ +/* Rules for the browse sidebar */ #sidebar_content { .browse-section { - padding: 10px 20px; + padding: $lineheight; - h4 { - padding: 0; + h4:first-child { + margin-top: 0; } + } - .paginate { - float: right; - padding: 1px 6px; - border: 1px solid #eee; - border-radius: 3px; - } + .paginate { + float: right; + padding: 1px 6px; + border: 1px solid #eee; + border-radius: 3px; } .paginate ul { @@ -1037,11 +1036,9 @@ header .search_form { .browse-tag-list { background-color: #F6F6F6; - border-top: 1px solid #ddd; - border-bottom: 1px solid #ddd; + border: 1px solid #ddd; + border-radius: 3px; font-size: 12px; - margin-left: -$lineheight; - margin-right: -$lineheight; li { border-bottom: 1px solid #ddd; @@ -1056,7 +1053,7 @@ header .search_form { display: inline-block; width: 50%; float: left; - padding: 6px 10px 6px $lineheight; + padding: 6px 10px; } .browse-tag-k { @@ -1069,38 +1066,46 @@ header .search_form { background-color: #fff; } } -} -/* Rules for export information which appears in the popout sidebar */ + .warning { + margin: $lineheight/2 0; + padding: $lineheight/2; + font-size: 90%; + } -.export_bounds, .export_button { - text-align: center; + .note-comments li { + margin: $lineheight/2 0; + } } -.export_area_inputs { - margin-bottom: $lineheight/2; - input[type="text"] { - width: 80px; - margin-bottom: 5px; +/* Rules for export sidebar */ + +.export_form { + padding: $lineheight; + + .export_area_inputs, + .export_button { + text-align: center; } -} -.export_bound { - margin: $lineheight/4; -} + .export_area_inputs { + margin-bottom: $lineheight/2; + input[type="text"] { + width: 80px; + margin-bottom: 5px; + } + } -#export_osm { - span.small-title { - font-weight: 500; - display: block; - font-size: 14px; - padding-bottom: 5px; + .export_bound { + margin: $lineheight/4; + } + + .export_button { + margin-top: $lineheight; } dl { - padding-left: 30px; - font-size: 13px; - color: #666; + padding-left: $lineheight/2; dd { margin-left: 0; margin-bottom: 10px; @@ -2122,66 +2127,6 @@ a.button { } } -/* Rules for the notes interface */ - -.leaflet-popup-content .note { - padding-top: $lineheight/2; -} - -.leaflet-popup-content .note { - h2 { - margin-bottom: $lineheight/2; - } - - div { - margin-top: $lineheight/2; - } - - .permalink { - position: absolute; - top: $lineheight/4; - left: $lineheight/4; - min-width: 15px; - min-height: 15px; - } - - .permalink span { - display: none; - padding-left: $lineheight; - } - - .permalink:hover span { - display: block; - } - - .warning { - display: block; - background-color: #ffe0cc; - padding: 4px 6px; - margin-bottom: $lineheight/2; - } - - .comment_body { - margin-top: 2px; - margin-bottom: 2px; - - p { - margin-top: 0px; - margin-bottom: 0px; - } - } - - .comment { - width: 100%; - height: 100px; - } - - .buttons { - margin-top: $lineheight/4; - text-align: right; - } -} - /* Rules for the iD editor */ .id-embed { diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb index 0f731875b..593215f29 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -1,30 +1,32 @@ -
+

<% if common_details.changeset.tags['comment'].present? %> <%= linkify(h(common_details.changeset.tags['comment'])) %> <% else %> (no comment) <% end %> -

- <% if common_details.visible? %> - <%= t 'browse.common_details.edited' %> - <% else %> - <%= t 'browse.common_details.deleted' %> - <% end %> - <%= distance_of_time_in_words_to_now(common_details.timestamp) %> ago +

- <% if common_details.changeset.user.data_public? %> - <%= t 'browse.common_details.by' %> - <%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %> - <% end %> - +
+ <% if common_details.visible? %> + <%= t 'browse.common_details.edited' %> + <% else %> + <%= t 'browse.common_details.deleted' %> + <% end %> + + <%= distance_of_time_in_words_to_now(common_details.timestamp) %> ago + + <% if common_details.changeset.user.data_public? %> + <%= t 'browse.common_details.by' %> + <%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %> + <% 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.version' %> + #<%= h(common_details.version) %> + · + <%= t 'browse.common_details.in_changeset' %> + #<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>
<%= render :partial => "tag_details", :object => common_details.tags %> diff --git a/app/views/browse/_node_details.html.erb b/app/views/browse/_node_details.html.erb index 60f6c01fa..2300e75cc 100644 --- a/app/views/browse/_node_details.html.erb +++ b/app/views/browse/_node_details.html.erb @@ -1,21 +1,21 @@ -
-<% 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.redacted? %> + <%= t 'browse.redacted.message_html', + :type => t('browse.redacted.type.node'), + :version => node_details.version, + :redaction_link => link_to(t('browse.redacted.redaction', + :id => node_details.redaction.id), node_details.redaction) %> + <% else %> + <%= render :partial => "common_details", :object => node_details %> - <% unless node_details.ways.empty? and node_details.containing_relation_members.empty? %> -
+ <% unless node_details.ways.empty? and node_details.containing_relation_members.empty? %>

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

    - <% node_details.ways.each do |way| %> -
  • <%= link_to h(printable_name(way)), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %>
    • - <% end %> - <%= render :partial => "containing_relation", :collection => node_details.containing_relation_members %> + <% node_details.ways.each do |way| %> +
  • <%= link_to h(printable_name(way)), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %>
    • + <% end %> + <%= render :partial => "containing_relation", :collection => node_details.containing_relation_members %>
-
+ <% end %> <% end %> -<% end %>
diff --git a/app/views/browse/_relation_details.html.erb b/app/views/browse/_relation_details.html.erb index 6e12f7f65..dcc694c18 100644 --- a/app/views/browse/_relation_details.html.erb +++ b/app/views/browse/_relation_details.html.erb @@ -1,23 +1,21 @@ -
-<% 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 %> +
+ <% if relation_details.redacted? %> + <%= t 'browse.redacted.message_html', + :type => t('browse.redacted.type.relation'), + :version => relation_details.version, + :redaction_link => link_to(t('browse.redacted.redaction', + :id => relation_details.redaction.id), relation_details.redaction) %>< + <% else %> + <%= render :partial => "common_details", :object => relation_details %> - <% unless relation_details.relation_members.empty? %> -
+ <% unless relation_details.relation_members.empty? %>

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

    <%= render :partial => "relation_member", :collection => relation_details.relation_members %>
-
- <% end %> + <% end %> - <% unless relation_details.containing_relation_members.empty? %> -
+ <% 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 %> -<% end %>
diff --git a/app/views/browse/_tag_details.html.erb b/app/views/browse/_tag_details.html.erb index eaf98b57b..090a23e7c 100644 --- a/app/views/browse/_tag_details.html.erb +++ b/app/views/browse/_tag_details.html.erb @@ -1,8 +1,6 @@ <% unless tag_details.empty? %> -
-

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

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

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

+
    + <%= render :partial => "tag", :collection => tag_details.sort %> +
<% end %> diff --git a/app/views/browse/_way_details.html.erb b/app/views/browse/_way_details.html.erb index 2ffa6573b..30e29d989 100644 --- a/app/views/browse/_way_details.html.erb +++ b/app/views/browse/_way_details.html.erb @@ -1,35 +1,33 @@ -
-<% 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 %> +
+ <% if way_details.redacted? %> + <%= t 'browse.redacted.message_html', + :type => t('browse.redacted.type.way'), + :version => way_details.version, + :redaction_link => link_to(t('browse.redacted.redaction', + :id => way_details.redaction.id), way_details.redaction) %> + <% else %> + <%= render :partial => "common_details", :object => way_details %> - <% unless way_details.way_nodes.empty? %> -
+ <% unless way_details.way_nodes.empty? %>

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

-
    - <% way_details.way_nodes.each do |wn| %> -
  • - <%= 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 %> -
-
- <% end %> +
    + <% way_details.way_nodes.each do |wn| %> +
  • + <%= 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 %> +
+ <% end %> - <% unless way_details.containing_relation_members.empty? %> -
+ <% unless way_details.containing_relation_members.empty? %>

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

    - <%= render :partial => "containing_relation", :collection => way_details.containing_relation_members %> + <%= render :partial => "containing_relation", :collection => way_details.containing_relation_members %>
-
+ <% end %> <% end %> -<% end %>
diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index 696a8ca89..eaa02af58 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -6,14 +6,12 @@
-

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

-

<%= changeset_details(@changeset) %>

-
+

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

+
<%= changeset_details(@changeset) %>
-<%= render :partial => "tag_details", :object => @changeset.tags.except('comment') %> + <%= render :partial => "tag_details", :object => @changeset.tags.except('comment') %> -<% unless @nodes.empty? %> -
+ <% unless @nodes.empty? %>

<%= type_and_paginated_count('node', @node_pages) %> <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %> @@ -23,11 +21,9 @@
  • <%= 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 %> -

    -<% end %> + <% end %> -<% unless @ways.empty? %> -
    + <% unless @ways.empty? %>

    <%= type_and_paginated_count('way', @way_pages) %> <%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %> @@ -37,11 +33,9 @@
  • <%= 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 %> -

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

    <%= type_and_paginated_count('relation', @relation_pages) %> <%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %> @@ -51,11 +45,11 @@
  • <%= 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 %> -

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

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

    + <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %>
    diff --git a/app/views/browse/new_note.html.erb b/app/views/browse/new_note.html.erb index ae8262867..1b01e4375 100644 --- a/app/views/browse/new_note.html.erb +++ b/app/views/browse/new_note.html.erb @@ -6,7 +6,7 @@
    -

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

    +

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

    diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb index 8847adb19..b5f65339d 100644 --- a/app/views/browse/node.html.erb +++ b/app/views/browse/node.html.erb @@ -1,18 +1,17 @@ <% -@name = printable_name @node -set_title(t('browse.node.node') + ' | ' + @name) + @name = printable_name @node + set_title(t('browse.node.node') + ' | ' + @name) %>

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

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

    <%= link_to(t('browse.node.download_xml'), :controller => "node", :action => "read") %> - · +
    + <%= link_to(t('browse.node.download_xml'), :controller => "node", :action => "read") %> + · <%= link_to(t('browse.node.view_history'), :action => "node_history") %> -

    diff --git a/app/views/browse/node_history.html.erb b/app/views/browse/node_history.html.erb index c476b23ba..ed7569561 100644 --- a/app/views/browse/node_history.html.erb +++ b/app/views/browse/node_history.html.erb @@ -1,19 +1,19 @@ <% -@name = printable_name @node -set_title(t('browse.node_history.node_history') + ' | ' + @name) + @name = printable_name @node + set_title(t('browse.node_history.node_history') + ' | ' + @name) %>

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

    <% @node.old_nodes.reverse.each do |node| %> <%= render :partial => "node_details", :object => node %> <% end %> -
    - <%= link_to(t('browse.node_history.download_xml'), :controller => "old_node", :action => "history") %> - · - <%= 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/note.html.erb b/app/views/browse/note.html.erb index 12842f87c..7f863fef4 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -4,63 +4,50 @@ <%= t "browse.note.#{@note.status}_title", :note_name => @note.id %> +
    -

    +

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

    +
    <%= note_event('open', @note.created_at, @note.author) %> <% if @note.status == "closed" %>
    <%= note_event(@note.status, @note.closed_at, @note.comments.last.author) %> <% end %> - -
    - -<% if @note.comments.find { |comment| comment.author.nil? } -%> -
    -

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

    -
    -<% 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 %> -
    -
      - <% @note.comments[1..-1].each do |comment| %> -
    • - <%= note_event(comment.event, comment.created_at, comment.author) %> - <%= comment.body.to_html %> -
      • - <% end %> -
    -
    -<% end %> -
    - <% if @note.status == "open" %> - - -
    - - - + <% if @note.comments.length > 1 %> +
    +
      + <% @note.comments[1..-1].each do |comment| %> +
    • + <%= note_event(comment.event, comment.created_at, comment.author) %> + <%= comment.body.to_html %> +
      • + <% end %> +
    - + <% end %> + + <% if @note.status == "open" %> +
    + +
    + + + +
    +
    <% else %> -
    - -
    - - -
    -
    +
    + +
    + + +
    +
    <% end %>
    diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb index 44baa48de..2587fe01b 100644 --- a/app/views/browse/relation.html.erb +++ b/app/views/browse/relation.html.erb @@ -1,16 +1,17 @@ <% -@name = printable_name @relation -set_title(t('browse.relation.relation') + ' | ' + @name) + @name = printable_name @relation + set_title(t('browse.relation.relation') + ' | ' + @name) %>

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

    <%= render :partial => "relation_details", :object => @relation %> -
    - <%= link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read") %> - <%= 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 144c7d476..6481d490a 100644 --- a/app/views/browse/relation_history.html.erb +++ b/app/views/browse/relation_history.html.erb @@ -1,18 +1,19 @@ <% -@name = printable_name @relation -set_title(t('browse.relation_history.relation_history') + ' | ' + @name) + @name = printable_name @relation + set_title(t('browse.relation_history.relation_history') + ' | ' + @name) %>

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

    <% @relation.old_relations.reverse.each do |relation| %> <%= render :partial => "relation_details", :object => relation %> <% end %> -
    - <%= link_to(t('browse.relation_history.download_xml'), :controller => "old_relation", :action => "history") %> - <%= 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 619b9314b..bd7b4d07a 100644 --- a/app/views/browse/way.html.erb +++ b/app/views/browse/way.html.erb @@ -1,17 +1,17 @@ <% -@name = printable_name @way -set_title(t('browse.way.way') + ' | ' + @name) + @name = printable_name @way + set_title(t('browse.way.way') + ' | ' + @name) %> +

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

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

    <%= 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.download_xml'), :controller => "way", :action => "read") %> + · + <%= link_to(t('browse.way.view_history'), :action => "way_history") %>
    diff --git a/app/views/browse/way_history.html.erb b/app/views/browse/way_history.html.erb index 6e234454d..307608e46 100644 --- a/app/views/browse/way_history.html.erb +++ b/app/views/browse/way_history.html.erb @@ -1,19 +1,19 @@ <% -@name = printable_name @way -set_title(t('browse.way_history.way_history') + ' | ' + @name) + @name = printable_name @way + set_title(t('browse.way_history.way_history') + ' | ' + @name) %>

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

    <% @way.old_ways.reverse.each do |way| %> <%= render :partial => "way_details", :object => way %> <% end %> -
    - <%= link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history") %> - · - <%= 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/app/views/changeset/_changeset.html.erb b/app/views/changeset/_changeset.html.erb index 3f2cb319b..52bc3be0d 100644 --- a/app/views/changeset/_changeset.html.erb +++ b/app/views/changeset/_changeset.html.erb @@ -13,14 +13,14 @@ %> <%= 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 'changeset.changeset.no_comment' %> - <% end %> - -

    -

    <%= changeset_details(changeset) %>

    +

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

    +
    <%= changeset_details(changeset) %>
    <% end %> diff --git a/app/views/changeset/list.html.erb b/app/views/changeset/list.html.erb index b6200a8ba..b0ccf67dc 100644 --- a/app/views/changeset/list.html.erb +++ b/app/views/changeset/list.html.erb @@ -7,7 +7,7 @@ <%= image_tag "searching.gif", :class => "loader", :style => "display: none;" %>
    <% elsif params[:max_id] %> -

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

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

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

    +
    <%= t('changeset.list.empty') %>
    <% end %> diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb index 168f7d439..475313399 100644 --- a/app/views/site/export.html.erb +++ b/app/views/site/export.html.erb @@ -1,48 +1,46 @@ <% set_title(t('export.title')) %> +

    <%= t 'export.start_rjs.export' %>

    -<%= form_tag :controller => "export", :action => "finish" do %> +<%= 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' %> +
    + <%= 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.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.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.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.metro.title' %>
    +
    <%= t'export.start.too_large.metro.description' %>
    -
    <%= t'export.start.too_large.other.title' %>
    -
    <%= t'export.start.too_large.other.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/config/locales/en.yml b/config/locales/en.yml index db6614cb0..1e3da2ad7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -166,7 +166,7 @@ en: note: "Edit note" node_details: coordinates: "Coordinates:" - part_of: "Part of:" + part_of: "Part of" node_history: node_history: "Node History" node_history_title: "Node History: %{node_name}" @@ -200,8 +200,8 @@ en: way: "way" relation: "relation" relation_details: - members: "Members:" - part_of: "Part of:" + members: "Members" + part_of: "Part of" relation_history: relation_history: "Relation History" relation_history_title: "Relation History: %{relation_name}" @@ -264,8 +264,8 @@ en: 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:" + nodes: "Nodes" + part_of: "Part of" also_part_of: one: "part of way %{related_ways}" other: "part of ways %{related_ways}"