Merge branch 'master' into openstreetbugs

Conflicts:
	Gemfile
	app/helpers/application_helper.rb
	app/views/site/index.html.erb

diff --cc Gemfile
index 25b10fe7b09c3895944fae03c49849846bc8bc0d,ad2f04c29feb32f232178d13a5a9012a490de45a..5193881af82a3b155aa93d978fbbbfb959dff66c
--- 1/Gemfile
--- 2/Gemfile
+++ b/Gemfile
@@@ -24,7 -24,7 +24,8 @@@ gem 'composite_primary_keys', '>= 5.0.8
  gem 'http_accept_language', '>= 1.0.2'
  gem 'paperclip', '~> 2.0'
  gem 'deadlock_retry', '>= 1.2.0'
+ gem 'i18n-js', '>= 3.0.0.rc2'
 +gem 'jsonify-rails'
  
  # We need ruby-openid 2.2.0 or later for ruby 1.9 support
  gem 'ruby-openid', '>= 2.2.0'

diff --cc Gemfile.lock
index 158694564993cb1f7b9232757d8171d60d33f6fc,1ec7948d14a67411e68d19c1af81543bfdcfc026..666b6a094208b470635be70e676fa64647ef6126
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -31,9 -31,8 +31,8 @@@ GE
        multi_json (~> 1.0)
      arel (3.0.2)
      bigdecimal (1.1.0)
-     browser (0.1.4)
--    builder (3.0.0)
--    cocaine (0.2.1)
++    builder (3.0.3)
++    cocaine (0.3.0)
      coffee-rails (3.2.2)
        coffee-script (>= 2.2.0)
        railties (~> 3.2.0)
@@@ -55,10 -54,12 +54,12 @@@
      http_accept_language (1.0.2)
      httpauth (0.1)
      httpclient (2.2.7)
--    i18n (0.6.0)
++    i18n (0.6.1)
+     i18n-js (3.0.0.rc2)
+       i18n
      iconv (0.1)
      journey (1.0.4)
--    jquery-rails (2.1.1)
++    jquery-rails (2.1.2)
        railties (>= 3.1.0, < 5.0)
        thor (~> 0.14)
      json (1.7.5)
@@@ -75,13 -71,13 +76,13 @@@
        i18n (>= 0.4.0)
        mime-types (~> 1.16)
        treetop (~> 1.4.8)
--    memcached (1.4.3)
++    memcached (1.4.5)
      mime-types (1.19)
--    minitest (3.3.0)
++    minitest (3.4.0)
      multi_json (1.3.6)
      multipart-post (1.1.5)
      nokogiri (1.5.5)
--    oauth (0.4.6)
++    oauth (0.4.7)
      oauth-plugin (0.4.1)
        multi_json
        oauth (~> 0.4.4)
@@@ -100,7 -96,7 +101,7 @@@
        activesupport (>= 2.3.2)
        cocaine (>= 0.0.2)
        mime-types
--    pg (0.14.0)
++    pg (0.14.1)
      polyglot (0.3.3)
      rack (1.4.1)
      rack-cache (1.2)
@@@ -120,7 -116,7 +121,7 @@@
        activesupport (= 3.2.8)
        bundler (~> 1.0)
        railties (= 3.2.8)
--    rails-i18n (0.6.5)
++    rails-i18n (0.6.6)
        i18n (~> 0.5)
      railties (3.2.8)
        actionpack (= 3.2.8)
@@@ -150,14 -146,14 +151,14 @@@
        libv8 (~> 3.3.10)
      thor (0.16.0)
      tilt (1.3.3)
--    timecop (0.4.5)
++    timecop (0.5.1)
      treetop (1.4.10)
        polyglot
        polyglot (>= 0.3.1)
      tzinfo (0.3.33)
--    uglifier (1.2.7)
++    uglifier (1.3.0)
        execjs (>= 0.3.0)
--      multi_json (~> 1.3)
++      multi_json (~> 1.0, >= 1.0.2)
      validates_email_format_of (1.5.3)
  
  PLATFORMS
@@@ -174,9 -169,9 +174,10 @@@ DEPENDENCIE
    htmlentities
    http_accept_language (>= 1.0.2)
    httpclient
+   i18n-js (>= 3.0.0.rc2)
    iconv
    jquery-rails
 +  jsonify-rails
    libxml-ruby (>= 2.0.5)
    memcached (>= 1.4.1)
    minitest

diff --cc app/assets/javascripts/application.js
index 311798aa57379fe18a0a14a6410768d40356bb11,e345f30743f62a6b2ee3f1dabc5ecaf295ba35c8..71eb717118cb8689acb317f52c45e1f5d30502e5
--- 1/app/assets/javascripts/site.js
--- 2/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@@ -2,6 -2,28 +2,29 @@@
  //= require jquery_ujs
  //= require jquery.autogrowtextarea
  //= require jquery.timers
+ //= require jquery.cookie
+ //= require augment
+ //= require openlayers
+ //= require i18n/translations
+ //= require globals
+ //= require params
+ //= require piwik
+ //= require browse
+ //= require export
+ //= require map
+ //= require key
+ //= require menu
+ //= require sidebar
+ //= require richtext
+ //= require resize
++//= require notes
+ 
+ function zoomPrecision(zoom) {
+     var decimals = Math.pow(10, Math.floor(zoom/3));
+     return function(x) {
+          return Math.round(x * decimals) / decimals;
+     };
+ }
  
  /*
   * Called as the user scrolls/zooms around to aniplate hrefs of the

diff --cc app/assets/stylesheets/common.css.scss
Simple merge

diff --cc app/controllers/browse_controller.rb
Simple merge

diff --cc app/helpers/application_helper.rb
index e6a1e58e688721a0272c4f0a489424c5a86dc7c3,e0c299ca54ce0e4b2a6c329b5f7be0b6d7eb75ac..fb422cc17ead31643db19b04a2f55a9f358f5a85
--- 1/app/helpers/application_helper.rb
--- 2/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@@ -106,33 -87,4 +87,16 @@@ module ApplicationHelpe
        end
      end
    end
- 
- private
- 
-   def javascript_strings_for_key(key)
-     js = ""
-     value = I18n.t(key, :locale => "en")
- 
-     if value.is_a?(String)
-       js << "i18n_strings['#{key}'] = '" << escape_javascript(t(key)) << "';\n"
-     else
-       value.each_key do |k|
-         js << javascript_strings_for_key("#{key}.#{k}")
-       end
-     end
- 
-     return js
-   end
 +
 +  def friendly_date(date)
 +    content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly))
 +  end
 +
 +  def note_author(object, link_options = {})
 +    if object.author.nil?
 +      h(object.author_name)
 +    else
 +      link_to h(object.author_name), link_options.merge({:controller => "user", :action => "view", :display_name => object.author_name})
 +    end
 +  end
  end

diff --cc app/models/user.rb
Simple merge

diff --cc app/views/browse/_map.html.erb
index d8ca30a15a220550da4fbe2d0616b036d2b77d4b,6dba6cff3beffea723d1c1e8d7f6f310991128db..44823218bf16d7fafc1a8b5b02645cb3539dfe70
--- 1/app/views/browse/_map.html.erb
--- 2/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@@ -43,10 -36,8 +40,8 @@@
    </ul>
  </div>
  
 -<% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible %>
 +<% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible? %>
    <script type="text/javascript">
-     OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
- 
      function remoteEditHandler(event, bbox, select) {
        var left = bbox.left - 0.0001;
        var top = bbox.top + 0.0001;

diff --cc app/views/site/index.html.erb
index 4b37fc8afe0a8a2943db79f688e321d45c00cbfd,8f8d8737be1780be7b1fe12263272c759bb05111..58bc59c204b53cc3e6c252e627eb24476687b923
--- 1/app/views/site/index.html.erb
--- 2/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@@ -6,8 -6,7 +6,8 @@@
  
  <% unless STATUS == :api_offline or STATUS == :database_offline -%>
    <% content_for :editmenu do -%>
-     <li><%= link_to t("browse.start_rjs.data_layer_name"), "#", :id => "show_data" %></li>
 +    <li><%= link_to t("browse.start_rjs.notes_layer_name"), "#", :id => "show_notes" %></li>
+     <li><%= link_to t("browse.start_rjs.data_layer_name"), { :controller => :browse, :action => :start }, :id => "show_data" %></li>
    <% end -%>
  <% end -%>
  
@@@ -52,117 -46,14 +48,32 @@@
  <script type="text/javascript">
    var marker;
    var map;
- 
-   OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
+   var params = OSM.mapParams();
  
 +  <% if @user %>
 +    var loginName = "<%= @user.display_name %>"
 +  <% end %>
 +
    function mapInit(){
      map = createMap("map");
  
-     <% unless object_zoom %>
-       <% if bbox %>
-         var bbox = new OpenLayers.Bounds(<%= minlon %>, <%= minlat %>, <%= maxlon %>, <%= maxlat %>);
 +    <% unless STATUS == :api_offline or STATUS == :database_offline %>
 +      map.dataLayer = new OpenLayers.Layer("<%= I18n.t 'browse.start_rjs.data_layer_name' %>", {
 +          visibility: false,
 +          displayInLayerSwitcher: false
 +      });
 +      map.addLayer(map.dataLayer);
 +
 +      map.noteLayer = addNoteLayer(map, "<%= notes_url :format => 'json' %>", $("#createnoteanchor"), 11);
 +
 +      <% if params[:notes] == "yes" -%>
 +      map.noteLayer.setVisibility(true);
 +      <% end -%>
 +    <% end %>
 +
+     if (!params.object_zoom) {
+       if (params.bbox) {
+         var bbox = new OpenLayers.Bounds(params.minlon, params.minlat, params.maxlon, params.maxlat);
  
          map.zoomToExtent(proj(bbox));
  
@@@ -207,12 -91,11 +111,15 @@@
    }
  
    $(document).ready(function () {
-     $("#show_data").click(function () {
-       $.ajax({ url: "<%= url_for :controller => :browse, :action => :start %>" });
 +    $("#show_notes").click(function () {
 +      map.noteLayer.setVisibility(true);
 +    });
 +
+     $("#show_data").click(function (e) {
+       $.ajax({ url: $(this).attr('href'), success: function (sidebarHtml) {
+         startBrowse(sidebarHtml);
+       }});
+       e.preventDefault();
      });
  
      $("body").on("click", "a.set_position", function () {

diff --cc app/views/user/view.html.erb
Simple merge

diff --cc config/example.application.yml
Simple merge

diff --cc config/locales/de.yml
Simple merge

diff --cc config/locales/en.yml
Simple merge

diff --cc config/routes.rb
Simple merge