Use symbols consistently for names of content blocks

[rails.git] / app / views / site / edit.html.erb

diff --git a/app/views/site/edit.html.erb b/app/views/site/edit.html.erb
index 79b1f64af3d6da3dfb9418dae2931e06f0bea92d..37531a4a7782261fdf48e4408ca0e919a17a8ccd 100644 (file)
--- a/app/views/site/edit.html.erb
+++ b/app/views/site/edit.html.erb
@@ -1,7 +1,7 @@
-<% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %>
+<% if STATUS == :database_offline or STATUS == :api_offline %>
 <p><%= t 'layouts.osm_offline' %>
 </p>
-<% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %>
+<% elsif STATUS == :database_readonly or STATUS == :api_readonly %>
 <p><%= t 'layouts.osm_read_only' %>
 </p>
 <% elsif !@user.data_public? %>
@@ -18,114 +18,22 @@
 
 <%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
 <%= render :partial => 'search' %>
+<%= render :partial => 'resize' %>
 
-<%
-session[:token] = @user.tokens.create.token unless session[:token]
-
-# Decide on a lat lon to initialise potlatch with. Various ways of doing this
-if params['lon'] and params['lat']
-       lon =  h(params['lon']) 
-       lat =  h(params['lat']) 
-       zoom =  h(params['zoom'])
-
-elsif params['mlon'] and params['mlat'] 
-       lon =  h(params['mlon']) 
-       lat =  h(params['mlat']) 
-       zoom =  h(params['zoom'])
-       
-elsif params['gpx']
-       #use gpx id to locate (dealt with below)
-       
-elsif cookies.key?("_osm_location")
-       lon,lat,zoom,layers = cookies["_osm_location"].split("|")
-       
-elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? 
-       lon =  @user.home_lon
-       lat =  @user.home_lat
-
-else
-       #catch all.  Do nothing.  lat=nil, lon=nil
-       #Currently this results in potlatch starting up at 0,0 (Atlantic ocean).
-end
-
-zoom='14' if zoom.nil?
-%>
-
-<div id="map">
-       <%= t 'site.edit.flash_player_required' %>
-</div>
-
-<%= javascript_include_tag 'swfobject.js' %>
-<script type="text/javascript" defer="defer">
-  var brokenContentSize = $("content").offsetWidth == 0;
-  var fo = new SWFObject("/potlatch/potlatch.swf?d="+Math.round(Math.random()*1000), "potlatch", "100%", "100%", "6", "#FFFFFF");
-  // 700,600 for fixed size, 100%,100% for resizable
-  var changesaved=true;
-  var winie=false; if (document.all && window.print) { winie=true; }
-  
-  window.onbeforeunload=function() {
-    if (!changesaved) {
-      return "<%= t 'site.edit.potlatch_unsaved_changes' %>";
-    }
-  }
-
-  function markChanged(a) { changesaved=a; }
-
-  function doSWF(lat,lon,sc) {
-    if (sc < 11) sc = 11;
-    fo.addVariable('winie',winie);
-    fo.addVariable('scale',sc);
-    fo.addVariable('token','<%= session[:token] %>');
-    if (lat) { fo.addVariable('lat',lat); }
-    if (lon) { fo.addVariable('long',lon); }
-    <% if params['gpx']  %>fo.addVariable('gpx' ,'<%= h(params['gpx'] ) %>');<% end %>
-    <% if params['way']  %>fo.addVariable('way' ,'<%= h(params['way'] ) %>');<% end %>
-    <% if params['node'] %>fo.addVariable('node','<%= h(params['node']) %>');<% end %>
-    fo.write("map");
-  }
-
-  doSWF(<%= lat || 'null' %>,<%= lon || 'null' %>,<%= zoom %>);
-
-  function setPosition(lat, lon, zoom) {
-    doSWF(lat, lon, zoom);
-  }
-
-  function resizeContent() {
-    var content = $("content");
-    var rightMargin = parseInt(getStyle(content, "right"));
-    var bottomMargin = parseInt(getStyle(content, "bottom"));
-
-    content.style.width = document.documentElement.clientWidth - content.offsetLeft - rightMargin;
-    content.style.height = document.documentElement.clientHeight - content.offsetTop - bottomMargin;
-  }
-  
-  function resizeMap() {
-    var sidebar_width = $("sidebar").offsetWidth;
-
-    if (sidebar_width > 0) {
-      sidebar_width = sidebar_width + 5
-    }
-
-    $("map").style.left = (sidebar_width) + "px";
-    $("map").style.width = ($("content").offsetWidth - sidebar_width) + "px";
-    $("map").style.height = ($("content").offsetHeight - 2) + "px";
-  }
-
-  function handleResize() {
-    if (brokenContentSize) {
-      resizeContent();
-    }
-
-    resizeMap();
-  }
+<%= render :partial => preferred_editor %>
 
+<script type="text/javascript">
   function maximiseMap() {
     $("left").style.display = "none";
     $("greeting").style.display = "none";
     $("tabnav").style.display = "none";
 
     $("content").style.top = "10px";
+    <% if t('html.dir') == "ltr" -%>
     $("content").style.left = "10px";
+    <% else -%>
+    $("content").style.right = "10px";
+    <% end -%>
 
     handleResize();
   }
@@ -136,14 +44,17 @@ zoom='14' if zoom.nil?
     $("tabnav").style.display = "";
 
     $("content").style.top = "35px";
+    <% if t('html.dir') == "ltr" -%>
     $("content").style.left = "192px";
+    <% else -%>
+    $("content").style.right = "192px";
+    <% end -%>
 
     handleResize();
   }
 
-  handleResize();
+  document.observe("dom:loaded", handleResize);
 
-  window.onload = handleResize;
-  window.onresize = handleResize;
+  Event.observe(window, "resize", handleResize);
 </script>
 <% end %>