Merge branch 'leaflet'

diff --combined 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
@@@ -10,7 -10,6 +10,7 @@@ body 
    background-color: #fff;
    margin: 0px;
    padding: 0px;
 +  text-align: left;
  }
  
  body.slim {
@@@ -54,7 -53,6 +54,7 @@@ h2 
    width: 185px;
    font-size: 11px;
    line-height: 12px;
 +  border-right: 1px solid #ccc;
  }
  
  /* Rules for the OpenStreetMap logo in the top left corner */
@@@ -154,7 -152,6 +154,7 @@@
  /* Rules for the menu displayed in the left sidebar */
  
  .left_menu {
 +  left: 0px;
    margin: 0;
    padding: 5px 10px;
    line-height: 15px;
@@@ -206,10 -203,8 +206,10 @@@
   */
  
  .optionalbox {
 +  left: 0px;
    padding: 5px 10px;
    margin: 5px 0;
 +  text-align: left;
  }
  
  .optionalbox h1 {
@@@ -232,7 -227,7 +232,7 @@@
  }
  
  #search_field {
 -  position:relative;
 +  position: relative;
  }
  
  #search_field input[type="text"] {
@@@ -240,7 -235,6 +240,7 @@@
    font-size: 14px;
    line-height: 15px;
    height: 25px;
 +  padding: 2px 0px 2px 5px;
    box-shadow: inset #DDD 0px 1px 3px;
    box-sizing: border-box;
    -webkit-box-sizing: border-box;
@@@ -265,7 -259,6 +265,7 @@@
    background: image-url("sprite.png");
    position: absolute;
    top: 5px;
 +  right: 4px;
    cursor: pointer;
  }
  
@@@ -318,7 -311,6 +318,7 @@@
    background: image-url("sprite.png") 0 -30px no-repeat;
    position: absolute;
    top: 8px;
 +  left: 17px;
  }
  
  /* Rules for Creative Commons logo button */
@@@ -333,8 -325,6 +333,8 @@@
  #top-bar {
    position: absolute;
    top: 0;
 +  left: 185px;
 +  right: 0;
    height: 29px;
    border-bottom: 1px solid #ccc;
    background: white;
@@@ -354,13 -344,11 +354,13 @@@
  }
  
  #tabnav a, #tabnav a:link, #tabnav a:visited {
 +  float: left;
    background: #fff;
    font-size: 14px;
    line-height: 19px;
    font-weight: bold;
    padding: 5px 10px;
 +  margin-right: 1px;
    text-decoration: none;
    color: #333;
    -webkit-transition: color 200ms ease-in;
@@@ -409,10 -397,8 +409,10 @@@ body.site-export #tabnav a#exportancho
  /* Rules for greeting bar in the top right corner */
  
  #greeting {
 +  float: right;
    height: 28px;
    margin: 0px;
 +  padding-right: 10px;
    font-size: 13px;
    line-height: 28px;
  }
@@@ -427,10 -413,9 +427,10 @@@
    z-index: 20000000;
    position: absolute;
    top: 15px;
 +  left: 15px;
  }
  
- /* Rules for OpenLayers maps */
+ /* Rules for Leaflet maps */
  
  #map {
    margin: 0px;
@@@ -438,13 -423,6 +438,6 @@@
    padding: 0px;
  }
  
- .olControlAttribution {
-   bottom: 15px !important;
-   left: 0px !important;
-   right: 0px !important;
-   text-align: center;
- }
- 
  #permalink {
    z-index: 10000;
    position: absolute;
@@@ -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 {
@@@ -511,18 -486,10 +506,18 @@@
    display: none;
  }
  
 +.attribution_license {
 +  text-align: left;
 +}
 +
  .attribution_notice {
    text-align: center;
  }
  
 +.attribution_project {
 +  text-align: right;
 +}
 +
  /* Rules for the popout map sidebar */
  
  #sidebar {
@@@ -530,11 -497,9 +525,11 @@@
    position: absolute;
    margin: 30px 0px 0px 0px;
    padding: 0px;
 +  border-right: 1px solid #ccc;
    width: 30%;
    top: 0px;
    bottom: 0px;
 +  left: 0px;
  }
  
  #sidebar #sidebar_content {
@@@ -557,14 -522,6 +552,14 @@@
    background: #ccc;
  }
  
 +#sidebar #sidebar_title {
 +  text-align: left;
 +}
 +
 +#sidebar #sidebar_close {
 +  text-align: right;
 +}
 +
  /* Rules for the map key which appears in the popout sidebar */
  
  #mapkey h3 {
@@@ -675,9 -632,7 +670,9 @@@
  
  #content {
    padding: 20px;
 -  margin: 30px 0px 0px 0px;
 +  margin: 30px 0px 0px 185px;
 +  border-left: 1px solid #ccc;
 +  text-align: left;
  }
  
  .site-edit #content,
@@@ -725,7 -680,6 +720,7 @@@
  #slim_header img {
    vertical-align: middle;
    margin-bottom: 5px;
 +  margin-right: 5px;
  }
  
  /* Rules for text content pages */
@@@ -776,7 -730,6 +771,7 @@@
    border-width: 0px;
    margin-top: 1px;
    margin-bottom: 1px;
 +  text-align: left;
  }
  
  #changeset_list td {
@@@ -803,10 -756,8 +798,10 @@@
  
  #changeset_list_map {
    position: absolute;
 +  float: right;
    top: 0px;
    bottom: 0px;
 +  right: 0px;
    width: 49%;
    min-height: 400px;
    border: solid 1px black;
@@@ -815,9 -766,7 +810,9 @@@
  /* Rules for the data browser */
  
  #browse_navigation {
 +  float: right;
    width: 250px;
 +  margin-left: 10px;
    text-align: center;
  }
  
@@@ -826,10 -775,7 +821,10 @@@ table.browse_details th 
  }
  
  #browse_map {
 +  float: right;
    width: 250px;
 +  text-align: right;
 +  margin-left: 10px;
  }
  
  #browse_map #small_map {
@@@ -848,7 -794,6 +843,7 @@@
    font-size: small;
    border-collapse: collapse;
    border-width: 0px;
 +  text-align: right;
  }
  
  #trace_list .trace_summary {
@@@ -893,30 -838,9 +888,30 @@@
  }
  
  #user_list_actions {
 +  float: right;
    margin-top: 10px;
  }
  
 +/* Rules for the diary list */
 +
 +.diary_entry-list img.user_image {
 +  float: right;
 +}
 +
 +.diary_entry-list img.user_thumbnail {
 +  float: right;
 +}
 +
 +/* Rules for the diary entry view */
 +
 +.diary_entry-view img.user_image {
 +  float: right;
 +}
 +
 +.diary_entry-view img.user_thumbnail {
 +  float: right;
 +}
 +
  /* Rules for the new diary entry page */
  
  .diary_entry div#map {
@@@ -1005,14 -929,6 +1000,14 @@@ form#termsForm 
    margin-bottom: 3em;
  }
  
 +form#termsForm div#buttons {
 +  float: right;
 +}
 +
 +form#termsForm input#agree {
 +  margin-left: 50px;
 +}
 +
  div#slim_content form#termsForm {
    width: auto;
  }
@@@ -1075,12 -991,7 +1070,12 @@@ p#contributorGuidance 
  
  /* Rules for the user view */
  
 +.user-view img.user_image {
 +  float: right;
 +}
 +
  .user-view .user_map {
 +  float: right;
    position: relative;
    width: 400px;
    height: 400px;
@@@ -1098,16 -1009,21 +1093,21 @@@
  
  /* Rules for the user map */
  
- .user_map .olControlSimplePanZoom {
+ .user_map .leaflet-control-pan,
+ .user_map .leaflet-control-zoomslider {
    display: none;
  }
  
- .user_map .olControlZoom {
+ .user_map .leaflet-control-zoom {
    display: block;
  }
  
  /* Rules for user popups on maps */
  
+ .user_popup {
+   min-width: 200px;
+ }
+ 
  .user_popup p {
    padding-top: 3px;
    padding-bottom: 3px;
@@@ -1220,11 -1136,9 +1220,11 @@@
  #errorExplanation h2 {
    font-weight: bold;
    font-size: 12px;
 +  padding: 5px 5px 5px 15px;
    margin: -7px;
    background-color: #c00;
    color: #fff;
 +  text-align: left;
  }
  
  #errorExplanation p {
@@@ -1245,11 -1159,6 +1245,11 @@@
    font-weight: bold;
    font-size: 12px;
    line-height: 20px;
 +  text-align: right;
 +}
 +
 +.submitButton {
 +  text-align: right;
  }
  
  .minorNote {
@@@ -1264,11 -1173,6 +1264,11 @@@ textarea 
    border: 1px solid #ccc;
  }
  
 +input.openid_url {
 +  background: image-url('openid_input.png') repeat-y left white;
 +  padding-left: 16px;
 +}
 +
  /* Rules for user images */
  
  img.user_image {
@@@ -1358,7 -1262,6 +1358,7 @@@ abbr.geo 
      display: inline-block;
      vertical-align: top;
      background-color: #ddd;
 +    margin-left: 15px;
      padding: 5px 10px 10px 10px;
      font-size: 12px;
  
@@@ -1368,12 -1271,9 +1368,12 @@@
  
      th {
        vertical-align: top;
 +      text-align: left;
 +      padding: 0px 15px 0px 0px !important;
      }
  
      td {
 +      text-align: left;
        font-family: fixed;
        line-height: 16px;
        padding: 0px !important;
@@@ -1381,12 -1281,10 +1381,12 @@@
  
      input.richtext_doedit {
        margin-top: 5px !important;
 +      margin-right: 10px !important;
      }
  
      input.richtext_dopreview {
        margin-top: 5px !important;
 +      margin-left: 10px !important;
      }
    }
  }

diff --combined app/assets/stylesheets/small.css.scss
index ba9e59d968a70fc2f5bcd1699def1cf2836b2672,70d6dd6299b0fa55c7c528990f2d39ac10ade1ce..e690924b57d927e5e77ea19778bb3a6041ebf2fb
--- 1/app/assets/stylesheets/small.css.scss
--- 2/app/assets/stylesheets/small.css.scss
+++ b/app/assets/stylesheets/small.css.scss
@@@ -19,7 -19,6 +19,7 @@@ h1 
  /* Rules for tabbed navigation bar */
  
  #top-bar {
 +  left: 0;
    margin: 0px;
    height: 39px;
    padding: 0;
@@@ -49,7 -48,6 +49,7 @@@
    height: 16px;
    display: block;
    position: absolute;
 +  left: 5px;
    top: 5px;
    padding: 2px;
    width: 110px; /* TODO: find better fix for overlap */
@@@ -72,7 -70,6 +72,7 @@@
  
  #greeting {
    position: absolute;
 +  right: 5px;
    top: 5px;
    height: 14px;
    font-size: 12px;
@@@ -95,14 -92,12 +95,12 @@@
    border: 0;
  }
  
- .olControlSimplePanZoom {
+ .leaflet-control-pan, .leaflet-control-zoomslider {
    display: none;
  }
  
- .site-index #map .olControlZoom,
- .site-index #map .SimpleLayerSwitcher,
- .site-export #map .olControlZoom,
- .site-export #map .SimpleLayerSwitcher {
+ .site-index .leaflet-top,
+ .site-export .leaflet-top {
    top: 8px !important;
  }
  

diff --combined config/locales/en.yml
index 1f5a741b7af85777cd8ced4c794f4b3c809359f8,ee9165787b1ab84f04120dcc75a4570b320e78bd..0c21b90275d5ee383ef30a90d46517115b500172
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -219,14 -219,11 +219,11 @@@ en
        relation_title: "Relation: %{relation_name}"
        download_xml: "Download XML"
        view_history: "View history"
-     start:
-       view_data: "View data for current map view"
-       manually_select: "Manually select a different area"
      start_rjs:
        data_layer_name: "Browse Map Data"
        data_frame_title: "Data"
        zoom_or_select: "Zoom in or select an area of the map to view"
-       drag_a_box: "Drag a box on the map to select an area"
+       view_data: "View data for current map view"
        manually_select: "Manually select a different area"
        hide_areas: "Hide areas"
        show_areas: "Show areas"
@@@ -367,8 -364,7 +364,8 @@@
        comment_link: Comment on this entry
        reply_link: Reply to this entry
        comment_count:
 -        one: 1 comment
 +        zero: No comments
 +        one: "%{count} comment"
          other: "%{count} comments"
        edit_link: Edit this entry
        hide_link: Hide this entry