cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into notes

Browse source 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/common.css.scss
	app/helpers/application_helper.rb
This commit is contained in:
Tom Hughes 2012-11-20 19:08:30 +00:00
commit 7599f98957
133 changed files with 4192 additions and 1690 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/assets/javascripts/edit.js
View file

@ -1,13 +1,12 @@
function maximiseMap() {
$("#left").hide();
$("#greeting").hide();
$("#tabnav").hide();
$("#top-bar").hide();
$("#content").css("top", "0px");
if ($("html").attr("dir") == "ltr") {
$("#content").css("left", "0px");
$("#content").css("margin-left", "0px");
} else {
$("#content").css("right", "0px");
$("#content").css("margin-right", "0px");
}
handleResize();
@ -15,14 +14,13 @@ function maximiseMap() {
function minimiseMap() {
$("#left").show();
$("#greeting").show();
$("#tabnav").show();
$("#top-bar").show();
$("#content").css("top", "30px");
if ($("html").attr("dir") == "ltr") {
$("#content").css("left", "185px");
$("#content").css("margin-left", "185px");
} else {
$("#content").css("right", "185px");
$("#content").css("margin-right", "185px");
}
handleResize();

2
app/assets/javascripts/osm.js.erb
View file

@ -23,7 +23,7 @@ OSM = {
mapParams: function (search) {
var params = {}, mapParams = {}, loc;
search = (search || window.location.search).replace('?', '').split('&');
search = (search || window.location.search).replace('?', '').split(/&|;/);
for (var i = 0; i < search.length; ++i) {
var pair = search[i],