Initial work on support for multiple editors
This commit is contained in:
Matt Amos
Tom Hughes
parent
7f955a4aca
commit
cd66a5db99
13 changed files with 140 additions and 72 deletions
|
|
@ -30,4 +30,38 @@ class SiteController < ApplicationController
|
|||
def key
|
||||
expires_in 7.days, :public => true
|
||||
end
|
||||
|
||||
def edit
|
||||
session[:token] = @user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token])
|
||||
|
||||
@preferred_editor = @user.preferred_editor || DEFAULT_EDITOR
|
||||
|
||||
# Decide on a lat lon to initialise potlatch with. Various ways of doing this
|
||||
if params['lon'] and params['lat']
|
||||
@lon = params['lon'].to_f
|
||||
@lat = params['lat'].to_f
|
||||
@zoom = params['zoom'].to_i
|
||||
|
||||
elsif params['mlon'] and params['mlat']
|
||||
@lon = params['mlon'].to_f
|
||||
@lat = params['mlat'].to_f
|
||||
@zoom = params['zoom'].to_i
|
||||
|
||||
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?
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -109,6 +109,8 @@ class UserController < ApplicationController
|
|||
@user.home_lat = params[:user][:home_lat]
|
||||
@user.home_lon = params[:user][:home_lon]
|
||||
|
||||
@user.preferred_editor = params[:user][:preferred_editor]
|
||||
|
||||
if @user.save
|
||||
set_locale
|
||||
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ class User < ActiveRecord::Base
|
|||
validates_numericality_of :home_lat, :allow_nil => true
|
||||
validates_numericality_of :home_lon, :allow_nil => true
|
||||
validates_numericality_of :home_zoom, :only_integer => true, :allow_nil => true
|
||||
validates_inclusion_of :preferred_editor, :in => Editors::ALL_EDITORS, :allow_nil => true
|
||||
|
||||
before_save :encrypt_password
|
||||
|
||||
|
|
|
|||
6
app/views/site/_josm.html.erb
Normal file
6
app/views/site/_josm.html.erb
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
<div id="map">
|
||||
<% query = "lat=#{@lat || 0}&lon=#{@lon || 0}&zoom=#{@zoom}" %>
|
||||
<iframe src="http://127.0.0.1:8111/load_and_zoom?<%= query %>" width="100%" height="100%">
|
||||
<p><%= t 'site.edit.no_iframe_support' %></p>
|
||||
</iframe>
|
||||
</div>
|
||||
40
app/views/site/_potlatch.html.erb
Normal file
40
app/views/site/_potlatch.html.erb
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
<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 '<%= escape_javascript(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 || 15);
|
||||
}
|
||||
</script>
|
||||
|
|
@ -19,78 +19,9 @@
|
|||
<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
|
||||
<%= render :partial => 'search' %>
|
||||
|
||||
<%
|
||||
session[:token] = @user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token])
|
||||
<%= render :partial => @preferred_editor %>
|
||||
|
||||
# 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 '<%= escape_javascript(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 || 15);
|
||||
}
|
||||
|
||||
function resizeContent() {
|
||||
var content = $("content");
|
||||
var rightMargin = parseInt(getStyle(content, "right"));
|
||||
|
|
|
|||
|
|
@ -66,6 +66,11 @@
|
|||
<td><%= f.text_field :languages %></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="fieldName" valign="top"><%= t 'user.account.preferred editor' %></td>
|
||||
<td><%= f.select :preferred_editor, Editors::ALL_EDITORS.collect { |e| [t('user.account.editor.'+e), e] } %></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="fieldName" valign="top">
|
||||
<%= t 'user.account.image' %>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue