X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/397db07d65eec20de92f8c5220a4d41fc7d7ae7b..78e6578daaa8171c86c67d1046095fcaa1f6e919:/app/views/site/edit.rhtml diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml index 08d6133c4..8ff98a3b1 100644 --- a/app/views/site/edit.rhtml +++ b/app/views/site/edit.rhtml @@ -1,9 +1,22 @@ -<% if API_READONLY %> +<% if API_STATUS == :offline %> +

The OpenStreetMap database is currently offline while + essential database maintenance work is carried out. +

+<% elsif API_STATUS == :readonly %>

The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out.

<% else %> -<%= render :partial => 'search', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %> +<% content_for :greeting do %> +<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> +<%= link_to_function 'home', "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)" %> | +<% end %> +<% end %> + +<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %> +<%= render :partial => 'search' %> + +<% session[:token] = @user.tokens.create.token unless session[:token] %> <% if params['mlon'] and params['mlat'] %> <% lon = params['mlon'] %> @@ -31,10 +44,12 @@ var fo = new SWFObject("/potlatch/potlatch.swf?d="+Math.round(Math.random()*1000), "potlatch", "700", "600", "6", "#FFFFFF"); function doSWF(lat,lon,sc) { + if (sc < 11) sc = 11; fo.addVariable('lat',lat); fo.addVariable('long',lon); fo.addVariable('scale',sc); - fo.addVariable('token','<%= @user.token %>'); + fo.addVariable('token','<%= session[:token] %>'); +<% if params['gpx'] %> fo.addVariable('gpx','<%= params['gpx']+"/data" %>'); <% end %> fo.write("map"); } @@ -54,14 +69,14 @@ } function resizeMap() { - var search_results_width = $("search_results").offsetWidth; + var sidebar_width = $("sidebar").offsetWidth; - if (search_results_width > 0) { - search_results_width = search_results_width + 5 + if (sidebar_width > 0) { + sidebar_width = sidebar_width + 5 } - $("map").style.left = (search_results_width) + "px"; - $("map").style.width = ($("content").offsetWidth - search_results_width) + "px"; + $("map").style.left = (sidebar_width) + "px"; + $("map").style.width = ($("content").offsetWidth - sidebar_width) + "px"; $("map").style.height = ($("content").offsetHeight - 2) + "px"; } @@ -75,5 +90,16 @@ window.onresize = handleResize; window.onload = handleResize; + + +<% unless @user.data_public? %> + var warningtext ="

You haven't set your edits to be public.

From mid-November, you will no longer be able to use the online editor unless you do so. You can set your edits as public from your "; + var warningtext=warningtext+'<%= link_to 'user page', {:controller => 'user', :action => 'account', :display_name => @user.display_name}%>.

'; + var warningtext=warningtext+'

(Find out why this is changing.)

'; + updateSidebar("Warning",warningtext); + openSidebar(); +<% end %> + + <% end %>