Merge branch 'master' into notes

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/common.css.scss
	app/helpers/application_helper.rb

Gemfile

@@ -2,7 +2,7 @@
 source 'http://rubygems.org'
 
 # Require rails
-gem 'rails', '3.2.8'
+gem 'rails', '3.2.9'
 
 # Require things which have moved to gems in ruby 1.9
 gem 'bigdecimal', :platforms => :ruby_19
@@ -13,6 +13,9 @@ gem 'pg'
 # Load jquery support
 gem 'jquery-rails'
 
+# Load R2 for RTL conversion
+gem 'r2'
+
 # Load rails plugins
 gem 'rails-i18n', ">= 0.6.3"
 gem 'dynamic_form'
@@ -25,6 +28,7 @@ gem 'http_accept_language', '>= 1.0.2'
 gem 'paperclip', '~> 2.0'
 gem 'deadlock_retry', '>= 1.2.0'
 gem 'i18n-js', '>= 3.0.0.rc2'
+gem 'rack-cors'
 gem 'jsonify-rails'
 
 # We need ruby-openid 2.2.0 or later for ruby 1.9 support

Gemfile.lock

@@ -2,44 +2,44 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
+    actionmailer (3.2.9)
+      actionpack (= 3.2.9)
       mail (~> 2.4.4)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    actionpack (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    activerecord (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-    activesupport (3.2.8)
+    activeresource (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
+    activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
     bigdecimal (1.1.0)
-    builder (3.0.3)
-    cocaine (0.4.0)
+    builder (3.0.4)
+    cocaine (0.4.2)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.3.3)
+    coffee-script-source (1.4.0)
     composite_primary_keys (5.0.9)
       activerecord (~> 3.2.0, >= 3.2.8)
     deadlock_retry (1.2.0)
@@ -56,7 +56,7 @@ GEM
     httpauth (0.2.0)
     httpclient (2.3.0.1)
     i18n (0.6.1)
-    i18n-js (3.0.0.rc2)
+    i18n-js (3.0.0.rc3)
       i18n
     iconv (0.1)
     journey (1.0.4)
@@ -79,8 +79,8 @@ GEM
       treetop (~> 1.4.8)
     memcached (1.4.6)
     mime-types (1.19)
-    minitest (4.1.0)
-    multi_json (1.3.6)
+    minitest (4.3.0)
+    multi_json (1.3.7)
     multipart-post (1.1.5)
     nokogiri (1.5.5)
     oauth (0.4.7)
@@ -104,59 +104,63 @@ GEM
       mime-types
     pg (0.14.1)
     polyglot (0.3.3)
+    r2 (0.0.3)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
+    rack-cors (0.2.7)
+      rack
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.8)
-      actionmailer (= 3.2.8)
-      actionpack (= 3.2.8)
-      activerecord (= 3.2.8)
-      activeresource (= 3.2.8)
-      activesupport (= 3.2.8)
+    rails (3.2.9)
+      actionmailer (= 3.2.9)
+      actionpack (= 3.2.9)
+      activerecord (= 3.2.9)
+      activeresource (= 3.2.9)
+      activesupport (= 3.2.9)
       bundler (~> 1.0)
-      railties (= 3.2.8)
-    rails-i18n (0.6.6)
+      railties (= 3.2.9)
+    rails-i18n (0.7.0)
       i18n (~> 0.5)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
+    railties (3.2.9)
+      actionpack (= 3.2.9)
+      activesupport (= 3.2.9)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
+    rake (10.0.2)
     rdoc (3.12)
       json (~> 1.4)
-    redcarpet (2.2.1)
+    redcarpet (2.2.2)
     rinku (1.7.2)
-    ruby-openid (2.2.1)
+    ruby-openid (2.2.2)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
-    sass (3.2.1)
+    sass (3.2.3)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    sprockets (2.1.3)
+    sprockets (2.2.1)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     therubyracer (0.10.2)
       libv8 (~> 3.3.10)
     thor (0.16.0)
     tilt (1.3.3)
-    timecop (0.5.2)
-    treetop (1.4.11)
+    timecop (0.5.3)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
+    tzinfo (0.3.35)
     uglifier (1.3.0)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
@@ -187,7 +191,9 @@ DEPENDENCIES
   open_id_authentication (>= 1.1.0)
   paperclip (~> 2.0)
   pg
-  rails (= 3.2.8)
+  r2
+  rack-cors
+  rails (= 3.2.9)
   rails-i18n (>= 0.6.3)
   redcarpet
   rinku (>= 1.2.2)

README.md

@@ -63,7 +63,7 @@ helpful as a reference.
 ## Coding style
 
 When writing code it is generally a good idea to try and match your
-formatting to hat of any existing code in the same file, or to other
+formatting to that of any existing code in the same file, or to other
 similar files if you are writing new code. Consistency of layout is
 far more important that the layout itself as it makes reading code
 much easier.
@@ -107,7 +107,7 @@ and why it should be the way it is.
 When you submit patches, the project maintainer has to read them and
 understand them. This is difficult enough at the best of times, and
 misunderstanding patches can lead to them being more difficult to
-merge. To help wit this, when submitting you should:
+merge. To help with this, when submitting you should:
 
 * Split up large patches into smaller units of functionality.
 * Keep your commit messages relevant to the changes in each individual

app/assets/javascripts/edit.js

@@ -1,28 +1,26 @@
 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();
 }
 
 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();

app/assets/javascripts/osm.js.erb

@@ -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],

app/assets/openlayers/theme/openstreetmap/SimplePanZoom.css.scss

@@ -30,6 +30,7 @@
   top: 13px;
   width: 25px;
   height: 24px;
+  left: 0px;
   background-position: -5px -17px;
 }
 

app/assets/openlayers/theme/openstreetmap/style.css.scss

@@ -51,9 +51,14 @@ div.olControlZoom a {
     color: black;
     background: #ffffff;
     border: 1px solid #cccccc;
+    margin: 0 !important;
     // remove filter
 }
 
+div.olControlZoom a.olControlZoomIn {
+    border-bottom: 0;
+}
+
 div.olControlZoom a:hover {
     background: #f5f5f5;
 }