Merge branch 'leaflet'

diff --cc app/assets/stylesheets/common.css.scss
index 2837270fdf654fd035841a0b6b29dc08c7cab25c,606cdd47da9dbc294c33532263e0791fb68b9d13..217bb0c669c341463fea61a90296d7e466bad1b6
--- 1/app/assets/stylesheets/common.css.scss
--- 2/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@@ -427,10 -413,9 +427,10 @@@ body.site-export #tabnav a#exportancho
    z-index: 20000000;
    position: absolute;
    top: 15px;
 +  left: 15px;
  }
  
- /* Rules for OpenLayers maps */
+ /* Rules for Leaflet maps */
  
  #map {
    margin: 0px;
@@@ -460,18 -438,15 +453,20 @@@
    padding: 5px;
  }
  
- .site-index #map .SimpleLayerSwitcher,
- .site-index #map .olControlSimplePanZoom,
- .site-export #map .SimpleLayerSwitcher,
- .site-export #map .olControlSimplePanZoom {
+ .site-index .leaflet-top,
+ .site-export .leaflet-top {
    top: 40px !important;
+ 
+   .leaflet-control {
+     margin-top: 0px !important;
+   }
  }
  
 +.site-index #map .olControlScaleLine,
 +.site-export #map .olControlScaleLine {
 +  left: 10px !important;
 +}
 +
  /* Rules for edit menu */
  
  .menuicon {

diff --cc app/assets/stylesheets/small.css.scss
Simple merge

diff --cc config/locales/en.yml
Simple merge