From 33a6b79bd78f1903011367f6a5adf2f91d160f74 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 16 Jul 2013 15:59:09 -0700 Subject: [PATCH 001/270] Add help page --- app/assets/stylesheets/common.css.scss | 43 +++++++++++++++++++++++++- app/controllers/site_controller.rb | 3 ++ app/views/layouts/site.html.erb | 10 ++---- app/views/site/help.html.erb | 12 +++++++ config/locales/en.yml | 31 +++++++++++++------ config/routes.rb | 1 + 6 files changed, 83 insertions(+), 17 deletions(-) create mode 100644 app/views/site/help.html.erb diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 42467adb3a..c9b7046f97 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -1108,7 +1108,8 @@ ul.results-list li { border-bottom: 1px solid #ccc; } .user-terms, .user-confirm, .site-copyright, -.site-welcome { +.site-welcome, +.site-help { #content { max-width: 740px; } @@ -2559,3 +2560,43 @@ a.button { border-radius: 4px; } } + +.site-help { + #content { + a { + display: inline-block; + width: 45%; + height: 200px; + float: left; + text-align: center; + color: #000; + margin: 10px; + padding: 10px; + border-radius: 10px; + } + + h3 { + margin-top: 50px; + } + + a:hover { + text-decoration: none; + } + + .welcome { + background-color: #D6FFB9; + } + + .learnosm { + background-color: #BAFCFF; + } + + .help { + background-color: #FCFFB9; + } + + .wiki { + background-color: #FFB9CC; + } + } +} diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 280f39fd8c..4945aaa4ff 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -71,6 +71,9 @@ def copyright def welcome end + def help + end + def preview render :text => RichText.new(params[:format], params[:text]).to_html end diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb index ed8a6cf188..4612572077 100644 --- a/app/views/layouts/site.html.erb +++ b/app/views/layouts/site.html.erb @@ -39,13 +39,6 @@ <% end %> <% if @user %> <%= render :partial => "layouts/user_menu" %> diff --git a/app/views/site/about.html.erb b/app/views/site/about.html.erb new file mode 100644 index 0000000000..59d0db062d --- /dev/null +++ b/app/views/site/about.html.erb @@ -0,0 +1,43 @@ +<% content_for :head do %> + <%= javascript_include_tag "about" %> +<% end %> + +
+
+
+ <%= t "about_page.copyright_html" %> +
+ +
+ + + <%= raw t "about_page.used_by", :name => "OpenStreetMap" %> + +
+ +
+
+

<%= t "about_page.lede_text" %>

+

<%= t "about_page.local_knowledge_title" %>

+

<%= t "about_page.local_knowledge_html" %>

+
+ +
+

<%= t "about_page.community_driven_title" %>

+

<%= t "about_page.community_driven_html", :diary_path => diary_path %>

+
+ +
+

<%= t "about_page.open_data_title" %>

+

<%= t "about_page.open_data_html", :copyright_path => copyright_path %>

+
+
+
+ +<% 5.times do |i| %> +
+ <%= t "about_page.photo_caption_#{i}_html" %> +
+<% end %> + + diff --git a/config/locales/en.yml b/config/locales/en.yml index 06e6442ff1..af3951edc7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1190,6 +1190,53 @@ en: 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: | + OSM is built by a community of local mappers that keeps data about + roads, cafés, subway stations, and much more up to date every day. + 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 up to date and accurate. + community_driven_title: Community Driven + community_driven_html: | + From the engineers that tune OSM's servers to the Humanitarian OSM Team + that maps disaster-affected areas, OSM's community is diverse, + passionate, and growing every day. 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. + photo_caption_0_html: | + @mikel working on + Map Kibera, a project to map the + largest slum in Nairobi, Kenya. + © watato + 2010 + photo_caption_1_html: | + @lxbarth and + @limareis survey Brasilia with + walking papers. + © mapbox + 2012 + photo_caption_2_html: | + @TODO caption (source) + photo_caption_3_html: | + @TODO caption (source) + photo_caption_4_html: | + @TODO caption (source) + photo_caption_5_html: | + @TODO caption (source) notifier: diary_comment_notification: subject: "[OpenStreetMap] %{user} commented on your diary entry" diff --git a/config/routes.rb b/config/routes.rb index a1321d7f25..1e0f508a1a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -127,6 +127,7 @@ 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#export', :via => :get From a8b68a751e91342c360962ae137bc6c958104bb5 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 1 Oct 2013 16:33:43 -0700 Subject: [PATCH 019/270] Inline edit menu partial, refine CSS --- app/assets/stylesheets/common.css.scss | 8 ++++---- app/views/layouts/_edit_menu.html.erb | 19 ------------------- app/views/layouts/_header.html.erb | 18 +++++++++++++++--- 3 files changed, 19 insertions(+), 26 deletions(-) delete mode 100644 app/views/layouts/_edit_menu.html.erb diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 7395afc998..6bdec29889 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -351,11 +351,11 @@ nav.primary { } .dropdown-toggle { - padding: 5px 10px 5px 5px; + display: inline-block; + padding: 6px 10px 4px 10px; } .caret { - margin-top: 15px; border-top-color: $green; } @@ -2225,7 +2225,7 @@ a.button { .dropdown-submenu:focus > a { color: #ffffff; text-decoration: none; - background-color: #0081c2; + background-color: $green; } .dropdown-menu > .active > a, @@ -2233,7 +2233,7 @@ a.button { .dropdown-menu > .active > a:focus { color: #ffffff; text-decoration: none; - background-color: #0081c2; + background-color: $green; outline: 0; } diff --git a/app/views/layouts/_edit_menu.html.erb b/app/views/layouts/_edit_menu.html.erb deleted file mode 100644 index b7d9d7fdfe..0000000000 --- a/app/views/layouts/_edit_menu.html.erb +++ /dev/null @@ -1,19 +0,0 @@ -
- <%= link_to link_text, edit_path, - :id => 'editanchor', - :data => { :editor => preferred_editor }, - :class => "geolink tab #{link_class}" %> - - - -
    - <% Editors::RECOMMENDED_EDITORS.each do |editor| %> -
  • - <%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")), - edit_path(:editor => editor), - :data => { :editor => editor }, - :class => "geolink #{link_class}" %> -
    • - <% end %> -
-
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 58185bb5ad..1edbf7e5cb 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -11,9 +11,21 @@ <%= link_to t('layouts.history'), browse_changesets_path, :class => 'tab geolink llz' %>
  • <%= link_to t('layouts.export'), export_path, :class => 'tab geolink llz' %> -
  • - <%= render :partial => 'layouts/edit_menu', - :locals => { :link_text => t('layouts.edit'), :link_class => 'llz object' }%> +
    • From d359cd70f1527b372b71c2f927e3f45fb0fcf509 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 1 Oct 2013 17:06:28 -0700 Subject: [PATCH 020/270] Refine user menu CSS --- app/assets/stylesheets/common.css.scss | 39 +++++++++++++++----------- app/views/layouts/_inbox.html.erb | 4 +-- app/views/layouts/_user_menu.html.erb | 5 ++-- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 6bdec29889..dc8c12b707 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -392,11 +392,17 @@ nav.secondary { position: absolute; right: 0; - > ul a { + > ul { + margin-right: 10px; + } + + > ul a, + .dropdown-toggle { + display: inline-block; font-weight: bold; text-decoration: none; color: $darkgrey; - padding-right: 10px; + padding: 5px 5px; } .dropdown { @@ -404,27 +410,26 @@ nav.secondary { border-radius: 4px; } - img { + .caret { + border-top-color: $grey; + margin-top: 10px; + margin-right: 5px; + } + + img.user_thumbnail_tiny { + border: 0; vertical-align: top; + margin: 2px 0 0 3px; border-radius: 2px 0 0 2px; - margin-right: 5px; } #inboxanchor { display: inline-block; - position: relative; + vertical-align: top; height: 20px; - top: -2px; - margin: 0 2px 0 0; - padding: 0 5px 0 0; - border-radius: 2px; - } - - .dropdown-toggle { - display: block; - padding: 3px 7px; - color: #000; - text-decoration: none; + margin: 2px 7px 0 0; + background-color: $grey; + border-radius: 0 2px 2px 0; } .dropdown-menu { @@ -713,7 +718,7 @@ nav.secondary { } .leaflet-top.leaflet-right { - top: 10px !important; + top: $lineheight !important; .leaflet-control { margin-right: 0px !important; margin-top: 0px !important; diff --git a/app/views/layouts/_inbox.html.erb b/app/views/layouts/_inbox.html.erb index d4054dfaf0..fbebe3fc19 100644 --- a/app/views/layouts/_inbox.html.erb +++ b/app/views/layouts/_inbox.html.erb @@ -1,3 +1 @@ - - <%= user_thumbnail_tiny(@user, :size => 20, :width => 20, :height => 20) %><%= @user.new_messages.size %> - \ No newline at end of file +<%= @user.new_messages.size %> \ No newline at end of file diff --git a/app/views/layouts/_user_menu.html.erb b/app/views/layouts/_user_menu.html.erb index 3b45ade304..a2b09cc806 100644 --- a/app/views/layouts/_user_menu.html.erb +++ b/app/views/layouts/_user_menu.html.erb @@ -1,7 +1,8 @@
    - <%= render :partial => 'layouts/inbox' %> - <%= @user.display_name %> + <%= user_thumbnail_tiny(@user, :size => 20, :width => 20, :height => 20) + %><%= render :partial => 'layouts/inbox' + %><%= @user.display_name %>
      From 37f42141283fb14cea0456344cc6ca6a4fa585c4 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 1 Oct 2013 17:33:43 -0700 Subject: [PATCH 021/270] Remove edit links --- app/views/browse/node.html.erb | 3 --- app/views/browse/way.html.erb | 1 - 2 files changed, 4 deletions(-) diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb index 30662c13f6..deae710db1 100644 --- a/app/views/browse/node.html.erb +++ b/app/views/browse/node.html.erb @@ -16,9 +16,6 @@
      • <%= link_to(t('browse.node.download_xml'), :controller => "node", :action => "read") %>
      • <%= link_to(t('browse.node.view_history'), :action => "node_history") %>
        • - <% if @node.visible -%> -
      • <%= link_to(t('browse.node.edit'), :controller => "site", :action => "edit", :lat => @node.lat, :lon => @node.lon, :zoom => 18, :node => @node.id) %>
        • - <% end -%>
      <% end %> diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb index 1be783a88f..f6e8b7f018 100644 --- a/app/views/browse/way.html.erb +++ b/app/views/browse/way.html.erb @@ -16,7 +16,6 @@
      • <%= 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 %> From daf55682f8d2a2f7f5c424beb67aeca60f57f4f5 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 2 Oct 2013 10:37:04 -0700 Subject: [PATCH 022/270] Remove unused --- app/assets/stylesheets/common.css.scss | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index dc8c12b707..709d5fd981 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -1405,19 +1405,6 @@ body.browse #sidebar_content { margin-bottom: $lineheight; overflow: auto; height: 10em; - - &:p#last { - margin-bottom: 0px; - } - - &:ol { - margin-bottom: 0px; - } - - &:img { - display: block; - margin: $lineheight auto inherit auto; - } } #decline { @@ -1727,12 +1714,6 @@ img.user_thumbnail_tiny { border: 1px solid #ccc; } -/* Rule for "nowrap" class that can be applied to anything to stop wrapping */ - -.nowrap { - white-space: nowrap; -} - /* Rules for geo microformats */ abbr.geo { @@ -1771,10 +1752,6 @@ ul.secondary-actions { margin-right: 0px; } } - .dropdown-menu { - left: auto; - right: 0; - } } /* Utility for managing inner content areas */ From 2d9a083b365e5cfa527c40add35464630c1a9b00 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 2 Oct 2013 10:50:00 -0700 Subject: [PATCH 023/270] Refine header --- app/assets/stylesheets/common.css.scss | 58 ++++++++++++++------- app/views/layouts/_header.html.erb | 72 ++++++++++++++++++-------- app/views/layouts/_user_menu.html.erb | 29 ----------- 3 files changed, 90 insertions(+), 69 deletions(-) delete mode 100644 app/views/layouts/_user_menu.html.erb diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 709d5fd981..1fd2733bbb 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -319,40 +319,53 @@ header { float: left; } + a, a:hover { + text-decoration: none; + } + img.logo { - width: 30px; - height: 30px; + width: 40px; + height: 40px; vertical-align: middle; } h1 { margin: 0; border-right: $keyline; + + a { + color: #000; + } } } nav.primary { > ul { - border: 1px solid darken($green, 20%); + $border: 1px solid darken($green, 20%); + + border: $border; border-radius: 4px; + + > li { + border-right: $border; + &:last-child { border-right: 0; } + } } - a.tab { + a.tab, + .dropdown-toggle { display: inline-block; font-weight: bold; - text-decoration: none; color: $green; padding: 5px 15px; - border-right: 1px solid darken($green, 20%); } - #edit_tab a.tab { - border-right: 1px solid lighten($green, 20%); + .dropdown-toggle { + padding: 5px 10px; } - .dropdown-toggle { - display: inline-block; - padding: 6px 10px 4px 10px; + #edit_tab a.tab { + border-right: 1px solid lighten($green, 20%); } .caret { @@ -392,10 +405,6 @@ nav.secondary { position: absolute; right: 0; - > ul { - margin-right: 10px; - } - > ul a, .dropdown-toggle { display: inline-block; @@ -405,21 +414,32 @@ nav.secondary { padding: 5px 5px; } - .dropdown { - border: 1px solid $grey; + .user-menu { + $border: 1px solid $grey; + + border: $border; border-radius: 4px; + margin-left: 10px; + + > li { + border-right: $border; + &:last-child { border-right: 0; } + } + + a { + padding: 5px 15px; + } } .caret { border-top-color: $grey; margin-top: 10px; - margin-right: 5px; } img.user_thumbnail_tiny { border: 0; vertical-align: top; - margin: 2px 0 0 3px; + margin-top: 2px; border-radius: 2px 0 0 2px; } diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 1edbf7e5cb..c4f2ebad6d 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -1,31 +1,33 @@

      - <%= image_tag "osm_logo.png", :alt => t('layouts.logo.alt_text'), :class => 'logo' %> - <%= t 'layouts.project_name.h1' %> + + <%= image_tag "osm_logo.png", :alt => t('layouts.logo.alt_text'), :class => 'logo' %> + <%= t 'layouts.project_name.h1' %> +

      @@ -37,11 +39,39 @@
    • <%= link_to t('layouts.about'), about_path %>
    <% if @user %> - <%= render :partial => "layouts/user_menu" %> +
    + + <%= user_thumbnail_tiny(@user, :size => 20, :width => 20, :height => 20) + %><%= render :partial => 'layouts/inbox' + %><%= @user.display_name %> + + +
      +
    • + <%= link_to inbox_path(:display_name => @user.display_name) do %> + <%= number_with_delimiter(@user.new_messages.size) %> + <%= t('message.inbox.my_inbox') %> + <% end %> +
      • +
    • + <%= link_to t('user.view.my profile'), user_path(:display_name => @user.display_name) %> +
      • +
    • + <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %> +
      • +
    • +
    • + <%= yield :greeting %> +
      • +
    • + <%= link_to t('layouts.logout'), logout_path(:session => request.session_options[:id], :referer => request.fullpath) %> +
      • +
    +
    <% else %> -
      -
    • <%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath), {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %>
      • -
    • <%= link_to t('layouts.sign_up'), user_new_path, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %>
      • +
        +
      • <%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath) %>
        • +
      • <%= link_to t('layouts.sign_up'), user_new_path %>
      <% end %> diff --git a/app/views/layouts/_user_menu.html.erb b/app/views/layouts/_user_menu.html.erb deleted file mode 100644 index a2b09cc806..0000000000 --- a/app/views/layouts/_user_menu.html.erb +++ /dev/null @@ -1,29 +0,0 @@ -
      - - <%= user_thumbnail_tiny(@user, :size => 20, :width => 20, :height => 20) - %><%= render :partial => 'layouts/inbox' - %><%= @user.display_name %> - - -
        -
      • - <%= link_to inbox_path(:display_name => @user.display_name) do %> - <%= number_with_delimiter(@user.new_messages.size) %> - <%= t('message.inbox.my_inbox') %> - <% end %> -
        • -
      • - <%= link_to t('user.view.my profile'), user_path(:display_name => @user.display_name) %> -
        • -
      • - <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %> -
        • -
      • -
      • - <%= yield :greeting %> -
        • -
      • - <%= link_to t('layouts.logout'), logout_path(:session => request.session_options[:id], :referer => request.fullpath) %> -
        • -
      -
      From 4cc2b63d5c38158e6beb114147be723425ec412e Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 2 Oct 2013 11:03:20 -0700 Subject: [PATCH 024/270] Factor javascript include tag to layout --- app/views/browse/changeset.html.erb | 1 - app/views/browse/node.html.erb | 1 - app/views/browse/node_history.html.erb | 1 - app/views/browse/note.html.erb | 1 - app/views/browse/relation.html.erb | 1 - app/views/browse/relation_history.html.erb | 1 - app/views/browse/way.html.erb | 1 - app/views/browse/way_history.html.erb | 1 - app/views/changeset/list.html.erb | 1 - app/views/layouts/map.html.erb | 4 ++++ app/views/site/export.html.erb | 4 ---- app/views/site/index.html.erb | 4 ---- 12 files changed, 4 insertions(+), 17 deletions(-) diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index 36d8734a13..05e3d43912 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -1,6 +1,5 @@ <% content_for :head do %> <%= stylesheet_link_tag 'browse' %> - <%= javascript_include_tag 'index' %> <% end %> <% content_for :sidebar do %> diff --git a/app/views/browse/node.html.erb b/app/views/browse/node.html.erb index deae710db1..92ccb775de 100644 --- a/app/views/browse/node.html.erb +++ b/app/views/browse/node.html.erb @@ -5,7 +5,6 @@ <% content_for :head do %> <%= stylesheet_link_tag 'browse' %> - <%= javascript_include_tag 'index' %> <% end %> <% content_for :sidebar do %> diff --git a/app/views/browse/node_history.html.erb b/app/views/browse/node_history.html.erb index 98b6745e42..6f1a3f0b74 100644 --- a/app/views/browse/node_history.html.erb +++ b/app/views/browse/node_history.html.erb @@ -5,7 +5,6 @@ <% content_for :head do %> <%= stylesheet_link_tag 'browse' %> - <%= javascript_include_tag 'index' %> <% end %> <% content_for :sidebar do %> diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb index 90c1f358d9..8ccd525a3d 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -1,6 +1,5 @@ <% content_for :head do %> <%= stylesheet_link_tag 'browse' %> - <%= javascript_include_tag 'index' %> <% end %> <% content_for :sidebar do %> diff --git a/app/views/browse/relation.html.erb b/app/views/browse/relation.html.erb index 9d1cee107e..1e3af0df29 100644 --- a/app/views/browse/relation.html.erb +++ b/app/views/browse/relation.html.erb @@ -5,7 +5,6 @@ <% content_for :head do %> <%= stylesheet_link_tag 'browse' %> - <%= javascript_include_tag 'index' %> <% end %> <% content_for :sidebar do %> diff --git a/app/views/browse/relation_history.html.erb b/app/views/browse/relation_history.html.erb index c22df2f1e7..5f419e6c7a 100644 --- a/app/views/browse/relation_history.html.erb +++ b/app/views/browse/relation_history.html.erb @@ -5,7 +5,6 @@ <% content_for :head do %> <%= stylesheet_link_tag 'browse' %> - <%= javascript_include_tag 'index' %> <% end %> <% content_for :sidebar do %> diff --git a/app/views/browse/way.html.erb b/app/views/browse/way.html.erb index f6e8b7f018..e5493d3f98 100644 --- a/app/views/browse/way.html.erb +++ b/app/views/browse/way.html.erb @@ -5,7 +5,6 @@ <% content_for :head do %> <%= stylesheet_link_tag 'browse' %> - <%= javascript_include_tag 'index' %> <% end %> <% content_for :sidebar do %> diff --git a/app/views/browse/way_history.html.erb b/app/views/browse/way_history.html.erb index 8bc50e3070..7fe4feeb27 100644 --- a/app/views/browse/way_history.html.erb +++ b/app/views/browse/way_history.html.erb @@ -5,7 +5,6 @@ <% content_for :head do %> <%= stylesheet_link_tag 'browse' %> - <%= javascript_include_tag 'index' %> <% end %> <% content_for :sidebar do %> diff --git a/app/views/changeset/list.html.erb b/app/views/changeset/list.html.erb index 19707cd3f2..965b66484b 100644 --- a/app/views/changeset/list.html.erb +++ b/app/views/changeset/list.html.erb @@ -1,5 +1,4 @@ <% content_for :head do -%> - <%= javascript_include_tag "index" %> <%= javascript_include_tag "changeset" %> <% unless params[:friends] or params[:nearby] -%> diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb index cedfdb9c2b..09c7d0d8e9 100644 --- a/app/views/layouts/map.html.erb +++ b/app/views/layouts/map.html.erb @@ -1,3 +1,7 @@ +<% content_for :head do %> + <%= javascript_include_tag "index" %> +<% end %> + <% content_for :content do %> <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index af3951edc7..01139aa4dd 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1410,6 +1410,8 @@ en: close: Close search: search: Search + where_am_i: "Where am I?" + where_am_i_title: Describe the current location using the search engine submit_text: "Go" key: table: From ad7bc7415bd3d2dfde8eec3800c3936e6a3db31e Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 2 Oct 2013 11:17:55 -0700 Subject: [PATCH 026/270] Remove unused --- app/assets/javascripts/edit.js | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/app/assets/javascripts/edit.js b/app/assets/javascripts/edit.js index b03b71154e..8800195b35 100644 --- a/app/assets/javascripts/edit.js +++ b/app/assets/javascripts/edit.js @@ -5,25 +5,3 @@ function maximiseMap() { function minimiseMap() { $("#content").removeClass("maximised"); } - -$(document).ready(function () { - $("#search_form").submit(function (e) { - e.preventDefault(); - - $("#sidebar_content").load($(this).attr("action"), { - query: $("#query").val() - }); - }); - - $("#describe_location").click(function (e) { - e.preventDefault(); - - var mapParams = OSM.mapParams(); - - $("#sidebar_content").load($(this).attr("href"), { - lat: mapParams.lat, - lon: mapParams.lon, - zoom: mapParams.zoom - }); - }); -}); From d3bf4149e09053436d8d266952c49bb8f7ef6946 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 2 Oct 2013 11:22:56 -0700 Subject: [PATCH 027/270] Don't autofocus search, fade out "Where am I?" on focus --- app/assets/javascripts/index/search.js | 12 +++++++----- app/views/layouts/map.html.erb | 3 +-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js index ce00fa0aff..c546469db9 100644 --- a/app/assets/javascripts/index/search.js +++ b/app/assets/javascripts/index/search.js @@ -6,11 +6,13 @@ function initializeSearch(map) { $("#search_form").submit(); } - // Focus the search field for browsers that don't support - // the HTML5 'autofocus' attribute - if (!("autofocus" in document.createElement("input"))) { - $("#query").focus(); - } + $("#query") + .on("focus", function() { + $("#describe_location").fadeOut(100); + }) + .on("blur", function() { + $("#describe_location").fadeIn(100); + }); $("#sidebar_content").on("click", ".search_results_entry a.set_position", clickSearchResult); diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb index 55953f004e..7019224861 100644 --- a/app/views/layouts/map.html.erb +++ b/app/views/layouts/map.html.erb @@ -8,8 +8,7 @@ <%= submit_tag t('site.search.submit_text') %>
      <%= text_field_tag :query, params[:query], - :placeholder => t('site.search.search'), - :autofocus => "autofocus" %> + :placeholder => t('site.search.search') %> <%= link_to t('site.search.where_am_i'), { :controller => :geocoder, :action => :description }, { :id => "describe_location", :title => t('site.search.where_am_i_title') } %> From 2ba4bf374454cb693d7562679031d49f278e5521 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 2 Oct 2013 11:52:56 -0700 Subject: [PATCH 028/270] Add current state to all nav elements --- app/assets/stylesheets/common.css.scss | 23 ++++++++++++----------- app/helpers/application_helper.rb | 4 ++++ app/views/layouts/_header.html.erb | 16 ++++++++-------- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 35a5ced5f2..8de88f478e 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -393,20 +393,17 @@ nav.primary { border-top-color: #ccc; } } -} -.site-index #view_tab, -.changeset-list #history_tab, -.site-export #export_tab, -.site-edit #edit_tab { - background-color: $green; + > ul li.current { + background-color: $green; - .tab { - color: #fff; - } + .tab { + color: #fff; + } - .caret { - border-top-color: #fff; + .caret { + border-top-color: #fff; + } } } @@ -423,6 +420,10 @@ nav.secondary { padding: 5px 5px; } + > ul li.current a { + color: darken($darkgrey, 25%); + } + .user-menu { $border: 1px solid $grey; diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 4765cb35b3..f74d5cbf29 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -96,4 +96,8 @@ def friendly_date(date) def body_class [params[:controller], "#{params[:controller]}-#{params[:action]}", @extra_body_class].compact.join(" ") end + + def current_page_class(path) + :current if current_page?(path) + end end diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index c4f2ebad6d..5a72eeeb37 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -7,9 +7,9 @@
    +
    + + From c65ec5c21f13ebc096400a07abdeaf317acbcef5 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Fri, 15 Nov 2013 10:37:27 -0800 Subject: [PATCH 209/270] Use html5shiv for IE8 compatibility --- Vendorfile | 4 + app/views/layouts/_head.html.erb | 1 + config/environments/production.rb | 1 + vendor/assets/javascripts/html5shiv.js | 301 +++++++++++++++++++++++++ 4 files changed, 307 insertions(+) create mode 100644 vendor/assets/javascripts/html5shiv.js diff --git a/Vendorfile b/Vendorfile index ec3ea6a141..136b47f728 100644 --- a/Vendorfile +++ b/Vendorfile @@ -50,4 +50,8 @@ folder 'vendor/assets' do file 'iD.js', 'dist/iD.js' end end + + folder 'javascripts' do + file 'html5shiv.js', 'https://raw.github.com/aFarkas/html5shiv/master/src/html5shiv.js' + end end diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb index a1f11f7005..46fe40f042 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -1,5 +1,6 @@ + <%= javascript_include_tag "application" %> <%= stylesheet_link_tag "small-#{dir}", :media => "only screen and (max-width:721px)" %> diff --git a/config/environments/production.rb b/config/environments/production.rb index 3eb08ac6c6..bbc06aac5a 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -75,6 +75,7 @@ config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.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/vendor/assets/javascripts/html5shiv.js b/vendor/assets/javascripts/html5shiv.js new file mode 100644 index 0000000000..94324d7c85 --- /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 Date: Fri, 15 Nov 2013 18:51:09 +0000 Subject: [PATCH 210/270] Use

    for the title of site#welcome to match other pages --- app/views/site/welcome.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb index 60c2a3c302..4edcf361eb 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" %>

    +

    <%= t "welcome_page.title" %>

    <% end %>

    <%= t "welcome_page.introduction_html" %>

    From b78de4b8b28b737f20d770255bc617eb2f9e2109 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 15 Nov 2013 19:01:33 +0000 Subject: [PATCH 211/270] Make the link from site#help to site#welcome use a relative URL --- config/locales/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 4ce5b721d0..7ee23f2f87 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1074,7 +1074,7 @@ en: OpenStreetMap has several resources for learning about the project, asking and answering questions, and collaboratively discussing and documenting mapping topics. welcome: - url: http://www.openstreetmap.org/welcome + url: /welcome title: Welcome to OSM description: Start with this quick guide covering the OpenStreetMap basics. help: From da67b49a7c2e39e23ae71c71ae54562b8a7a5d50 Mon Sep 17 00:00:00 2001 From: Aaron Lidman Date: Fri, 15 Nov 2013 11:13:16 -0800 Subject: [PATCH 212/270] Hide welcome section on help page if not logged in closes #67 --- app/views/site/help.html.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/site/help.html.erb b/app/views/site/help.html.erb index 412dfc7f65..a1b1adb922 100644 --- a/app/views/site/help.html.erb +++ b/app/views/site/help.html.erb @@ -5,6 +5,7 @@

    <%= t "help_page.introduction" %>

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

    @@ -13,4 +14,5 @@

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

    -<% end %> \ No newline at end of file + <% end %> +<% end %> From 4fe6da58a0f3401045866f92893c3222067715f6 Mon Sep 17 00:00:00 2001 From: Aaron Lidman Date: Fri, 15 Nov 2013 11:26:36 -0800 Subject: [PATCH 213/270] Hide control tooltips on #map-ui expansion, closes #55 --- app/assets/javascripts/leaflet.key.js | 1 + app/assets/javascripts/leaflet.layers.js | 1 + app/assets/javascripts/leaflet.share.js | 1 + 3 files changed, 3 insertions(+) diff --git a/app/assets/javascripts/leaflet.key.js b/app/assets/javascripts/leaflet.key.js index ea236a569e..58bfbf6d2a 100644 --- a/app/assets/javascripts/leaflet.key.js +++ b/app/assets/javascripts/leaflet.key.js @@ -56,6 +56,7 @@ L.OSM.key = function (options) { if (!button.hasClass('disabled')) { options.sidebar.togglePane($ui, button); } + $('.leaflet-control .control-button').tooltip('hide'); } function updateButton() { diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js index c506c951ea..b04216d269 100644 --- a/app/assets/javascripts/leaflet.layers.js +++ b/app/assets/javascripts/leaflet.layers.js @@ -171,6 +171,7 @@ L.OSM.layers = function(options) { e.stopPropagation(); e.preventDefault(); options.sidebar.togglePane($ui, button); + $('.leaflet-control .control-button').tooltip('hide'); } return $container[0]; diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js index 6a4491c2a7..d4c8295320 100644 --- a/app/assets/javascripts/leaflet.share.js +++ b/app/assets/javascripts/leaflet.share.js @@ -230,6 +230,7 @@ L.OSM.share = function (options) { update(); options.sidebar.togglePane($ui, button); + $('.leaflet-control .control-button').tooltip('hide'); } function toggleMarker() { From fcf12ebcfcc92a8c9a8d0899d70a9ac8591bd649 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Fri, 15 Nov 2013 15:04:46 -0800 Subject: [PATCH 214/270] Adjustments to about page and welcome copy --- config/locales/en.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index 7ee23f2f87..3d41392de2 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -887,7 +887,7 @@ en: edit_with: Edit with %{editor} tag_line: The Free Wiki World Map intro_header: Welcome to OpenStreetMap! - intro_text: OpenStreetMap is a free and editable map of the world maintained by an active community of contributors. + intro_text: OpenStreetMap is an editable map of the world created by people like you, and free to download and use under an open license. intro_2_create_account: "Create a user account" partners_html: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}." partners_ucl: "the UCL VR Centre" @@ -1090,19 +1090,20 @@ en: copyright_html: ©OpenStreetMap
    contributors used_by: "%{name} powers map data on hundreds of web sites, mobile apps, and hardware devices" lede_text: | - OSM is built by a community of local mappers that keeps data about - roads, cafés, subway stations, and much more up to date every day. + 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 up to date and accurate. + is accurate and up to date. community_driven_title: Community Driven community_driven_html: | - From the engineers that tune OSM's servers to the Humanitarian OSM Team - that maps disaster-affected areas, OSM's community is diverse, - passionate, and growing every day. To learn more about the community, - see the     user diaries, + 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 From b1a548d1de420b12bbd507d4c79c885fe7258d00 Mon Sep 17 00:00:00 2001 From: Aaron Lidman Date: Fri, 15 Nov 2013 15:06:36 -0800 Subject: [PATCH 215/270] Improved noteLayer and dataLayer availability, closes #65 --- app/assets/javascripts/index/browse.js | 16 +++++++--------- app/assets/javascripts/leaflet.layers.js | 8 ++++---- config/locales/en.yml | 2 +- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js index a47dd348e9..752c84fece 100644 --- a/app/assets/javascripts/index/browse.js +++ b/app/assets/javascripts/index/browse.js @@ -41,13 +41,9 @@ function initializeBrowse(map) { }); function updateData() { - if (map.getZoom() >= 15) { - var bounds = map.getBounds(); - if (!browseBounds || !browseBounds.contains(bounds)) { - browseBounds = bounds; - getData(); - } - } + var bounds = map.getBounds(); + getData(!browseBounds || !browseBounds.contains(bounds)); + browseBounds = bounds; } function displayFeatureWarning(count, limit, callback) { @@ -62,17 +58,19 @@ function initializeBrowse(map) { var dataLoader; - function getData() { + function getData(inPrevious) { var bounds = map.getBounds(); var size = bounds.getSize(); if (size > OSM.MAX_REQUEST_AREA) { $('#browse_status').html( $("

    ") - .text(I18n.t("browse.start_rjs.unable_to_load_size", { max_bbox_size: OSM.MAX_REQUEST_AREA, bbox_size: size }))); + .text(I18n.t("browse.start_rjs.unable_to_load_size", { max_bbox_size: OSM.MAX_REQUEST_AREA, bbox_size: size.toFixed(2) }))); return; } + if (inPrevious) return; + var url = "/api/" + OSM.API_VERSION + "/map?bbox=" + bounds.toBBoxString(); /* diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js index b04216d269..7703529b87 100644 --- a/app/assets/javascripts/leaflet.layers.js +++ b/app/assets/javascripts/leaflet.layers.js @@ -120,7 +120,7 @@ L.OSM.layers = function(options) { var list = $('
      ') .appendTo(overlaySection); - function addOverlay(layer, name, minZoom) { + function addOverlay(layer, name, maxArea) { var refName = name.split(' ').join('_').toLowerCase(); var item = $('
    • ') .attr('class', refName) @@ -153,7 +153,7 @@ L.OSM.layers = function(options) { }); map.on('zoomend', function() { - var disabled = map.getZoom() < minZoom + 1; + var disabled = map.getBounds().getSize() >= maxArea; $(input).prop('disabled', disabled); $(item).attr('class', disabled ? 'disabled' : ''); item.attr('data-original-title', disabled ? @@ -161,8 +161,8 @@ L.OSM.layers = function(options) { }); } - addOverlay(map.noteLayer, I18n.t('javascripts.map.layers.notes'), 10); - addOverlay(map.dataLayer, I18n.t('javascripts.map.layers.data'), 15); + addOverlay(map.noteLayer, I18n.t('javascripts.map.layers.notes'), OSM.MAX_NOTE_REQUEST_AREA); + addOverlay(map.dataLayer, I18n.t('javascripts.map.layers.data'), OSM.MAX_REQUEST_AREA); } options.sidebar.addPane($ui); diff --git a/config/locales/en.yml b/config/locales/en.yml index 3d41392de2..f33726357a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -173,7 +173,7 @@ en: start_rjs: 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..." tag_details: tags: "Tags" From a61f327ce11fb9ca5d8ba37652159ad78a700214 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Fri, 15 Nov 2013 15:28:25 -0800 Subject: [PATCH 216/270] Revert user page to full width for now --- app/assets/stylesheets/common.css.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index f88e0d1d2f..68eb17e423 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -1379,6 +1379,10 @@ header .search_form { } .user-view { + // Silly exception; remove when user page is redesigned. + .content-inner { + max-width: none; + } p#no_home_location { margin: $lineheight; } From f3973b3fa3c8c15e514c93ccd9a1213c76034855 Mon Sep 17 00:00:00 2001 From: Aaron Lidman Date: Fri, 15 Nov 2013 15:48:11 -0800 Subject: [PATCH 217/270] Don't render the user menu for users without ids, closed #68 --- app/views/layouts/_header.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index dbb9966b60..efe9efdf84 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -49,7 +49,7 @@
    - <% if @user %> + <% if @user && @user.id %>
    <%= user_thumbnail_tiny(@user, :size => 25, :width => 25, :height => 25) From a95348eba9e560b0f011bc9d7da40c935e19febf Mon Sep 17 00:00:00 2001 From: Aaron Lidman Date: Fri, 15 Nov 2013 16:11:44 -0800 Subject: [PATCH 218/270] Replace searching.gif with loader from iD --- app/assets/images/searching.gif | Bin 1849 -> 1715 bytes app/assets/stylesheets/common.css.scss | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/images/searching.gif b/app/assets/images/searching.gif index 5b33f7e54f4e55b6b8774d86d96895db9af044b4..b1451fd7d434215125d3b5bf2432edeef61dd740 100644 GIT binary patch literal 1715 zcmaLXc~FvR9Ki7xcp*TP%L5frP!SdL*l4WX*;Pd3vOuY{VsyTIyfsDB zP}9t-w6gUswb{`W4NX&Ysa88oyQa2m$~M;~7dCgd{@M5M=b8CD-{<+gL42<7hFuJR z0sP7WR#sN}`ufyrb#!zzjYbzkaRJXkNW~_2I(@y6)6F zBoawsVd2EYL`+OfXJ@Cgv-91%cgxDko;-Q-?%lhOA3u(ajNH3-ue7vudV2c){rgc- zQOnEAGMQ{}aImtna&&am)6;WlX{olhwx_3Oad9y*F|nI8jlGeR{WF)c}$yv z>veMNfsIw;4R5cc_^qF0r1>c$s&~Hp!_{JF_92du|>cRS@uyiBJ@<6y9=;o8-PLQuBi_{7i-T& zwX}UtaEE!@1i>Nbo;@!1eLNIq@0fsug-%XkNg`x_ZZaIn(@o7{MZZnY+@F0o|2P-U zn|KD*-+uJ_y_@d?F(|=}n~3Halw;(9oO<9x&OB}L(V5i9JKbHW8u74yIJ+HnHB6;V zl|a1EcebLO=nS*Ncxt#@QtM*sX141N0auJMB}cfiqmg8*4et{k&vor%5RP*TI9Ju} zjg#lZ)ga`*Rv-WZWPo63Rc>tMB&Xpw9n$XPB98H*htt@Nx2t1R7W9yddU+2y+i&e| zfy0%soCsPy+d-Mdj9qT(7=9K*<9JvlL?vxwN5_B`j)9ix2Qq=pk{so6b5UV}6BP*J z18(#@i&Mds2S`HabB&>vPEf4K#tWpkNU2T1HqLIc0U;6&(GJ6r;X}ia>*FKgx{=AL zFunHXtn0t#9 z(-dm&BD>Zvv&DhewK&@W_KeqA>@s0T+rqY?~Mf}t&dIN`^sRyJ4{@FJ)< zhEr7#oro?$G;Ds}rV%)+w%0wP;p%!ryt{6&Hy@vCeV_~RsqBbb+RaC2v#3sTMHrWq zmXyH)uu!L*+&mJs=wt>N4?9(XCrisKYVc=jYNcgoVW-s@hK_1uRP&S0V7JBPTsL|* zc(usfqOU(!Gvqih*iAb*3_7SCX%1_7UpSGgPL(m~PG1}Anj+&29Dmfhgz>EtJ$cjI zi*DR;?DC*kihX$KVFl$D8WK1y6M8*;@BNtiblIL1rZ}30O-)M=OU!~QybY9voU`8Rr6wb18+%acBta4D52{taYF{a(e?kn69V@*6_GkH_5FytrzFz zkAG(UbnQlKQLky5ACtYl!|?l&n&pZOBc)(xhn(LU=S=Q+&>W}uQ%THgiC|?(Od#o0 zW*O#XWF)QkyBm!$M_}$QED{z=Vqwq<$kEW0BSZop3x#6&h&A~tAtm-i3BR;dP;uHs zXqQ?nJPQ>zD$In8T2YIr-Bjqwu%iU`h)m2(t@p4rBht~aV0GDqG&B2$FPQ(_yCG@w zV`w(Fzb*tx!?_jLOXn5bdaa}$t)aW_*n7(z+!pL6-ymW%j?kf^H3TU z$ze&!>G)&m8DWZSSW1FQNF@OY#_2BEZ)pXsB2}EOa-y=3a5z#>Sp~JSWWym4INzfd sYWGz@dpnK6?1QLaAggrhN2Kk4_kbtE*L_XocI3j}PDGXMYp literal 1849 zcma*odr(tX9tZI2z31lM+(&YVk%mZ}5P~KlG2s=WSbGzm0!x7^P##Mnh7t-jP!X0Q zk_SQ}Po-L1tlDK;6l?(>v)e5ZBQx4|Y-Q?nr@Px3?9h(3ZWr3^tj=`TP57gKr87N$ zp2wWee1GRRCwo_xahnw)5cxNPJbCg2L6DV|6`#+yw6v6!mDS$f9-JvFD^n;GQ&UrZ zzh5jCkByB101O60U0q#p_1BM>Cv-vP?&s4@g_((4_1L=L$(a91)0=J91Gas#R{McE znYG^9*0A5YZ>#;~+Wkn(W5B0^yELIYLP!K}mB~<)AM@1&nqekynuaEGqPrzoH|KodRXJy)%+w_fu3nE5>@Bd_b zqC$EQ;{c`T&?EsNO|igL9gC7Ygxv?aQUEXMq?~>wg{EyW;VcJ37CUF#HjrT=KQO_* zS>M9yydXk18D(+QDJ1>r);Lav_uYKp$T?4vr{Q$lTo&pKv^?(>L-)G2*lwH!Ah7k? z7oH<8h-(KTKt5V6$8gF)C7Io&P5=SjTh)=zV=E2EUhQZP##L8S{d%UK>>+y82>+FV+#^BzW7u3F)Bb>=lYQ%%j`F>ASe zo*cw@V#u6T`A2He;70mR(V&iV&-7{qP~=SRf&jm9-T{*ZeZ}$rd0#6c&fLG^xJcf5 z+p<`wJYgW+_s*V{uI$nMB;%8`S_3>PfGOj3Rq}@Cx^+j?rk92fANSFDBYnOqQ>Vdj z)(|$AhP4t&Lb=Gvo2#3Gl%9<=Gv`Mz?Po@P4iLF!x}GUWJICDlFk-hS^Whyh7x~VH z@0vD1>HYD4&e+~yzS*-sFR{9`{QEEZO1zg7>R&7cHts-6j!xHVdA8eI+ZlVzd%`es zJT@$#GX(gvCJ1oJN%yLBK}{V=V;seo;!w|Yte!W1%5qLNFWqvZW>h&IiH+oPT=b@E zPhGzv5=(Un*X>v`>%8h_nj^NdYcE6NHS_ifkCV$*D)Tqrbu`s;<=t<4 zAHNqNV?6(g<1PY-w@#I-WYFViz?9TrkMr)u0g`O`u|>T;k|2sV*YF^punvT;$SuTy{j3Gv)yqD!R_CF>yR)MzmmYS5v+~R zXAdD%ng9?df;wd8GxR#%3O+gz};Vo;)sK%Bj-q>Oq%R7JU-KD?vYu>#2UjaDo z&8$>5xW~?KPD_#XFToU1hIb*VOMidUr6iYiO0N|i-7s`T8!cFT`rN!^1Pt78J93i6 z5HI1wIM$94m{3SLDvISDe6$ZG1;eq_D9RTaaC>=cO{@Bs>$IlPCPJJ$h$)-3vzNUQ6OsN#_zWxey!_9%hxwH2_dEJi=yY|1c7nDm2_Lm!Cof8-R_+9UkS zcBE(o47yE)oMR(Q=dp1a2wTX5KvvGyLqlWTa7V&!A*|w|)ax~1_~aJ0=_Lilg*0iQk7#ZD EAHN$8j{pDw diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 68eb17e423..ba3583eead 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -893,7 +893,7 @@ nav.secondary { .load_more { text-align: center; margin: $lineheight auto; - width: $lineheight; + width: 40px; display: block; } } From 1090e99ba9a350ba38c62e1951b4465b66b9afe3 Mon Sep 17 00:00:00 2001 From: Aaron Lidman Date: Mon, 18 Nov 2013 09:56:03 -0800 Subject: [PATCH 219/270] Fix welcome page redirect, closed #70 --- app/assets/javascripts/welcome.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/welcome.js b/app/assets/javascripts/welcome.js index 56c454ac4a..88b153af2e 100644 --- a/app/assets/javascripts/welcome.js +++ b/app/assets/javascripts/welcome.js @@ -16,7 +16,7 @@ $(document).ready(function() { $('.start-mapping').attr('href', url); - } else if (navigator.geolocation) { + } else { function geoSuccess(position) { window.location = '/edit' + OSM.formatHash({ zoom: 17, @@ -27,21 +27,19 @@ $(document).ready(function() { $('.start-mapping').on('click', function(e) { e.preventDefault(); - - $('.start-mapping') - .addClass('loading'); + $('.start-mapping').addClass('loading'); // handle firefox's weird implementation // https://bugzilla.mozilla.org/show_bug.cgi?id=675533 window.setTimeout(manualEdit, 4000); - navigator.geolocation.getCurrentPosition(geoSuccess, manualEdit); + if (navigator.geolocation) { + navigator.geolocation.getCurrentPosition(geoSuccess, manualEdit); + } }); - } else { - manualEdit(); } function manualEdit() { - window.location = '/?edit_help=1' + window.location = '/?edit_help=1'; } }); From 1ac9563904a43ff7ef80b829b9b45a540aefbe7d Mon Sep 17 00:00:00 2001 From: Aaron Lidman Date: Mon, 18 Nov 2013 11:26:43 -0800 Subject: [PATCH 220/270] Adjust header sizing --- app/assets/stylesheets/common.css.scss | 13 ++++++------- app/assets/stylesheets/parameters.scss | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index ba3583eead..6468635cfd 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -248,7 +248,7 @@ header { height: $headerHeight; position: relative; z-index: 1001; - font-size: 13px; + font-size: 14px; h1, nav, nav > ul, nav > ul > li, .dropdown { display: inline-block; @@ -270,7 +270,7 @@ header { img.logo { width: 30px; height: 30px; - margin-top: -4px; + margin-top: -2px; vertical-align: middle; } @@ -357,7 +357,7 @@ nav.secondary { display: inline-block; text-decoration: none; color: $darkgrey; - padding: 5px; + padding: 3px 5px 5px 5px; &:hover { color: darken($darkgrey, 25%); } } @@ -369,8 +369,6 @@ nav.secondary { .user-menu { $border: 1px solid $grey; - font-weight: bold; - font-weight: 500; border: $border; border-radius: $border-radius; margin-left: 10px; @@ -397,7 +395,8 @@ nav.secondary { &.logged-in > a { padding: 0; > .user-button { - padding: 5px 10px 5px 6px; + line-height: 1.8; + padding: 5px 10px 3px 6px; display: inline-block; color: $darkgrey; } @@ -414,7 +413,7 @@ nav.secondary { border: 0; vertical-align: top; margin-top: 0px; - margin: 3px 0 0 3px; + margin: 4px 0 0 4px; border-radius: 2px; } diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss index 2e3651aca1..536562cf36 100644 --- a/app/assets/stylesheets/parameters.scss +++ b/app/assets/stylesheets/parameters.scss @@ -11,7 +11,7 @@ $red: red; $lightgrey: #EEE; $darkgrey: #888; $hovercolor: 20%; -$headerHeight: 54px; +$headerHeight: 55px; $sidebarWidth: 300px; $keyline: 1px solid $lightgrey; $border-radius: 3px; From 0928fa256cbc6c7a5234d172bb76c07dee3c52bd Mon Sep 17 00:00:00 2001 From: Aaron Lidman Date: Mon, 18 Nov 2013 11:43:48 -0800 Subject: [PATCH 221/270] Fix new note wrapping --- app/assets/javascripts/index/new_note.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/index/new_note.js.erb b/app/assets/javascripts/index/new_note.js.erb index 580d7a79b9..29977cd577 100644 --- a/app/assets/javascripts/index/new_note.js.erb +++ b/app/assets/javascripts/index/new_note.js.erb @@ -34,7 +34,7 @@ OSM.NewNote = function(map) { }); function createNote(marker, form, url) { - var location = marker.getLatLng(); + var location = marker.getLatLng().wrap(); marker.options.draggable = false; marker.dragging.disable(); From 1b9177d421a9636da31756336e410ea871a0a0fe Mon Sep 17 00:00:00 2001 From: Aaron Lidman Date: Mon, 18 Nov 2013 15:23:48 -0800 Subject: [PATCH 222/270] Improve changeset detail display --- app/assets/stylesheets/common.css.scss | 2 +- app/controllers/browse_controller.rb | 4 ++-- app/views/user/view.html.erb | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 6468635cfd..60683fcd6c 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -996,7 +996,7 @@ header .search_form { #sidebar .changesets { li { - padding: $lineheight; + padding: 10px 20px; border-bottom: 1px solid #ddd; cursor: pointer; diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb index c8375ee062..7380ac5bb0 100644 --- a/app/controllers/browse_controller.rb +++ b/app/controllers/browse_controller.rb @@ -58,8 +58,8 @@ def changeset @type = "changeset" @changeset = Changeset.find(params[:id]) @node_pages, @nodes = paginate(:old_nodes, :conditions => {:changeset_id => @changeset.id}, :per_page => 10, :parameter => 'node_page') - @way_pages, @ways = paginate(:old_ways, :conditions => {:changeset_id => @changeset.id}, :per_page => 10, :parameter => 'way_page') - @relation_pages, @relations = paginate(:old_relations, :conditions => {:changeset_id => @changeset.id}, :per_page => 10, :parameter => 'relation_page') + @way_pages, @ways = paginate(:old_ways, :conditions => {:changeset_id => @changeset.id}, :per_page => 20, :parameter => 'way_page') + @relation_pages, @relations = paginate(:old_relations, :conditions => {:changeset_id => @changeset.id}, :per_page => 20, :parameter => 'relation_page') rescue ActiveRecord::RecordNotFound render :action => "not_found", :status => :not_found end diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index 104b1ec4ac..f39bafec73 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -4,10 +4,10 @@

    <%= @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, :anchor => "map=1/0/0" %> + <%= link_to t('user.view.my edits'), :controller => 'changeset', :action => 'list', :display_name => @user.display_name %> <%= number_with_delimiter(@user.changesets.size) %>
    • @@ -45,11 +45,11 @@
    <% else %> - +
    • - <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @this_user.display_name, :anchor => "map=1/0/0" %> + <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @this_user.display_name %> <%= number_with_delimiter(@this_user.changesets.size) %>
    • From 6391be18e91989fbe674e14b20ba8f80816f66de Mon Sep 17 00:00:00 2001 From: Aaron Lidman Date: Mon, 18 Nov 2013 16:02:48 -0800 Subject: [PATCH 223/270] Better spaced changeset lists --- app/assets/stylesheets/common.css.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 60683fcd6c..7d3c9e1a10 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -996,7 +996,7 @@ header .search_form { #sidebar .changesets { li { - padding: 10px 20px; + padding: 15px 20px; border-bottom: 1px solid #ddd; cursor: pointer; @@ -1005,7 +1005,7 @@ header .search_form { } h4 { - margin-top: 0; + margin: 0; a { color: #000; } From 5578973f2cec595cc64a21cbacb10bb10ecbc06c Mon Sep 17 00:00:00 2001 From: Aaron Lidman Date: Mon, 18 Nov 2013 16:24:25 -0800 Subject: [PATCH 224/270] Reorder changeset detail lists Nodes, ways, relations -> Ways, relations, nodes --- app/controllers/browse_controller.rb | 2 +- app/views/browse/changeset.html.erb | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb index 7380ac5bb0..29cd6707f5 100644 --- a/app/controllers/browse_controller.rb +++ b/app/controllers/browse_controller.rb @@ -57,7 +57,7 @@ def node_history def changeset @type = "changeset" @changeset = Changeset.find(params[:id]) - @node_pages, @nodes = paginate(:old_nodes, :conditions => {:changeset_id => @changeset.id}, :per_page => 10, :parameter => 'node_page') + @node_pages, @nodes = paginate(:old_nodes, :conditions => {:changeset_id => @changeset.id}, :per_page => 20, :parameter => 'node_page') @way_pages, @ways = paginate(:old_ways, :conditions => {:changeset_id => @changeset.id}, :per_page => 20, :parameter => 'way_page') @relation_pages, @relations = paginate(:old_relations, :conditions => {:changeset_id => @changeset.id}, :per_page => 20, :parameter => 'relation_page') rescue ActiveRecord::RecordNotFound diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index ee8948d9bf..aa333cfff7 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -11,18 +11,6 @@ <%= render :partial => "tag_details", :object => @changeset.tags.except('comment') %> - <% unless @nodes.empty? %> -

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

      -
        - <% @nodes.each do |node| %> -
      • <%= 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 %> - <% unless @ways.empty? %>

      <%= type_and_paginated_count('way', @way_pages) %> @@ -46,6 +34,18 @@ <% end %>

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

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

    +
      + <% @nodes.each do |node| %> +
    • <%= 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 %>
    From acf7b12eec2cb49842070c913675e19c522d060e Mon Sep 17 00:00:00 2001 From: Aaron Lidman Date: Mon, 18 Nov 2013 16:24:52 -0800 Subject: [PATCH 225/270] Increase sidebar width, back to 350px --- app/assets/javascripts/index.js | 4 ++-- app/assets/stylesheets/parameters.scss | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index f1644c06f0..59e2313817 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -201,7 +201,7 @@ $(document).ready(function () { page.pushstate = function(path) { $("#content").addClass("overlay-sidebar"); map.invalidateSize({pan: false}) - .panBy([-300, 0], {animate: false}); + .panBy([-350, 0], {animate: false}); OSM.loadSidebarContent(path); page.load(); }; @@ -217,7 +217,7 @@ $(document).ready(function () { }; page.unload = function() { - map.panBy([300, 0], {animate: false}); + map.panBy([350, 0], {animate: false}); $("#content").removeClass("overlay-sidebar"); map.invalidateSize({pan: false}); }; diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss index 536562cf36..b26b29105b 100644 --- a/app/assets/stylesheets/parameters.scss +++ b/app/assets/stylesheets/parameters.scss @@ -12,6 +12,6 @@ $lightgrey: #EEE; $darkgrey: #888; $hovercolor: 20%; $headerHeight: 55px; -$sidebarWidth: 300px; +$sidebarWidth: 350px; $keyline: 1px solid $lightgrey; $border-radius: 3px; From 70b292e25d9b38f1c188867a3c901a3d2430a0ac Mon Sep 17 00:00:00 2001 From: Aaron Lidman Date: Mon, 18 Nov 2013 16:41:25 -0800 Subject: [PATCH 226/270] Wrap bounds of changeset request, closes #72 --- app/assets/javascripts/index/history.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/index/history.js b/app/assets/javascripts/index/history.js index afae6640f8..367ad52142 100644 --- a/app/assets/javascripts/index/history.js +++ b/app/assets/javascripts/index/history.js @@ -46,7 +46,7 @@ OSM.History = function(map) { $.ajax({ url: window.location.pathname, method: "GET", - data: {bbox: map.getBounds().toBBoxString()}, + data: {bbox: map.getBounds().wrap().toBBoxString()}, success: function(html, status, xhr) { $('#sidebar_content .changesets').html(html); updateMap(); From 370bcd2c75ab76319e4198654b66d447815de75a Mon Sep 17 00:00:00 2001 From: Aaron Lidman Date: Mon, 18 Nov 2013 17:29:55 -0800 Subject: [PATCH 227/270] Improvements to changeset bbox styling --- app/assets/javascripts/index/history.js | 2 +- app/assets/javascripts/leaflet.map.js.erb | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/index/history.js b/app/assets/javascripts/index/history.js index 367ad52142..75b02ec070 100644 --- a/app/assets/javascripts/index/history.js +++ b/app/assets/javascripts/index/history.js @@ -91,7 +91,7 @@ OSM.History = function(map) { for (var i = 0; i < changesets.length; ++i) { var changeset = changesets[i], rect = L.rectangle(changeset.bounds, - {weight: 1, color: "#FF9500", opacity: 1, fillColor: "#FFFFBF", fillOpacity: 0}); + {weight: 2, color: "#FF9500", opacity: 1, fillColor: "#FFFFBF", fillOpacity: 0}); rect.id = changeset.id; rect.addTo(group); } diff --git a/app/assets/javascripts/leaflet.map.js.erb b/app/assets/javascripts/leaflet.map.js.erb index 69fd1f3e3d..bfb3685a17 100644 --- a/app/assets/javascripts/leaflet.map.js.erb +++ b/app/assets/javascripts/leaflet.map.js.erb @@ -178,10 +178,11 @@ L.OSM.Map = L.Map.extend({ }; var changesetStyle = { - weight: 1, + weight: 4, color: '#FF9500', opacity: 1, - fillOpacity: 0 + fillOpacity: 0, + clickable: false }; this._object = object; From 12c4e358070a55ed8f001d66abb1bd3c127a5028 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 18 Nov 2013 18:04:05 -0800 Subject: [PATCH 228/270] Shorten intro text --- config/locales/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index aaf57e7e83..3fc0458657 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -888,7 +888,7 @@ en: edit_with: Edit with %{editor} tag_line: The Free Wiki World Map intro_header: Welcome to OpenStreetMap! - intro_text: OpenStreetMap is an editable map of the world created by people like you, and free to download and use under an open license. + 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" partners_html: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}." partners_ucl: "the UCL VR Centre" From 73125b25e640b6a60523f959b58666bf9ab7cce2 Mon Sep 17 00:00:00 2001 From: Aaron Lidman Date: Mon, 18 Nov 2013 18:44:48 -0800 Subject: [PATCH 229/270] Fixed export filter --- app/assets/javascripts/index/export.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/index/export.js b/app/assets/javascripts/index/export.js index 3d1dd3ce32..053f5169fa 100644 --- a/app/assets/javascripts/index/export.js +++ b/app/assets/javascripts/index/export.js @@ -14,11 +14,9 @@ OSM.Export = function(map) { function boundsChanged() { var bounds = getBounds(); - map.fitBounds(bounds); locationFilter.setBounds(bounds); - - enableFilter(); + locationFilter.enable(); validateControls(); } @@ -29,6 +27,7 @@ OSM.Export = function(map) { locationFilter.setBounds(map.getBounds().pad(-0.2)); locationFilter.enable(); + validateControls(); } function update() { From a27f2e75dd9aea3636599eaeeefaad8e72064a28 Mon Sep 17 00:00:00 2001 From: Aaron Lidman Date: Mon, 18 Nov 2013 19:11:01 -0800 Subject: [PATCH 230/270] Improved export filter tool --- app/assets/stylesheets/common.css.scss | 18 ++++++++++++++++++ app/views/site/export.html.erb | 15 ++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 7d3c9e1a10..a7591ba214 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -1127,10 +1127,28 @@ header .search_form { margin-bottom: $lineheight/2; input[type="text"] { width: 80px; + text-align: center; margin-bottom: 5px; } } + .export_boxy { + background: #eee; + border: 1px solid #ccc; + border-radius: 3px; + + #maxlat { margin-top: -1px; } + #minlon { + float: left; + margin-left: -1px; + } + #maxlon { + float: right; + margin-right: -1px; + } + #minlat { margin-bottom: 0; } + } + .export_bound { margin: $lineheight/4; } diff --git a/app/views/site/export.html.erb b/app/views/site/export.html.erb index a1b905a710..4ac5ec4d98 100644 --- a/app/views/site/export.html.erb +++ b/app/views/site/export.html.erb @@ -9,13 +9,14 @@ <%= 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") %> -
    +
    + <%= 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' %>
    From de3f533637d69e0e6c0b5c77a91c237cd8a5dee3 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Fri, 15 Nov 2013 15:36:54 -0800 Subject: [PATCH 231/270] Fix test failures --- app/controllers/changeset_controller.rb | 49 ++--- app/helpers/title_helper.rb | 7 +- app/views/browse/_node.html.erb | 12 +- app/views/browse/_relation.html.erb | 12 +- app/views/browse/_way.html.erb | 12 +- app/views/layouts/_head.html.erb | 2 +- config/locales/ast.yml | 1 - config/locales/be-Tarask.yml | 1 - config/locales/bs.yml | 1 - config/locales/cs.yml | 1 - config/locales/da.yml | 1 - config/locales/de.yml | 1 - config/locales/el.yml | 1 - config/locales/es.yml | 1 - config/locales/et.yml | 1 - config/locales/fi.yml | 1 - config/locales/fur.yml | 1 - config/locales/gl.yml | 1 - config/locales/he.yml | 1 - config/locales/hu.yml | 1 - config/locales/ia.yml | 1 - config/locales/id.yml | 1 - config/locales/it.yml | 1 - config/locales/ja.yml | 1 - config/locales/ko.yml | 1 - config/locales/lt.yml | 1 - config/locales/lv.yml | 1 - config/locales/mk.yml | 1 - config/locales/ms.yml | 1 - config/locales/nb.yml | 1 - config/locales/nl.yml | 1 - config/locales/nn.yml | 1 - config/locales/pl.yml | 1 - config/locales/pt-BR.yml | 1 - config/locales/pt.yml | 1 - config/locales/ro.yml | 1 - config/locales/ru.yml | 1 - config/locales/sk.yml | 1 - config/locales/sl.yml | 1 - config/locales/sr-Latn.yml | 1 - config/locales/sr.yml | 1 - config/locales/sv.yml | 1 - config/locales/tl.yml | 1 - config/locales/uk.yml | 1 - config/locales/vi.yml | 1 - config/locales/zh-CN.yml | 1 - test/functional/browse_controller_test.rb | 53 ++--- test/functional/changeset_controller_test.rb | 38 ++-- .../functional/diary_entry_controller_test.rb | 205 +++++++----------- test/functional/geocoder_controller_test.rb | 2 +- test/functional/message_controller_test.rb | 2 +- test/functional/site_controller_test.rb | 11 +- .../functional/user_blocks_controller_test.rb | 12 +- test/functional/user_controller_test.rb | 26 +-- test/functional/user_roles_controller_test.rb | 4 +- test/integration/client_application_test.rb | 19 +- test/integration/user_diaries_test.rb | 20 +- test/integration/user_login_test.rb | 68 +++--- 58 files changed, 231 insertions(+), 363 deletions(-) diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb index bd908879fe..6a0ad40a7c 100644 --- a/app/controllers/changeset_controller.rb +++ b/app/controllers/changeset_controller.rb @@ -252,42 +252,41 @@ def update def list if request.format == :atom and params[:page] redirect_to params.merge({ :page => nil }), :status => :moved_permanently - elsif request.format == :html and !params[:bbox] + return + end + + if params[:display_name] + user = User.find_by_display_name(params[:display_name]) + if !user || !user.active? + render_unknown_user params[:display_name] + return + end + end + + if (params[:friends] || params[:nearby]) && !@user && request.format == :html + require_user + return + end + + if request.format == :html and !params[:bbox] render :action => :history, :layout => map_layout else changesets = conditions_nonempty(Changeset.all) if params[:display_name] - user = User.find_by_display_name(params[:display_name]) - - if user and user.active? - if user.data_public? or user == @user - changesets = changesets.where(:user_id => user.id) - else - changesets = changesets.where("false") - end + if user.data_public? or user == @user + changesets = changesets.where(:user_id => user.id) else - render_unknown_user params[:display_name] - return + changesets = changesets.where("false") end end - if params[:friends] - if @user - changesets = changesets.where(:user_id => @user.friend_users.public) - elsif request.format == :html - require_user - return - end + if params[:friends] && @user + changesets = changesets.where(:user_id => @user.friend_users.public) end - if params[:nearby] - if @user - changesets = changesets.where(:user_id => @user.nearby) - elsif request.format == :html - require_user - return - end + if params[:nearby] && @user + changesets = changesets.where(:user_id => @user.nearby) end if params[:bbox] diff --git a/app/helpers/title_helper.rb b/app/helpers/title_helper.rb index c9b979ad5e..da4ad8967e 100644 --- a/app/helpers/title_helper.rb +++ b/app/helpers/title_helper.rb @@ -1,11 +1,6 @@ module TitleHelper def set_title(title = false) - if title - title = t('layouts.project_name.title') + ' | ' + title - else - title = t('layouts.project_name.title') - end - response.headers["X-Page-Title"] = title + response.headers["X-Page-Title"] = t('layouts.project_name.title') + (title ? ' | ' + title : '') @title = title end end diff --git a/app/views/browse/_node.html.erb b/app/views/browse/_node.html.erb index 5b29865dbb..2c2cdd4c0e 100644 --- a/app/views/browse/_node.html.erb +++ b/app/views/browse/_node.html.erb @@ -1,11 +1,13 @@ -
    - <% if node.redacted? %> +<% 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 %> +
    +<% else %> +
    <%= render :partial => "common_details", :object => node %> <% unless node.ways.empty? and node.containing_relation_members.empty? %> @@ -17,5 +19,5 @@ <%= render :partial => "containing_relation", :collection => node.containing_relation_members %> <% end %> - <% end %> -
    +
    +<% end %> diff --git a/app/views/browse/_relation.html.erb b/app/views/browse/_relation.html.erb index e8f9a4f51a..6befb8aae2 100644 --- a/app/views/browse/_relation.html.erb +++ b/app/views/browse/_relation.html.erb @@ -1,11 +1,13 @@ -
    - <% if relation.redacted? %> +<% 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 %> +
    +<% else %> +
    <%= render :partial => "common_details", :object => relation %> <% unless relation.relation_members.empty? %> @@ -17,5 +19,5 @@

    <%= t'browse.part_of' %>

      <%= render :partial => "containing_relation", :collection => relation.containing_relation_members %>
    <% end %> - <% end %> -
    +
    +<% end %> diff --git a/app/views/browse/_way.html.erb b/app/views/browse/_way.html.erb index 9156d23998..fd419586fb 100644 --- a/app/views/browse/_way.html.erb +++ b/app/views/browse/_way.html.erb @@ -1,11 +1,13 @@ -
    - <% if way.redacted? %> +<% 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 %> +
    +<% else %> +
    <%= render :partial => "common_details", :object => way %> <% unless way.way_nodes.empty? %> @@ -29,5 +31,5 @@ <%= render :partial => "containing_relation", :collection => way.containing_relation_members %> <% end %> - <% end %> -
    +
    +<% end %> diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb index 1897cfff37..9e603abab0 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -45,5 +45,5 @@ OSM.oauth_consumer_secret = "<%= @oauth.client_application.secret %>"; <% end -%> - <%= @title %> + <%= t 'layouts.project_name.title' %><%= ' | ' + @title if @title %> diff --git a/config/locales/ast.yml b/config/locales/ast.yml index 0e1258d335..87a4f0c483 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -216,7 +216,6 @@ ast: hide_areas: Anubrir árees history_for_feature: Historial de %{feature} load_data: Cargar datos - loaded_an_area_with_num_features: "Cargasti un área que contién %{num_features} carauterístiques. Polo xeneral, dellos restoladores nun pueden amosar bien esta cantidá de datos. Normalmente los restoladores funcionen meyor amosando menos de %{max_features} carauterístiques al tiempu: d'otra miente se tornen lentos/dexen de responder. Si tas seguru d'amosar los datos, pues facelo calcando nel botón d'abaxo." loading: Cargando... manually_select: Seleiciona manualmente un área distinta notes_layer_name: Navegar notes diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml index 7f74340c9c..7bc49e4ff1 100644 --- a/config/locales/be-Tarask.yml +++ b/config/locales/be-Tarask.yml @@ -209,7 +209,6 @@ be-Tarask: hide_areas: Схаваць вобласьці history_for_feature: Гісторыя %{feature} load_data: Загрузіць зьвесткі - loaded_an_area_with_num_features: Вы загрузілі мясцовасьць, якая ўтрымлівае %{num_features} аб’ектаў. Увогуле, некаторыя браўзэры ня змогуць апрацаваць такую колькасьць зьвестак. Звычайна найлепшы вынік назіраецца, калі аб’ектаў менш за %{max_features}, пры выкананьні яшчэ нейкіх задачаў браўзэр можа страціць хуткасьць/завіснуць. Калі Вы ўпэўненыя, што жадаеце паказаць гэтыя зьвесткі, націсьніце кнопку ніжэй. loading: Загрузка… manually_select: Выбраць іншы абшар notes_layer_name: Прагляд нататак diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 7066d1a907..8bb89b6442 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -207,7 +207,6 @@ bs: hide_areas: Sakriti područja history_for_feature: Historija za %{feature} load_data: Učitati podatke - loaded_an_area_with_num_features: "Učitali ste područje koje sadrži %{num_features} značajki. Općenito, neki se web preglednici ne mogu nositi sa prikazom tolike količine podataka. Inače, preglednici najbolje rade kada prikazuju manje od %{max_features} značajki istovremeno: ukoliko radite još nešto, to može usporiti preglednik ili ga zalediti. Ako ste sigurni da želite prikazati ove podtake, možete to učiniti klikom na dugme ispod." loading: Učitavanje... manually_select: Ručno izabrati drukčije područje object_list: diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 15320f3e9a..886ff1c836 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -233,7 +233,6 @@ cs: hide_areas: Schovat oblasti history_for_feature: Historie pro %{feature} load_data: Nahrát data - loaded_an_area_with_num_features: Máte načtenu oblast, která obsahuje %{num_features} prvků. Některé prohlížeče mohou mít potíže při zobrazování takového množství dat. Obecně fungují prohlížeče nejlépe při zobrazování ne více než %{max_features} prvků současně – větší množství může způsobit, že bude prohlížeč reagovat pomalu či vůbec. Pokud jste si jisti, že chcete tato data zobrazit, klikněte na tlačítko níže. loading: Načítá se… manually_select: Ručně vybrat jinou oblast notes_layer_name: Procházet poznámky diff --git a/config/locales/da.yml b/config/locales/da.yml index f74e010805..1bf66fffc7 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -231,7 +231,6 @@ da: hide_areas: Skjul områder history_for_feature: Historik for %{feature} load_data: Indlæs data - loaded_an_area_with_num_features: "Du har indlæst et område som indeholder %{num_features} objekter. Nogle browsere kan have problemer ved håndtering af så meget data. Browsere fungerer generelt bedst med mindre end %{max_features} objekter ad gangen: flere objekter kan gøre at din browser bliver langsom. Hvis du er sikker på, at du vil se alle disse data, så klik på knappen nedenfor." loading: Indlæser... manually_select: Vælg et andet område manuelt notes_layer_name: Gennemse bemærkninger diff --git a/config/locales/de.yml b/config/locales/de.yml index 5e0662e9fd..9bfdd94653 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -246,7 +246,6 @@ de: hide_areas: Flächen ausblenden history_for_feature: Chronik für %{feature} load_data: Daten laden - loaded_an_area_with_num_features: Du hast einen Bereich ausgewählt, der %{num_features} Elemente enthält. Manche Browser werden bei der Verarbeitung einer so großen Datenmenge langsam oder frieren ein (reagieren nicht mehr auf Eingaben). Üblicherweise sollten weniger als %{max_features} Elemente angezeigt werden. Falls du dir sicher bist, dass so viele Elemente laden möchtest, klicke unten auf „Daten laden“. loading: Lade … manually_select: Einen anderen Kartenausschnitt manuell auswählen notes_layer_name: Alle Hinweise anzeigen diff --git a/config/locales/el.yml b/config/locales/el.yml index 845de71f34..503fdfad7c 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -234,7 +234,6 @@ el: hide_areas: Απόκρυψη περιοχών history_for_feature: Ιστορικό για %{feature} load_data: Φόρτωση δεδομένων - loaded_an_area_with_num_features: "Έχετε φορτώσει μια περιοχή που περιέχει %{num_features} χαρακτηριστικά. Γενικά, μερικοί browsers μπορεί να μην αντέχουν να δείξουν τόσα πολλά στοιχεία. Γενικά, οι browsers δουλεύουν καλύτερα δείχνοντας λιγότερα από %{max_features} χαρακτηριστικά τη φορά: με οτιδήποτε άλλο ο browser μπορεί να γίνει αργός ή να μην αντιδρά. Αν είστε σίγουρος ότι θέλετε να δείτε αυτά τα δεδομένα, κάντε κλικ στο παρακάτω κουμπί." loading: Φόρτωση σε εξέλιξη... manually_select: Χειροκίνητη επιλογή διαφορετικής περιοχής notes_layer_name: Περιήγηση Σημειώσεων diff --git a/config/locales/es.yml b/config/locales/es.yml index f801aa2091..17223fdbdd 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -240,7 +240,6 @@ es: hide_areas: Ocultar áreas history_for_feature: Historial de %{feature} load_data: Cargar datos - loaded_an_area_with_num_features: Has cargado un área que contiene %{num_features} objetos. Por lo general, algunos navegadores de internet no aguantan bien el mostrar esta cantidad de información vectorial. Generalmente, el funcionamiento óptimo se da cuando se muestran menos de %{max_features} objetos al mismo tiempo; de otra manera, tu navegador puede volverse lento o no responder. Si estás seguro de que quieres mostrar todos estos datos, puedes hacerlo pulsando el botón que aparece debajo. loading: Cargando... manually_select: Seleccionar manualmente un área diferente notes_layer_name: Ver notas diff --git a/config/locales/et.yml b/config/locales/et.yml index f6d045da78..8cffe3cbc4 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -200,7 +200,6 @@ et: hide_areas: Peida alad history_for_feature: Omaduse %{feature} ajalugu load_data: Laadi andmed - loaded_an_area_with_num_features: Oled laadinud ala, mis sisaldab %{num_features} objekti. Mõned brauserid ei saa hästi hakkama sellise hulga andmete kuvamisega. Üldiselt suudavad brauserid kuvada korraga kuni %{max_features} objekti. Suurema arvu laadimine võib muuta brauseri aeglaseks või see lakkab üldse toimimast. Kui soovid siiski neid andmeid kuvada, võid seda teha, klõpsates nupul allpool. loading: Laadin andmeid... manually_select: Vali uus ala notes_layer_name: Sirvi märkuseid diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 43f0a94d2c..1393ed1e4e 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -232,7 +232,6 @@ fi: hide_areas: Piilota alueet history_for_feature: Ominaisuuden %{feature} historia load_data: Lataa tiedot - loaded_an_area_with_num_features: Olet ladannut alueen, joka sisältää %{num_features} osiota. Yleensä jotkin selaimet eivät kykene näyttämään tätä määrää dataa. Yleisesti selaimet toimivat parhaiten näyttäessään alle %{max_features} kohdetta kerrallaan. Muussa tapauksessa selain saattaa tulla hitaaksi tai lakata toimimasta kokonaan. Jos olet varma että haluat näyttää tämän datan, voit tehdä niin napsauttamalla alla olevaa painiketta. loading: Ladataan tietoja... manually_select: Rajaa pienempi alue käsin notes_layer_name: Näytä karttailmoitukset diff --git a/config/locales/fur.yml b/config/locales/fur.yml index 68aae02882..ac96a0cd2a 100644 --- a/config/locales/fur.yml +++ b/config/locales/fur.yml @@ -197,7 +197,6 @@ fur: hide_areas: Plate areis history_for_feature: Storic par %{feature} load_data: Cjame i dâts - loaded_an_area_with_num_features: "Tu âs cjamât une aree che e conten %{num_features} carataristichis. In gjenerâl, cualchi sgarfadôr al podarès no rivâ a gjestî ben cheste cuantitât di dâts. I sgarfadôrs par solit a lavorin miôr se a mostrin mancul di %{max_features} carataristichis ae volte: cualsisei altri numar al podarès ralentâ/no fâ plui rispuindi il sgarfadôr. Se tu sês sigûr di volê mostrâ chescj dâts, frache sul boton ca sot." loading: Daûr a cjamâ... manually_select: Sielç a man une aree divierse notes_layer_name: Mostre lis notis diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 4acac9465b..f23573cc0b 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -219,7 +219,6 @@ gl: hide_areas: Agochar as zonas history_for_feature: Historial de %{feature} load_data: Cargar os datos - loaded_an_area_with_num_features: Cargou unha zona que contén %{num_features} funcionalidades. Pode que algúns navegadores teñan problemas para mostrar correctamente esta cantidade de datos. Xeralmente, os navegadores traballan mellor mostrando menos de %{max_features} funcionalidades á vez. Utilizar máis pode provocar que o navegador vaia lento ou non responda. Se está seguro de que quere mostrar estes datos, pode facelo premendo no seguinte botón. loading: Cargando... manually_select: Escoller manualmente unha zona distinta notes_layer_name: Explorar as notas diff --git a/config/locales/he.yml b/config/locales/he.yml index ffd7142985..4cadc97aee 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -229,7 +229,6 @@ he: hide_areas: להסתרת אזורים history_for_feature: ההיסטוריה של %{feature} load_data: טעינת נתונים - loaded_an_area_with_num_features: "האזור שנטען מכיל %{num_features} תכונות. באופן כללי, חלק מהדפדפנים לא יוכלו להתמודד עם הצגה של כזו כמות של נתונים. לרוב, דפדפנים עובדים באופן מיטבי בהצגת פחות מ־%{max_features} תכונות בו־זמנית: ביצוע משימות נוספות עלול לגרום לדפדפן לפעול באופן איטי או להיתקע. אם ברצונך בכל זאת להציג מידע זה, באפשרותך להציג אותו בלחיצה על הכפתור למטה." loading: בטעינה... manually_select: בחירת אזור אחר ידנית notes_layer_name: עיון בהערות diff --git a/config/locales/hu.yml b/config/locales/hu.yml index e9cd5e40fb..a146d201fd 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -227,7 +227,6 @@ hu: hide_areas: Területek elrejtése history_for_feature: "%{feature} előzményei" load_data: Adatok betöltése - loaded_an_area_with_num_features: "Olyan területet töltöttél be, amely %{num_features} elemet tartalmaz. Néhány böngésző lehet, hogy nem birkózik meg ekkora mennyiségű adattal. Általában a böngészők egyszerre legfeljebb %{max_features} elemet tudnak megjeleníteni: minden más esetben a böngésző lelassulhat/nem válaszolhat. Ha biztos vagy benne, hogy meg szeretnéd jeleníteni ezeket az adatokat, megteheted ezt az alábbi gombra kattintva." loading: Betöltés… manually_select: Más terület kézi kijelölése notes_layer_name: Jegyzetek böngészése diff --git a/config/locales/ia.yml b/config/locales/ia.yml index cf37b41f95..80f0ecf864 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -217,7 +217,6 @@ ia: hide_areas: Celar areas history_for_feature: Historia de %{feature} load_data: Cargar datos - loaded_an_area_with_num_features: Tu ha cargate un area que contine %{num_features} elementos. In general, alcun navigatores del web pote haber problemas in presentar un tal quantitate de datos. Generalmente, un navigator functiona melio monstrante minus de %{max_features} elementos per vice; alteremente, illo pote devenir lente o non responder. Si tu es secur de voler visualisar iste datos, tu pote cliccar super le button a basso. loading: Cargamento... manually_select: Seliger manualmente un altere area notes_layer_name: Percurrer notas diff --git a/config/locales/id.yml b/config/locales/id.yml index 29e0f7c96f..69ff09e895 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -224,7 +224,6 @@ id: hide_areas: Sembunyikan wilayah history_for_feature: Riwayat untuk %{feature} load_data: Memuat Data - loaded_an_area_with_num_features: "Anda telah memuat wilayah yang berisi %{num_features} fitur. Secara umum, beberapa browser mungkin tidak dapat mengatasi dengan baik untuk menampilkan sejumlah data tersebut, browser akan bekerja dengan baik dalam menampilkan data kurang dari %{max_features} fitur pada saat yang sama: lebih daripada itu akan membuat browser anda menjadi lamban/tidak responsif. Jika anda yakin ingin menampilkan data ini, anda dapat melakukannya dengan mengklik tombol di bawah." loading: Memuat... manually_select: Pilih wilayah berbeda secara manual notes_layer_name: Lihat Catatan diff --git a/config/locales/it.yml b/config/locales/it.yml index 83eafa9f19..0e4d7d3fee 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -234,7 +234,6 @@ it: hide_areas: Nascondi le aree history_for_feature: Cronologia per %{feature} load_data: Carica dati - loaded_an_area_with_num_features: "È stata caricata un'area che contiene %{num_features} caratteristiche. In generale, alcuni browser potrebbero non visualizzare correttamente questa quantità di dati. Generalmente i browser lavorano al meglio se si visualizzano meno di %{max_features} caratteristiche alla volta: se si fa qualcos'altro il proprio browser potrebbe diventare lento o non rispondere più. Se si è sicuri di voler visualizzare questi dati, allora si può premere il pulsante sottostante." loading: Caricamento in corso... manually_select: Seleziona manualmente un'area differente notes_layer_name: Mostra le note diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 9a685238d3..7d579ab589 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -227,7 +227,6 @@ ja: hide_areas: 領域を隠す history_for_feature: "%{feature}の履歴" load_data: データの読み込み - loaded_an_area_with_num_features: "%{num_features}件の地物を含む領域を読み込みました。一般に、ブラウザーによっては、この量のデータを表示するとうまく処理できないかもしれません。通常、ブラウザーは一度に%{max_features}件未満の地物を表示させるとうまく動作します。このままでは、ブラウザーが遅くなったり、反応しなくなったりします。それでもこのデータを表示したいならば、以下のボタンをクリックしてください。" loading: 読み込み中... manually_select: ドラッグして別の領域を選択 notes_layer_name: メモを閲覧 diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 27327ff57e..49451a4c0a 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -216,7 +216,6 @@ ko: hide_areas: 지역 숨기기 history_for_feature: "%{feature}의 역사" load_data: 데이터 불러오기 - loaded_an_area_with_num_features: 당신은 특성을 가진 지역 %{num_features}개를 불러왔습니다. 일반적으로, 일부 브라우저에서는 이 데이터 개수를 모두 처리하지 못할 수도 있습니다. 일반적으로, 브라우저들은 대개 특성 %{max_features}개 이하를 처리하여 보여줄 수 있습니다. 그렇지 않은 경우, 브라우저의 속도가 저하되거나 브라우저의 반응이 느려질 수 있습니다. 여전히 이 데이터를 표시하려면, 아래의 버튼을 클릭하세요. loading: 불러오는 중... manually_select: 다른 지역 선택 notes_layer_name: 참고 찾아보기 diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 8541e82bed..3108aaf606 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -223,7 +223,6 @@ lt: hide_areas: Slėpti sritis history_for_feature: Istorija apie %{feature} load_data: Kraunami duomenys - loaded_an_area_with_num_features: Jūs įkėlėte sritį, kurioje yra %{num_features} elementų. Dažniausiai naršyklės nelabai gerai susitvarko su tokiu duomenų kiekiu. Paprastai naršyklės kur kas geriau susidoroja, kai elementų yra mažiau nei %{max_features} vienu metu. Bet kokie kiti veiksmai gali stipriai sulėtinti naršyklę. Jei tikrai norite žiūrėti šiuos duomenis, spauskite žemiau esantį mygtuką. loading: Kraunama... manually_select: Rankiniu būdu pažymėkite kitą teritoriją notes_layer_name: Peržiūrėti pastabas diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 3ff4a9f5f2..46305d31d9 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -225,7 +225,6 @@ lv: hide_areas: Paslēpt zonas history_for_feature: Vēsture %{feature} load_data: Ielādēt datus - loaded_an_area_with_num_features: "Jūs esat ielādējis apgabalu, kurš satur %{num_features} iezīmes. Pamatā, daži pārlūki var pārāk labi netikt galā ar šādu lielu datu kvantuma parādīšanu. Parasti, pārlūki tiek galā vislabāk rādot mazāk nekā %{max_features} iezīmes vienlaikus: jebkā cita darīšana tos bremzē. Ja Jūs esat drošs, ka vēlaties attēlot šos datus, Jūs tā varat izdarīt spiežot pogu zemāk." loading: Ielādē… manually_select: Manuāli izvēlēties citu apgabalu notes_layer_name: Pārlūkot Piezīmes diff --git a/config/locales/mk.yml b/config/locales/mk.yml index c188b58b88..24cc0084cf 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -217,7 +217,6 @@ mk: hide_areas: Скриј подрачја history_for_feature: Историја за %{feature} load_data: Вчитај ги податоците - loaded_an_area_with_num_features: "Вчитавте простор што содржи %{num_features} елементи. Некои прелистувачи не можат да се справат со толку податоци. Начелно, прелистувачите работат најдобро при помалку од %{max_features} елементи наеднаш: ако правите нешто друго прелистувачот ќе ви биде бавен/пасивен. Ако и покрај тоа сакате да се прикажат овие податоци, тогаш стиснете на копчето подолу." loading: Вчитувам... manually_select: Рачно изберете друга површина notes_layer_name: Прелистај белешки diff --git a/config/locales/ms.yml b/config/locales/ms.yml index aad0a7de3d..e62fe56101 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -211,7 +211,6 @@ ms: hide_areas: Sorokkan kawasan history_for_feature: Sejarah %{feature} load_data: Muatkan Data - loaded_an_area_with_num_features: Anda telah memilih satu kawasan yang mengandungi %{num_features} ciri. Pada umumnya, sesetengah pelayar web tidak mungkin mampu memaparkan sebegini banyak data dengan betul. Lazimnya, pelayar paling berkemampuan apabila memaparkan kurang daripada %{max_features} ciri sekaligus; lebih daripada itu mungkin akan melambatkan pelayar anda atau membuatnya tidak responsif. Jika anda betul-betul ingin memaparkan data ini, anda boleh berbuat demikian dengan mengklik butang di bawah. loading: Memuatkan... manually_select: Pilih kawasan yang lain secara insani notes_layer_name: Semak Imbas Nota diff --git a/config/locales/nb.yml b/config/locales/nb.yml index 4c596ec2e5..13dc001835 100644 --- a/config/locales/nb.yml +++ b/config/locales/nb.yml @@ -228,7 +228,6 @@ nb: hide_areas: Skjul områder history_for_feature: Historikk for %{feature} load_data: Last inn data - loaded_an_area_with_num_features: "Du har lastet et område som inneholder %{num_features} objekter. Noen nettlesere kan få problemer med å håndtere så mye data. Generelt fungerer nettlesere best med mindre enn %{max_features} objekter av gangen: flere objekter kan føre til at nettleseren din blir treg eller fryser helt. Om du er sikker på at du vil se denne informasjonen, kan du gjøre det ved å klikke på knappen under." loading: Laster... manually_select: Velg et annet område manuelt notes_layer_name: Se på merknader diff --git a/config/locales/nl.yml b/config/locales/nl.yml index c2cdc7642f..af983e78be 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -227,7 +227,6 @@ nl: hide_areas: Gebieden verbergen history_for_feature: Geschiedenis voor %{feature} load_data: Gegevens laden - loaded_an_area_with_num_features: U hebt een gebied geladen dat %{num_features} objecten bevat. Sommige browsers kunnen niet goed overweg met zoveel gegevens. Normaal gesproken werken browsers het best met minder dan %{max_features} objecten. Als u er meer weergeeft kan de browser traag worden of niet meer reageren. Als u zeker weet dat u de gegevens wilt weergeven, klik dan op de knop hieronder. loading: Bezig met laden… manually_select: Handmatig een ander gebied selecteren notes_layer_name: Opmerkingen bekijken diff --git a/config/locales/nn.yml b/config/locales/nn.yml index d4f7b4f806..db435a4e51 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -231,7 +231,6 @@ nn: hide_areas: Skjul områder history_for_feature: Historikk for %{feature} load_data: Last inn data - loaded_an_area_with_num_features: Dette området inneheld %{num_features} objekt. Nokre nettlesarar kan ikkje handtere så mykje data. For å ikkje risikere at nettlesaren låsar seg bør du halde deg til under %{max_features} objekt. Om du er sikker på at du vil sjå informasjonen kan du klikke på knappen nedanfor. loading: Lastar... manually_select: Vel eit anna område manuelt notes_layer_name: Bla gjennom notiser diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 3fa8f1c7c1..8997c63835 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -240,7 +240,6 @@ pl: hide_areas: Ukryj obszary history_for_feature: Historia zmian dla %{feature} load_data: Wczytaj dane - loaded_an_area_with_num_features: Wczytano obszar zawierający %{num_features} obiektów. Niektóre przeglądarki internetowe mogą nie radzić sobie z wyświetleniem tej ilości danych. Na ogół przeglądarki działają najlepiej przy wyświetlaniu mniej niż %{max_features} obiektów jednocześnie, w przeciwnym przypadku przeglądarka może działać powoli lub przestać odpowiadać. Jeśli jesteś pewien, że chcesz wyświetlić dane, kliknij przycisk poniżej. loading: Wczytywanie... manually_select: Ręcznie zaznacz inny obszar notes_layer_name: Przeglądaj uwagi diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index f6fddbcd86..4aed31772e 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -239,7 +239,6 @@ pt-BR: hide_areas: Ocultar áreas history_for_feature: Histórico para %{feature} load_data: Carregar dados - loaded_an_area_with_num_features: "Você carregou uma área que contém %{num_features} pontos. Alguns navegadores podem não conseguir exibir essa quantidade de dados. Geralmente, navegadores trabalham melhor exibindo menos de %{max_features} pontos por vez: acima disso pode deixá-lo lento ou travá-lo. Se você tem certeza que deseja exibir estes dados, clique no botão abaixo." loading: Carregando... manually_select: Selecionar manualmente uma área diferente notes_layer_name: Ver Notas diff --git a/config/locales/pt.yml b/config/locales/pt.yml index b108a9877e..663cd84b52 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -232,7 +232,6 @@ pt: hide_areas: Ocultar áreas history_for_feature: Histórico de %{feature} load_data: Carregar Dados - loaded_an_area_with_num_features: Carregou uma área com %{num_features} elementos. Alguns navegadores de Internet podem ter problemas em mostrar esta quantidade de dados. Geralmente os navegadores funcionam melhor a mostrar até %{max_features} elementos de cada vez. Mais do que isso o navegador poderá ficar muito lento ou até bloquear. Se tem a certeza que quer mostrar esta quantidade de elementos clique no botão seguinte. loading: A carregar… manually_select: Selecionar manualmente uma área diferente notes_layer_name: Ver Erros Reportados diff --git a/config/locales/ro.yml b/config/locales/ro.yml index ea5c2bab82..18982757b5 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -195,7 +195,6 @@ ro: hide_areas: Ascunde suprafețele history_for_feature: Istoric pentru %{feature} load_data: Încărcare date - loaded_an_area_with_num_features: "Ați încărcat o zonă care conține %{num_features} elemente. În general, unele navigatoare nu sunt capabile să facă față afișării unei asemenea cantități de date. Navigatoarele funcționează cel mai bine atunci când afișează mai puțin de %{max_features} elemente simultan: dacă mai faceți și alte operații cu navigatorul dumneavoastră în paralel veți observa o încetinire / lipsă de răspuns din partea navigatorului. Dacă doriți să afișați aceste date apăsați butonul de mai jos." loading: Se încarcă... manually_select: Selectare manuală a unei alte zone object_list: diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 876a40bfc9..189c2c0565 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -251,7 +251,6 @@ ru: hide_areas: Скрыть области history_for_feature: История %{feature} load_data: Загрузить данные - loaded_an_area_with_num_features: Вы загрузили область, которая содержит %{num_features} объектов. Некоторые браузеры могут не справиться с отображением такого количества данных. Обычно браузеры могут обрабатывать до %{max_features} объектов. Загрузка большего числа может замедлить ваш браузер или привести к его зависанию. Если вы всё равно хотите отобразить эти данные, нажмите на кнопку ниже. loading: Загрузка... manually_select: Выделить другую область notes_layer_name: Просмотр заметок diff --git a/config/locales/sk.yml b/config/locales/sk.yml index d98e5627c2..5596521128 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -226,7 +226,6 @@ sk: hide_areas: Skryť oblasti history_for_feature: História pre %{feature} load_data: Načítať údaje - loaded_an_area_with_num_features: Máte načítanú oblasť, ktorá obsahuje %{num_features} zložiek. Niektoré prehliadače môžu mať problémy so zobrazením takého množstva dát, viac než približne %{max_features} položiek ich môže spomaliť až zablokovať. Pokiaľ ste si istý, že chcete dáta zobraziť, kliknite na tlačítko nižšie. loading: Nahrávanie... manually_select: Manuálne vybrať inú oblasť notes_layer_name: Zobraziť všetky chyby diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 7fe24a9b33..e897cb3bf4 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -225,7 +225,6 @@ sl: hide_areas: Skrij področja history_for_feature: Zgodovina %{feature} load_data: Naloži podatke - loaded_an_area_with_num_features: "Naložili ste področje, ki vsebuje %{num_features} elementov. Nekateri spletni brskalniki ne zmorejo prikaza takšne količine podatkov. Na splošno brskalniki najbolje prikazujejo %{max_features} ali manj elementov hkrati: karkoli drugega lahko upočasni vaš brskalnik ali ga naredi neodzivnega. Če ste prepričani, da želite prikazati vse te podatke, pritisnite na spodnji gumb." loading: Nalaganje ... manually_select: Ročno izberite drugo področje notes_layer_name: Brskanje opomb diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index 93e018d24d..f9a29d7806 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -215,7 +215,6 @@ sr-Latn: hide_areas: Sakrij područja history_for_feature: Istorija za %{feature} load_data: Učitaj podatke - loaded_an_area_with_num_features: "Učitali ste područje koje sadrži %{num_features} mogućnosti. Neki pregledači se ne mogu nositi s tolikom količinom podataka. Oni najbolje rade kada prikazuju manje od %{max_features} mogućnosti istovremeno: ako radite još nešto, to može usporiti pregledač ili ga zakočiti. Ako ste sigurni da želite da prikažete ove podatke, možete to uraditi klikom na dugme ispod." loading: Učitavam… manually_select: Ručno izaberite drugo područje object_list: diff --git a/config/locales/sr.yml b/config/locales/sr.yml index db5b8a2d47..8f8c5ee253 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -230,7 +230,6 @@ sr: hide_areas: Сакриј подручја history_for_feature: Историја за %{feature} load_data: Учитај податке - loaded_an_area_with_num_features: "Учитали сте подручје које садржи %{num_features} могућности. Неки прегледачи се не могу носити с толиком количином података. Они најбоље раде када приказују мање од %{max_features} могућности истовремено: ако радите још нешто, то може успорити прегледач или га закочити. Ако сте сигурни да желите да прикажете ове податке, можете то урадити кликом на дугме испод." loading: Учитавам… manually_select: Ручно изаберите друго подручје object_list: diff --git a/config/locales/sv.yml b/config/locales/sv.yml index ba874d1da1..3b1cb6f749 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -242,7 +242,6 @@ sv: hide_areas: Göm område history_for_feature: Historik för %{feature} load_data: Ladda data - loaded_an_area_with_num_features: "Du har läst in ett område som innehåller %{num_features} objekt. En del webbläsare klarar inte av hantering av sådana stora mängder data. Vanligtvis arbetar webbläsare bäst när de visar mindre än %{max_features} objekt samtidigt: att göra någonting annat kan få din webbläsare att bli långsam eller sluta att svara. Om du är säker på att du vill visa denna data kan du göra det genom att klicka på knappen nedan." loading: Läser in... manually_select: Välj ett annan område manuellt notes_layer_name: Bläddra bland anteckningar diff --git a/config/locales/tl.yml b/config/locales/tl.yml index b0edff09c7..202b21e434 100644 --- a/config/locales/tl.yml +++ b/config/locales/tl.yml @@ -211,7 +211,6 @@ tl: hide_areas: Itago ang mga lugar history_for_feature: Kasaysayan para sa %{feature} load_data: Ikarga ang Dato - loaded_an_area_with_num_features: "Nagkarga ka ng isang pook na naglalaman ng %{num_features} na mga tampok. Sa pangkalahatan, ilang mga pantingin-tingin ang hindi maaaring makaangkop ng mabuti sa pagpapakita ng ganitong dami ng dato. Sa pangkalahatan, gumagana ng pinakamahusay ang mga pantingin-tingin kapag nagpapakita ng mas kakaunti kaysa %{max_features} na mga tampok: ang paggawa ng ibang mga bagay ay maaaring makagawa sa iyong pantingin-tingin upang bumagal/hindi tumutugon. Kung nakatitiyak kang nais mong ipakita ang ganitong dato, magagawa mo ito sa pamamagitan ng pagpindot sa pindutang nasa ibaba." loading: Ikinakarga... manually_select: Kinakamay na pumili ng iba pang lugar object_list: diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 277cad201d..f1bae23a00 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -236,7 +236,6 @@ uk: hide_areas: Приховати ділянки history_for_feature: Історія %{feature} load_data: Завантажити Дані - loaded_an_area_with_num_features: "Ви завантажили ділянку, яка містить %{num_features} об’єктів. Загалом, деякі оглядачі можуть не впоратися з відображенням такої кількості даних. Зазвичай, оглядачі працюють краще, коли водночас показується не більше %{max_features} об'єктів: якщо ж ви робите інакше, це може спричинити сповільнення чи взагалі відсутність відгуку у вашому оглядачі. Коли ви впевнені, що слід показати ці дані, можете натиснути кнопку нижче." loading: Завантаження… manually_select: Виберіть іншу ділянку notes_layer_name: Огляд нотаток diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 547b561159..86e59e3416 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -219,7 +219,6 @@ vi: hide_areas: Ẩn các khu vực history_for_feature: Lịch sử %{feature} load_data: Tải Dữ liệu - loaded_an_area_with_num_features: Bạn đã tải vùng chứa %{num_features} đối tượng. Một số trình duyệt bị trục trặc khi hiển thị nhiều dữ liệu như thế. Nói chung, các trình duyệt hoạt động tốt với tối đa %{max_features} đối tượng cùng lúc; nếu hơn thì trình duyệt sẽ chậm chạp. Nếu bạn chắc chắn muốn xem dữ liệu này, hãy bấm nút ở dưới. loading: Đang tải… manually_select: Chọn vùng khác thủ công notes_layer_name: Xem các Ghi chú diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 929b0044d6..02604f8422 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -238,7 +238,6 @@ zh-CN: hide_areas: 隐藏区域 history_for_feature: "%{feature}的历史" load_data: 载入数据 - loaded_an_area_with_num_features: 你已经载入一个包含%{num_features}个特征的区域。一般而言，一些浏览器无法正常显示这一数量的数据。通常，浏览器可以较好地显示少于%{max_features}个特征，超过这一数量则会使你的浏览器变慢/无响应。如果你确定你想要显示这些数据，请单击下面的按钮。 loading: 正在载入... manually_select: 手动选择不同的区域 notes_layer_name: 浏览注释 diff --git a/test/functional/browse_controller_test.rb b/test/functional/browse_controller_test.rb index 0f1ff68559..2dcf6b330a 100644 --- a/test/functional/browse_controller_test.rb +++ b/test/functional/browse_controller_test.rb @@ -41,41 +41,36 @@ def test_routes ) end - def test_start - xhr :get, :start - assert_response :success - end - def test_read_relation - browse_check 'relation', relations(:visible_relation).relation_id + browse_check 'relation', relations(:visible_relation).relation_id, 'browse/feature' end def test_read_relation_history - browse_check 'relation_history', relations(:visible_relation).relation_id + browse_check 'relation_history', relations(:visible_relation).relation_id, 'browse/history' end def test_read_way - browse_check 'way', ways(:visible_way).way_id + browse_check 'way', ways(:visible_way).way_id, 'browse/feature' end def test_read_way_history - browse_check 'way_history', ways(:visible_way).way_id + browse_check 'way_history', ways(:visible_way).way_id, 'browse/history' end def test_read_node - browse_check 'node', nodes(:visible_node).node_id + browse_check 'node', nodes(:visible_node).node_id, 'browse/feature' end def test_read_node_history - browse_check 'node_history', nodes(:visible_node).node_id + browse_check 'node_history', nodes(:visible_node).node_id, 'browse/history' end def test_read_changeset - browse_check 'changeset', changesets(:normal_user_first_change).id + browse_check 'changeset', changesets(:normal_user_first_change).id, 'browse/changeset' end def test_read_note - browse_check 'note', notes(:open_note).id + browse_check 'note', notes(:open_note).id, 'browse/note' end ## @@ -89,41 +84,37 @@ def test_read_note def test_redacted_node_history get :node_history, :id => nodes(:redacted_node_redacted_version).node_id assert_response :success - assert_template 'node_history' + assert_template 'browse/history' # there are 2 revisions of the redacted node, but only one # should be showing details here. - assert_select "body div#content div.browse_details", 2 - assert_select "body div#content div.browse_details[id=1] div.common", 0 - assert_select "body div#content div.browse_details[id=2] div.common", 1 + assert_select ".browse-section", 2 + assert_select ".browse-section.browse-redacted", 1 + assert_select ".browse-section.browse-node", 1 end def test_redacted_way_history get :way_history, :id => ways(:way_with_redacted_versions_v1).way_id assert_response :success - assert_template 'way_history' + assert_template 'browse/history' # there are 4 revisions of the redacted way, but only 2 # should be showing details here. - assert_select "body div#content div.browse_details", 4 - assert_select "body div#content div.browse_details[id=1] div.common", 1 - assert_select "body div#content div.browse_details[id=2] div.common", 0 - assert_select "body div#content div.browse_details[id=3] div.common", 0 - assert_select "body div#content div.browse_details[id=4] div.common", 1 + assert_select ".browse-section", 4 + assert_select ".browse-section.browse-redacted", 2 + assert_select ".browse-section.browse-way", 2 end def test_redacted_relation_history get :relation_history, :id => relations(:relation_with_redacted_versions_v1).relation_id assert_response :success - assert_template 'relation_history' + assert_template 'browse/history' # there are 4 revisions of the redacted relation, but only 2 # should be showing details here. - assert_select "body div#content div.browse_details", 4 - assert_select "body div#content div.browse_details[id=1] div.common", 1 - assert_select "body div#content div.browse_details[id=2] div.common", 0 - assert_select "body div#content div.browse_details[id=3] div.common", 0 - assert_select "body div#content div.browse_details[id=4] div.common", 1 + assert_select ".browse-section", 4 + assert_select ".browse-section.browse-redacted", 2 + assert_select ".browse-section.browse-relation", 2 end private @@ -132,7 +123,7 @@ def test_redacted_relation_history # First we check that when we don't have an id, it will correctly return a 404 # then we check that we get the correct 404 when a non-existant id is passed # then we check that it will get a successful response, when we do pass an id - def browse_check(type, id) + def browse_check(type, id, template) assert_raise ActionController::UrlGenerationError do get type end @@ -141,6 +132,6 @@ def browse_check(type, id) end get type, {:id => id} assert_response :success - assert_template type + assert_template template end end diff --git a/test/functional/changeset_controller_test.rb b/test/functional/changeset_controller_test.rb index 05f2ff569a..69811ad597 100644 --- a/test/functional/changeset_controller_test.rb +++ b/test/functional/changeset_controller_test.rb @@ -56,25 +56,13 @@ def test_routes { :controller => "changeset", :action => "list", :nearby => true } ) assert_routing( - { :path => "/browse/changesets", :method => :get }, + { :path => "/history", :method => :get }, { :controller => "changeset", :action => "list" } ) assert_routing( - { :path => "/browse/changesets/feed", :method => :get }, + { :path => "/history/feed", :method => :get }, { :controller => "changeset", :action => "feed", :format => :atom } ) - assert_recognizes( - { :controller => "changeset", :action => "list" }, - { :path => "/browse", :method => :get } - ) - assert_recognizes( - { :controller => "changeset", :action => "list" }, - { :path => "/history", :method => :get } - ) - assert_recognizes( - { :controller => "changeset", :action => "feed", :format => :atom }, - { :path => "/history/feed", :method => :get } - ) end # ----------------------- @@ -1728,14 +1716,23 @@ def test_changeset_limits ## # This should display the last 20 changesets closed. def test_list - changesets = Changeset.where("num_changes > 0").order(:created_at => :desc).limit(20) - assert changesets.size <= 20 get :list, {:format => "html"} assert_response :success + assert_template "changeset/history" + assert_select "h2", :text => "Changesets", :count => 1 + + get :list, {:format => "html", :bbox => '-180,-90,90,180'} + assert_response :success assert_template "list" + + changesets = Changeset. + where("num_changes > 0 and min_lon is not null"). + order(:created_at => :desc). + limit(20) + assert changesets.size <= 20 + # Now check that all 20 (or however many were returned) changesets are in the html - assert_select "h1", :text => "Changesets", :count => 1 - assert_select "div[id='changeset_list'] ul", :count => changesets.size + assert_select "li", :count => changesets.size changesets.each do |changeset| # FIXME this test needs rewriting - test for table contents end @@ -1747,7 +1744,7 @@ def test_list_user user = users(:public_user) get :list, {:format => "html", :display_name => user.display_name} assert_response :success - assert_template "changeset/_user" + assert_template "changeset/history" ## FIXME need to add more checks to see which if edits are actually shown if your data is public end @@ -1781,7 +1778,8 @@ def test_feed_user user = users(:public_user) get :feed, {:format => "atom", :display_name => user.display_name} assert_response :success - assert_template "changeset/_user" + assert_template "changeset/list" + assert_equal "application/atom+xml", response.content_type ## FIXME need to add more checks to see which if edits are actually shown if your data is public end diff --git a/test/functional/diary_entry_controller_test.rb b/test/functional/diary_entry_controller_test.rb index 8725def3dd..92d9bcffda 100644 --- a/test/functional/diary_entry_controller_test.rb +++ b/test/functional/diary_entry_controller_test.rb @@ -96,30 +96,21 @@ def test_showing_new_diary_entry #print @response.body #print @response.to_yaml - assert_select "html", :count => 1 do - assert_select "head", :count => 1 do - assert_select "title", :text => /New Diary Entry/, :count => 1 - end - assert_select "body", :count => 1 do - assert_select "div.wrapper", :count => 1 do - assert_select "div.content-heading", :count => 1 do - assert_select "h1", :text => "New Diary Entry", :count => 1 - end - assert_select "div#content", :count => 1 do - # We don't care about the layout, we just care about the form fields - # that are available - assert_select "form[action='/diary/new']", :count => 1 do - assert_select "input[id=diary_entry_title][name='diary_entry[title]']", :count => 1 - assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :count => 1 - assert_select "input#latitude[name='diary_entry[latitude]'][type=text]", :count => 1 - assert_select "input#longitude[name='diary_entry[longitude]'][type=text]", :count => 1 - assert_select "input[name=commit][type=submit][value=Save]", :count => 1 - end - end - end + assert_select "title", :text => /New Diary Entry/, :count => 1 + assert_select "div.content-heading", :count => 1 do + assert_select "h1", :text => "New Diary Entry", :count => 1 + end + assert_select "div#content", :count => 1 do + # We don't care about the layout, we just care about the form fields + # that are available + assert_select "form[action='/diary/new']", :count => 1 do + assert_select "input[id=diary_entry_title][name='diary_entry[title]']", :count => 1 + assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :count => 1 + assert_select "input#latitude[name='diary_entry[latitude]'][type=text]", :count => 1 + assert_select "input#longitude[name='diary_entry[longitude]'][type=text]", :count => 1 + assert_select "input[name=commit][type=submit][value=Save]", :count => 1 end end - end def test_editing_diary_entry @@ -134,46 +125,32 @@ def test_editing_diary_entry # Verify that you get a not found error, when you pass a bogus id get(:edit, {:display_name => entry.user.display_name, :id => 9999}, {'user' => entry.user.id}) assert_response :not_found - assert_select "html", :count => 1 do - assert_select "body", :count => 1 do - assert_select "div.wrapper", :count => 1 do - assert_select "div.content-heading", :count => 1 do - assert_select "h2", :text => "No entry with the id: 9999", :count => 1 - end - end - end + assert_select "div.content-heading", :count => 1 do + assert_select "h2", :text => "No entry with the id: 9999", :count => 1 end - + # Now pass the id, and check that you can edit it, when using the same # user as the person who created the entry get(:edit, {:display_name => entry.user.display_name, :id => entry.id}, {'user' => entry.user.id}) assert_response :success - assert_select "html", :count => 1 do - assert_select "head", :count => 1 do - assert_select "title", :text => /Edit diary entry/, :count => 1 - end - assert_select "body", :count => 1 do - assert_select "div.wrapper", :count => 1 do - assert_select "div.content-heading", :count => 1 do - assert_select "h1", :text => /Edit diary entry/, :count => 1 - end - assert_select "div#content", :count => 1 do - assert_select "form[action='/user/#{entry.user.display_name}/diary/#{entry.id}/edit'][method=post]", :count => 1 do - assert_select "input#diary_entry_title[name='diary_entry[title]'][value='#{entry.title}']", :count => 1 - assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :text => entry.body, :count => 1 - assert_select "select#diary_entry_language_code", :count => 1 - assert_select "input#latitude[name='diary_entry[latitude]']", :count => 1 - assert_select "input#longitude[name='diary_entry[longitude]']", :count => 1 - assert_select "input[name=commit][type=submit][value=Save]", :count => 1 - assert_select "input[name=commit][type=submit][value=Edit]", :count => 1 - assert_select "input[name=commit][type=submit][value=Preview]", :count => 1 - assert_select "input", :count => 7 - end - end - end + assert_select "title", :text => /Edit diary entry/, :count => 1 + assert_select "div.content-heading", :count => 1 do + assert_select "h1", :text => /Edit diary entry/, :count => 1 + end + assert_select "div#content", :count => 1 do + assert_select "form[action='/user/#{entry.user.display_name}/diary/#{entry.id}/edit'][method=post]", :count => 1 do + assert_select "input#diary_entry_title[name='diary_entry[title]'][value='#{entry.title}']", :count => 1 + assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :text => entry.body, :count => 1 + assert_select "select#diary_entry_language_code", :count => 1 + assert_select "input#latitude[name='diary_entry[latitude]']", :count => 1 + assert_select "input#longitude[name='diary_entry[longitude]']", :count => 1 + assert_select "input[name=commit][type=submit][value=Save]", :count => 1 + assert_select "input[name=commit][type=submit][value=Edit]", :count => 1 + assert_select "input[name=commit][type=submit][value=Preview]", :count => 1 + assert_select "input", :count => 7 end end - + # Now lets see if you can edit the diary entry new_title = "New Title" new_body = "This is a new body for the diary entry" @@ -191,58 +168,40 @@ def test_editing_diary_entry get :view, {:display_name => entry.user.display_name, :id => entry.id}, {'user' => entry.user.id} assert_response :success assert_template 'diary_entry/view' - assert_select "html", :count => 1 do - assert_select "head", :count => 1 do - assert_select "title", :text => /Users' diaries | /, :count => 1 - end - assert_select "body", :count => 1 do - assert_select "div.wrapper", :count => 1 do - assert_select "div.content-heading", :count => 1 do - assert_select "h2", :text => /#{entry.user.display_name}'s diary/, :count => 1 - end - assert_select "div#content", :count => 1 do - assert_select "div.post_heading", :text => /#{new_title}/, :count => 1 - # This next line won't work if the text has been run through the htmlize function - # due to formatting that could be introduced - assert_select "p", :text => /#{new_body}/, :count => 1 - assert_select "abbr[class=geo][title=#{number_with_precision(new_latitude, :precision => 4)}; #{number_with_precision(new_longitude, :precision => 4)}]", :count => 1 - # As we're not logged in, check that you cannot edit - #print @response.body - assert_select "a[href='/user/#{entry.user.display_name}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1 - end - end - end + assert_select "title", :text => /Users' diaries | /, :count => 1 + assert_select "div.content-heading", :count => 1 do + assert_select "h2", :text => /#{entry.user.display_name}'s diary/, :count => 1 + end + assert_select "div#content", :count => 1 do + assert_select "div.post_heading", :text => /#{new_title}/, :count => 1 + # This next line won't work if the text has been run through the htmlize function + # due to formatting that could be introduced + assert_select "p", :text => /#{new_body}/, :count => 1 + assert_select "abbr[class=geo][title=#{number_with_precision(new_latitude, :precision => 4)}; #{number_with_precision(new_longitude, :precision => 4)}]", :count => 1 + # As we're not logged in, check that you cannot edit + #print @response.body + assert_select "a[href='/user/#{entry.user.display_name}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1 end # and when not logged in as the user who wrote the entry get :view, {:display_name => entry.user.display_name, :id => entry.id}, {'user' => entry.user.id} assert_response :success assert_template 'diary_entry/view' - assert_select "html", :count => 1 do - assert_select "head", :count => 1 do - assert_select "title", :text => /Users' diaries | /, :count => 1 - end - assert_select "body", :count => 1 do - assert_select "div.wrapper", :count => 1 do - assert_select "div.content-heading", :count => 1 do - assert_select "h2", :text => /#{users(:normal_user).display_name}'s diary/, :count => 1 - end - assert_select "div#content", :count => 1 do - assert_select "div.post_heading", :text => /#{new_title}/, :count => 1 - # This next line won't work if the text has been run through the htmlize function - # due to formatting that could be introduced - assert_select "p", :text => /#{new_body}/, :count => 1 - assert_select "abbr[class=geo][title=#{number_with_precision(new_latitude, :precision => 4)}; #{number_with_precision(new_longitude, :precision => 4)}]", :count => 1 - # As we're not logged in, check that you cannot edit - assert_select "li[class=hidden show_if_user_#{entry.user.id}]", :count => 1 do - assert_select "a[href='/user/#{entry.user.display_name}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1 - end - end - end + assert_select "title", :text => /Users' diaries | /, :count => 1 + assert_select "div.content-heading", :count => 1 do + assert_select "h2", :text => /#{users(:normal_user).display_name}'s diary/, :count => 1 + end + assert_select "div#content", :count => 1 do + assert_select "div.post_heading", :text => /#{new_title}/, :count => 1 + # This next line won't work if the text has been run through the htmlize function + # due to formatting that could be introduced + assert_select "p", :text => /#{new_body}/, :count => 1 + assert_select "abbr[class=geo][title=#{number_with_precision(new_latitude, :precision => 4)}; #{number_with_precision(new_longitude, :precision => 4)}]", :count => 1 + # As we're not logged in, check that you cannot edit + assert_select "li[class=hidden show_if_user_#{entry.user.id}]", :count => 1 do + assert_select "a[href='/user/#{entry.user.display_name}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1 end end - #print @response.body - end def test_edit_diary_entry_i18n @@ -261,29 +220,21 @@ def test_create_diary_entry # Now try again when logged in get :new, {}, {:user => users(:normal_user).id} assert_response :success - assert_select "html", :count => 1 do - assert_select "head", :count => 1 do - assert_select "title", :text => /New Diary Entry/, :count => 1 - end - assert_select "body", :count => 1 do - assert_select "div.wrapper", :count => 1 do - assert_select "div.content-heading", :count => 1 do - assert_select "h1", :text => /New Diary Entry/, :count => 1 - end - assert_select "div#content", :count => 1 do - assert_select "form[action='/diary/new'][method=post]", :count => 1 do - assert_select "input#diary_entry_title[name='diary_entry[title]']", :count => 1 - assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :text => "", :count => 1 - assert_select "select#diary_entry_language_code", :count => 1 - assert_select "input#latitude[name='diary_entry[latitude]']", :count => 1 - assert_select "input#longitude[name='diary_entry[longitude]']", :count => 1 - assert_select "input[name=commit][type=submit][value=Save]", :count => 1 - assert_select "input[name=commit][type=submit][value=Edit]", :count => 1 - assert_select "input[name=commit][type=submit][value=Preview]", :count => 1 - assert_select "input", :count => 7 - end - end - end + assert_select "title", :text => /New Diary Entry/, :count => 1 + assert_select "div.content-heading", :count => 1 do + assert_select "h1", :text => /New Diary Entry/, :count => 1 + end + assert_select "div#content", :count => 1 do + assert_select "form[action='/diary/new'][method=post]", :count => 1 do + assert_select "input#diary_entry_title[name='diary_entry[title]']", :count => 1 + assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :text => "", :count => 1 + assert_select "select#diary_entry_language_code", :count => 1 + assert_select "input#latitude[name='diary_entry[latitude]']", :count => 1 + assert_select "input#longitude[name='diary_entry[longitude]']", :count => 1 + assert_select "input[name=commit][type=submit][value=Save]", :count => 1 + assert_select "input[name=commit][type=submit][value=Edit]", :count => 1 + assert_select "input[name=commit][type=submit][value=Preview]", :count => 1 + assert_select "input", :count => 7 end end @@ -320,14 +271,8 @@ def test_creating_diary_comment # Verify that you get a not found error, when you pass a bogus id post :comment, {:display_name => entry.user.display_name, :id => 9999}, {:user => users(:public_user).id} assert_response :not_found - assert_select "html", :count => 1 do - assert_select "body", :count => 1 do - assert_select "div.wrapper", :count => 1 do - assert_select "div.content-heading", :count => 1 do - assert_select "h2", :text => "No entry with the id: 9999", :count => 1 - end - end - end + assert_select "div.content-heading", :count => 1 do + assert_select "h2", :text => "No entry with the id: 9999", :count => 1 end # Now try again with the right id diff --git a/test/functional/geocoder_controller_test.rb b/test/functional/geocoder_controller_test.rb index d8eee97d8a..e39bab80b8 100644 --- a/test/functional/geocoder_controller_test.rb +++ b/test/functional/geocoder_controller_test.rb @@ -8,7 +8,7 @@ class GeocoderControllerTest < ActionController::TestCase # test all routes which lead to this controller def test_routes assert_routing( - { :path => "/geocoder/search", :method => :post }, + { :path => "/search", :method => :get }, { :controller => "geocoder", :action => "search" } ) assert_routing( diff --git a/test/functional/message_controller_test.rb b/test/functional/message_controller_test.rb index 77fdfbeb91..45d0a267c4 100644 --- a/test/functional/message_controller_test.rb +++ b/test/functional/message_controller_test.rb @@ -93,7 +93,7 @@ def test_new get :new, :display_name => "non_existent_user" assert_response :not_found assert_template "user/no_such_user" - assert_select "h2", "The user non_existent_user does not exist" + assert_select "h1", "The user non_existent_user does not exist" end ## diff --git a/test/functional/site_controller_test.rb b/test/functional/site_controller_test.rb index 2db756ad12..86a8fe609f 100644 --- a/test/functional/site_controller_test.rb +++ b/test/functional/site_controller_test.rb @@ -40,10 +40,10 @@ def test_routes ) assert_routing( { :path => "/export", :method => :get }, - { :controller => "site", :action => "index", :export => true } + { :controller => "site", :action => "export" } ) assert_recognizes( - { :controller => "site", :action => "index", :export => true, :format => "html" }, + { :controller => "site", :action => "export", :format => "html" }, { :path => "/export.html", :method => :get } ) assert_routing( @@ -74,7 +74,6 @@ def test_index get :index assert_response :success assert_template 'index' - assert_site_partials end def test_index_redirect @@ -122,12 +121,6 @@ def test_offline get :offline assert_response :success assert_template 'offline' - assert_site_partials 0 - end - - def assert_site_partials(count = 1) - assert_template :partial => '_search', :count => count - assert_template :partial => '_sidebar', :count => count end # test the right editor gets used when the user hasn't set a preference diff --git a/test/functional/user_blocks_controller_test.rb b/test/functional/user_blocks_controller_test.rb index 49fb6552ff..d52ff68c4d 100644 --- a/test/functional/user_blocks_controller_test.rb +++ b/test/functional/user_blocks_controller_test.rb @@ -141,13 +141,13 @@ def test_new get :new assert_response :not_found assert_template "user/no_such_user" - assert_select "h2", "The user does not exist" + assert_select "h1", "The user does not exist" # We should get an error if the user doesn't exist get :new, :display_name => "non_existent_user" assert_response :not_found assert_template "user/no_such_user" - assert_select "h2", "The user non_existent_user does not exist" + assert_select "h1", "The user non_existent_user does not exist" end ## @@ -238,13 +238,13 @@ def test_create post :create assert_response :not_found assert_template "user/no_such_user" - assert_select "h2", "The user does not exist" + assert_select "h1", "The user does not exist" # We should get an error if the user doesn't exist post :create, :display_name => "non_existent_user" assert_response :not_found assert_template "user/no_such_user" - assert_select "h2", "The user non_existent_user does not exist" + assert_select "h1", "The user non_existent_user does not exist" end ## @@ -369,7 +369,7 @@ def test_blocks_on get :blocks_on, :display_name => "non_existent_user" assert_response :not_found assert_template "user/no_such_user" - assert_select "h2", "The user non_existent_user does not exist" + assert_select "h1", "The user non_existent_user does not exist" # Check the list of blocks for a user that has never been blocked get :blocks_on, :display_name => users(:normal_user).display_name @@ -407,7 +407,7 @@ def test_blocks_by get :blocks_by, :display_name => "non_existent_user" assert_response :not_found assert_template "user/no_such_user" - assert_select "h2", "The user non_existent_user does not exist" + assert_select "h1", "The user non_existent_user does not exist" # Check the list of blocks given by one moderator get :blocks_by, :display_name => users(:moderator_user).display_name diff --git a/test/functional/user_controller_test.rb b/test/functional/user_controller_test.rb index 66fcef7850..1cfb1c8644 100644 --- a/test/functional/user_controller_test.rb +++ b/test/functional/user_controller_test.rb @@ -397,7 +397,7 @@ def test_user_lost_password end assert_response :success assert_template :lost_password - assert_select "div#error", /^Could not find that email address/ + assert_select ".error", /^Could not find that email address/ # Test resetting using the address as recorded for a user that has an # address which is case insensitively unique @@ -476,7 +476,7 @@ def test_user_update assert_response :success assert_template :account assert_select "div#errorExplanation", false - assert_select "div#notice", /^User information updated successfully/ + assert_select ".notice", /^User information updated successfully/ assert_select "form#accountForm > fieldset > div.form-row > div#user_description_container > div#user_description_content > textarea#user_description", user.description # Changing name to one that exists should fail @@ -484,7 +484,7 @@ def test_user_update post :account, { :display_name => user.display_name, :user => new_attributes }, { "user" => user.id } assert_response :success assert_template :account - assert_select "div#notice", false + assert_select ".notice", false assert_select "div#errorExplanation" assert_select "form#accountForm > fieldset > div.form-row > div.field_with_errors > input#user_display_name" @@ -493,7 +493,7 @@ def test_user_update post :account, { :display_name => user.display_name, :user => new_attributes }, { "user" => user.id } assert_response :success assert_template :account - assert_select "div#notice", false + assert_select ".notice", false assert_select "div#errorExplanation" assert_select "form#accountForm > fieldset > div.form-row > div.field_with_errors > input#user_display_name" @@ -503,7 +503,7 @@ def test_user_update assert_response :success assert_template :account assert_select "div#errorExplanation", false - assert_select "div#notice", /^User information updated successfully/ + assert_select ".notice", /^User information updated successfully/ assert_select "form#accountForm > fieldset > div.form-row > input#user_display_name[value=?]", "new tester" # Record the change of name @@ -514,7 +514,7 @@ def test_user_update post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id } assert_response :success assert_template :account - assert_select "div#notice", false + assert_select ".notice", false assert_select "div#errorExplanation" assert_select "form#accountForm > fieldset > div.form-row > div.field_with_errors > input#user_new_email" @@ -523,7 +523,7 @@ def test_user_update post :account, { :display_name => user.display_name, :user => user.attributes }, { "user" => user.id } assert_response :success assert_template :account - assert_select "div#notice", false + assert_select ".notice", false assert_select "div#errorExplanation" assert_select "form#accountForm > fieldset > div.form-row > div.field_with_errors > input#user_new_email" @@ -533,7 +533,7 @@ def test_user_update assert_response :success assert_template :account assert_select "div#errorExplanation", false - assert_select "div#notice", /^User information updated successfully/ + assert_select ".notice", /^User information updated successfully/ assert_select "form#accountForm > fieldset > div.form-row > input#user_new_email[value=?]", user.new_email end @@ -548,7 +548,7 @@ def test_user_view_account get :view, {:display_name => "test"} assert_response :success assert_select "div#userinformation" do - assert_select "a[href=/user/test/edits]", 1 + assert_select "a[href^=/user/test/edits]", 1 assert_select "a[href=/user/test/traces]", 1 assert_select "a[href=/user/test/diary]", 1 assert_select "a[href=/user/test/diary/comments]", 1 @@ -562,7 +562,7 @@ def test_user_view_account get :view, {:display_name => "blocked"} assert_response :success assert_select "div#userinformation" do - assert_select "a[href=/user/blocked/edits]", 1 + assert_select "a[href^=/user/blocked/edits]", 1 assert_select "a[href=/user/blocked/traces]", 1 assert_select "a[href=/user/blocked/diary]", 1 assert_select "a[href=/user/blocked/diary/comments]", 1 @@ -576,7 +576,7 @@ def test_user_view_account get :view, {:display_name => "moderator"} assert_response :success assert_select "div#userinformation" do - assert_select "a[href=/user/moderator/edits]", 1 + assert_select "a[href^=/user/moderator/edits]", 1 assert_select "a[href=/user/moderator/traces]", 1 assert_select "a[href=/user/moderator/diary]", 1 assert_select "a[href=/user/moderator/diary/comments]", 1 @@ -593,7 +593,7 @@ def test_user_view_account get :view, {:display_name => "test"} assert_response :success assert_select "div#userinformation" do - assert_select "a[href=/user/test/edits]", 1 + assert_select "a[href^=/user/test/edits]", 1 assert_select "a[href=/traces/mine]", 1 assert_select "a[href=/user/test/diary]", 1 assert_select "a[href=/user/test/diary/comments]", 1 @@ -610,7 +610,7 @@ def test_user_view_account get :view, {:display_name => "test"} assert_response :success assert_select "div#userinformation" do - assert_select "a[href=/user/test/edits]", 1 + assert_select "a[href^=/user/test/edits]", 1 assert_select "a[href=/user/test/traces]", 1 assert_select "a[href=/user/test/diary]", 1 assert_select "a[href=/user/test/diary/comments]", 1 diff --git a/test/functional/user_roles_controller_test.rb b/test/functional/user_roles_controller_test.rb index e942cd0faf..4e4bd6da72 100644 --- a/test/functional/user_roles_controller_test.rb +++ b/test/functional/user_roles_controller_test.rb @@ -42,7 +42,7 @@ def test_grant end assert_response :not_found assert_template "user/no_such_user" - assert_select "h2", "The user non_existent_user does not exist" + assert_select "h1", "The user non_existent_user does not exist" # Granting a role from a user that already has it should fail assert_no_difference "UserRole.count" do @@ -100,7 +100,7 @@ def test_revoke end assert_response :not_found assert_template "user/no_such_user" - assert_select "h2", "The user non_existent_user does not exist" + assert_select "h1", "The user non_existent_user does not exist" # Removing a role from a user that doesn't have it should fail assert_no_difference "UserRole.count" do diff --git a/test/integration/client_application_test.rb b/test/integration/client_application_test.rb index fd6f5ecfa0..f40a966757 100644 --- a/test/integration/client_application_test.rb +++ b/test/integration/client_application_test.rb @@ -79,27 +79,16 @@ def test_3rd_party_token ## # utility method to make the HTML screening easier to read. def assert_in_heading - assert_select "html:root" do - assert_select "body" do - assert_select "div.wrapper" do - assert_select "div.content-heading" do - yield - end - end - end + assert_select "div.content-heading" do + yield end end ## # utility method to make the HTML screening easier to read. def assert_in_body - assert_select "html:root" do - assert_select "body" do - assert_select "div#content" do - yield - end - end + assert_select "div#content" do + yield end end - end diff --git a/test/integration/user_diaries_test.rb b/test/integration/user_diaries_test.rb index 79436a7db2..278a68e7b0 100644 --- a/test/integration/user_diaries_test.rb +++ b/test/integration/user_diaries_test.rb @@ -36,21 +36,13 @@ def test_showing_create_diary_entry # functional tests rather than this integration test # There are some things that are specific to the integratio # that need to be tested, which can't be tested in the functional tests - assert_select "html:root" do - assert_select "body" do - assert_select "div.wrapper", :count => 1 do - assert_select "div.content-heading", :count => 1 do - assert_select "h1", "New Diary Entry" - end - assert_select "div#content" do - assert_select "form[action='/diary/new']" do - assert_select "input[id=diary_entry_title]" - end - end - end + assert_select "div.content-heading", :count => 1 do + assert_select "h1", "New Diary Entry" + end + assert_select "div#content" do + assert_select "form[action='/diary/new']" do + assert_select "input[id=diary_entry_title]" end end - - end end diff --git a/test/integration/user_login_test.rb b/test/integration/user_login_test.rb index 1d7e429cff..6d8e3e7e0f 100644 --- a/test/integration/user_login_test.rb +++ b/test/integration/user_login_test.rb @@ -16,17 +16,17 @@ def test_login_email_password_normal follow_redirect! assert_response :success - post '/login', {'username' => user.email, 'password' => "wrong", :referer => "/browse"} + post '/login', {'username' => user.email, 'password' => "wrong", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success assert_template 'login' - post '/login', {'username' => user.email, 'password' => "test", :referer => "/browse"} + post '/login', {'username' => user.email, 'password' => "test", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success - assert_template 'changeset/list' + assert_template 'changeset/history' end def test_login_email_password_normal_upcase @@ -38,13 +38,13 @@ def test_login_email_password_normal_upcase follow_redirect! assert_response :success - post '/login', {'username' => user.email.upcase, 'password' => "wrong", :referer => "/browse"} + post '/login', {'username' => user.email.upcase, 'password' => "wrong", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success assert_template 'login' - post '/login', {'username' => user.email.upcase, 'password' => "test", :referer => "/browse"} + post '/login', {'username' => user.email.upcase, 'password' => "test", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success @@ -60,13 +60,13 @@ def test_login_email_password_normal_titlecase follow_redirect! assert_response :success - post '/login', {'username' => user.email.titlecase, 'password' => "wrong", :referer => "/browse"} + post '/login', {'username' => user.email.titlecase, 'password' => "wrong", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success assert_template 'login' - post '/login', {'username' => user.email.titlecase, 'password' => "test", :referer => "/browse"} + post '/login', {'username' => user.email.titlecase, 'password' => "test", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success @@ -82,17 +82,17 @@ def test_login_email_password_public follow_redirect! assert_response :success - post '/login', {'username' => user.email, 'password' => "wrong", :referer => "/browse"} + post '/login', {'username' => user.email, 'password' => "wrong", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success assert_template 'login' - post '/login', {'username' => user.email, 'password' => "test", :referer => "/browse"} + post '/login', {'username' => user.email, 'password' => "test", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success - assert_template 'changeset/list' + assert_template 'changeset/history' end def test_login_email_password_public_upcase @@ -104,17 +104,17 @@ def test_login_email_password_public_upcase follow_redirect! assert_response :success - post '/login', {'username' => user.email.upcase, 'password' => "wrong", :referer => "/browse"} + post '/login', {'username' => user.email.upcase, 'password' => "wrong", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success assert_template 'login' - post '/login', {'username' => user.email.upcase, 'password' => "test", :referer => "/browse"} + post '/login', {'username' => user.email.upcase, 'password' => "test", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success - assert_template 'changeset/list' + assert_template 'changeset/history' end def test_login_email_password_public_titlecase @@ -126,17 +126,17 @@ def test_login_email_password_public_titlecase follow_redirect! assert_response :success - post '/login', {'username' => user.email.titlecase, 'password' => "wrong", :referer => "/browse"} + post '/login', {'username' => user.email.titlecase, 'password' => "wrong", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success assert_template 'login' - post '/login', {'username' => user.email.titlecase, 'password' => "test", :referer => "/browse"} + post '/login', {'username' => user.email.titlecase, 'password' => "test", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success - assert_template 'changeset/list' + assert_template 'changeset/history' end def test_login_username_password_normal @@ -148,17 +148,17 @@ def test_login_username_password_normal follow_redirect! assert_response :success - post '/login', {'username' => user.display_name, 'password' => "wrong", :referer => "/browse"} + post '/login', {'username' => user.display_name, 'password' => "wrong", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success assert_template 'login' - post '/login', {'username' => user.display_name, 'password' => "test", :referer => "/browse"} + post '/login', {'username' => user.display_name, 'password' => "test", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success - assert_template 'changeset/list' + assert_template 'changeset/history' end def test_login_username_password_normal_upcase @@ -170,13 +170,13 @@ def test_login_username_password_normal_upcase follow_redirect! assert_response :success - post '/login', {'username' => user.display_name.upcase, 'password' => "wrong", :referer => "/browse"} + post '/login', {'username' => user.display_name.upcase, 'password' => "wrong", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success assert_template 'login' - post '/login', {'username' => user.display_name.upcase, 'password' => "test", :referer => "/browse"} + post '/login', {'username' => user.display_name.upcase, 'password' => "test", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success @@ -192,13 +192,13 @@ def test_login_username_password_normal_titlecase follow_redirect! assert_response :success - post '/login', {'username' => user.display_name.titlecase, 'password' => "wrong", :referer => "/browse"} + post '/login', {'username' => user.display_name.titlecase, 'password' => "wrong", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success assert_template 'login' - post '/login', {'username' => user.display_name.titlecase, 'password' => "test", :referer => "/browse"} + post '/login', {'username' => user.display_name.titlecase, 'password' => "test", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success @@ -214,17 +214,17 @@ def test_login_username_password_public follow_redirect! assert_response :success - post '/login', {'username' => user.display_name, 'password' => "wrong", :referer => "/browse"} + post '/login', {'username' => user.display_name, 'password' => "wrong", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success assert_template 'login' - post '/login', {'username' => user.display_name, 'password' => "test", :referer => "/browse"} + post '/login', {'username' => user.display_name, 'password' => "test", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success - assert_template 'changeset/list' + assert_template 'changeset/history' end def test_login_username_password_public_upcase @@ -236,17 +236,17 @@ def test_login_username_password_public_upcase follow_redirect! assert_response :success - post '/login', {'username' => user.display_name.upcase, 'password' => "wrong", :referer => "/browse"} + post '/login', {'username' => user.display_name.upcase, 'password' => "wrong", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success assert_template 'login' - post '/login', {'username' => user.display_name.upcase, 'password' => "test", :referer => "/browse"} + post '/login', {'username' => user.display_name.upcase, 'password' => "test", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success - assert_template 'changeset/list' + assert_template 'changeset/history' end def test_login_username_password_public_titlecase @@ -258,17 +258,17 @@ def test_login_username_password_public_titlecase follow_redirect! assert_response :success - post '/login', {'username' => user.display_name.titlecase, 'password' => "wrong", :referer => "/browse"} + post '/login', {'username' => user.display_name.titlecase, 'password' => "wrong", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success assert_template 'login' - post '/login', {'username' => user.display_name.titlecase, 'password' => "test", :referer => "/browse"} + post '/login', {'username' => user.display_name.titlecase, 'password' => "test", :referer => "/history"} assert_response :redirect follow_redirect! assert_response :success - assert_template 'changeset/list' + assert_template 'changeset/history' end def test_login_openid_success @@ -277,7 +277,7 @@ def test_login_openid_success assert_redirected_to "controller" => "user", "action" => "login", "cookie_test" => "true" follow_redirect! assert_response :success - post '/login', {'openid_url' => "http://localhost:1123/john.doe?openid.success=true", :referer => "/browse"} + post '/login', {'openid_url' => "http://localhost:1123/john.doe?openid.success=true", :referer => "/history"} assert_response :redirect res = openid_request(@response.redirect_url) @@ -286,7 +286,7 @@ def test_login_openid_success assert_response :redirect follow_redirect! assert_response :success - assert_template 'changeset/list' + assert_template 'changeset/history' end def test_login_openid_cancel From 87f9f5988644856dd404872763d05c53b1909210 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 19 Nov 2013 11:18:11 -0800 Subject: [PATCH 232/270] Eliminate loading flash for welcome overlay --- app/assets/javascripts/index.js | 7 ++----- app/assets/stylesheets/common.css.scss | 10 ++++++++++ app/assets/stylesheets/small.css.scss | 2 +- app/views/layouts/map.html.erb | 9 +++++++++ app/views/site/index.html.erb | 13 ++----------- 5 files changed, 24 insertions(+), 17 deletions(-) diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 59e2313817..365d33e3ab 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -198,22 +198,19 @@ $(document).ready(function () { OSM.Index = function(map) { var page = {}; - page.pushstate = function(path) { + page.pushstate = function() { $("#content").addClass("overlay-sidebar"); map.invalidateSize({pan: false}) .panBy([-350, 0], {animate: false}); - OSM.loadSidebarContent(path); - page.load(); }; page.load = function() { return map.getState(); }; - page.popstate = function(path) { + page.popstate = function() { $("#content").addClass("overlay-sidebar"); map.invalidateSize({pan: false}); - OSM.loadSidebarContent(path); }; page.unload = function() { diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index a7591ba214..ebc5109c63 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -649,12 +649,22 @@ nav.secondary { } } + .welcome { + display: none; + } + .overlay-sidebar #sidebar { position: absolute; z-index: 1000; height: auto; border-bottom-right-radius: 5px; overflow: hidden; + .welcome { + display: block; + } + #sidebar_content { + display: none; + } } .welcome { diff --git a/app/assets/stylesheets/small.css.scss b/app/assets/stylesheets/small.css.scss index 39b946af06..e9d0a47790 100644 --- a/app/assets/stylesheets/small.css.scss +++ b/app/assets/stylesheets/small.css.scss @@ -122,7 +122,7 @@ nav.secondary { } #sidebar .welcome { - display: none; + display: none !important; } .leaflet-top.leaflet-right { diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb index 2170705b00..2fe8b9b3bd 100644 --- a/app/views/layouts/map.html.erb +++ b/app/views/layouts/map.html.erb @@ -40,6 +40,15 @@ <%= render :partial => "layouts/flash" %> <%= yield %>
    + + <% unless @user %> +
    +

    <%= t 'layouts.intro_header' %>

    +

    <%= t 'layouts.intro_text' %>

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