Fix some issues with the new tab styling

[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 948b1fad5122b1a3adc6394537ef995f79cee49f..84de929541dfc2235571a3d4617677f136f012ba 100644 (file)
--- a/app/views/site/edit.html.erb
+++ b/app/views/site/edit.html.erb
@@ -1,14 +1,13 @@
-<% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %>
+<% if STATUS == :database_offline or STATUS == :api_offline %>

 <p><%= t 'layouts.osm_offline' %>
 </p>
 <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? %>
 <p><%= t 'site.edit.not_public' %></p>
 <p><%= t 'layouts.osm_read_only' %>
 </p>
 <% elsif !@user.data_public? %>
 <p><%= t 'site.edit.not_public' %></p>

-<p><%= t 'site.edit.not_public_description', 
-:user_page => (link_to t('site.edit.user_page_link'), {:controller => 'user', :action => 'account', :display_name => @user.display_name, :anchor => 'public'}) %></p>
-<p><%= t 'site.edit.anon_edits', :link => link_to(t('site.edit.anon_edits_link_text'), t('site.edit.anon_edits_link')) %></p>
+<p><%= raw t 'site.edit.not_public_description', :user_page => (link_to t('site.edit.user_page_link'), {:controller => 'user', :action => 'account', :display_name => @user.display_name, :anchor => 'public'}) %></p>
+<p><%= raw t 'site.edit.anon_edits', :link => link_to(t('site.edit.anon_edits_link_text'), t('site.edit.anon_edits_link')) %></p>

 <% else %>
 <% content_for :greeting do %>
 <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
 <% else %>
 <% content_for :greeting do %>
 <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>


@@ -18,133 +17,42 @@
 
 <%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
 <%= render :partial => 'search' %>
 
 <%= 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 %>
-    <% if params['tileurl'] %>fo.addVariable('custombg','<%= h(params['tileurl']) %>');<% 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() {
   function maximiseMap() {

-    $("left").style.display = "none";
-    $("greeting").style.display = "none";
-    $("tabnav").style.display = "none";
+    $("#left").hide();
+    $("#greeting").hide();
+    $("#tabnav").hide();

 
 

-    $("content").style.top = "10px";
-    $("content").style.left = "10px";
+    $("#content").css("top", "10px");
+    <% if t('html.dir') == "ltr" -%>
+    $("#content").css("left", "10px");
+    <% else -%>
+    $("#content").css("right", "10px");
+    <% end -%>

 
     handleResize();
   }
   
   function minimiseMap() {
 
     handleResize();
   }
   
   function minimiseMap() {

-    $("left").style.display = "";
-    $("greeting").style.display = "";
-    $("tabnav").style.display = "";
+    $("#left").show();
+    $("#greeting").show();
+    $("#tabnav").show();

 
 

-    $("content").style.top = "35px";
-    $("content").style.left = "192px";
+    $("#content").css("top", "35px");
+    <% if t('html.dir') == "ltr" -%>
+    $("#content").css("left", "192px");
+    <% else -%>
+    $("#content").css("right", "192px");
+    <% end -%>

 
     handleResize();
   }
 
 
     handleResize();
   }
 

-  handleResize();
-
-  window.onload = handleResize;
-  window.onresize = handleResize;
+  $(document).ready(handleResize);
+  $(window).resize(handleResize);

 </script>
 <% end %>
 </script>
 <% end %>