From: Tom Hughes <tom@compton.nu>
Date: Tue, 7 May 2013 13:43:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'osmlab/id-editor-embed'
X-Git-Tag: live~6036
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/1779347849622ade2abf4926a2db867d69f72033?ds=sidebyside;hp=-c

Merge remote-tracking branch 'osmlab/id-editor-embed'
---

1779347849622ade2abf4926a2db867d69f72033
diff --combined app/assets/stylesheets/common.css.scss
index 54db78fbf,d94f51114..49a784704
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@@ -692,12 -692,7 +692,12 @@@ table 
  }
  
  .search_results_entry {
 -  margin-bottom: 0 ;
 +  margin-bottom: 0;
 +
 +  .search_details {
 +    display: block;
 +    text-align: right;
 +  }
  }
  
  .search_results_entry .search_searching {
@@@ -952,13 -947,14 +952,13 @@@ ul.results-list li { border-bottom: 1p
      margin: 0px;
      padding: 4px 6px;
    }
 -  div {
 -    clear: left;
 -  }
    h4, p {
      margin-bottom: 5px;
    }
 -  p, ul, .bbox {
 -    margin-left: 33.3333%;
 +  p, ul, .bbox, .geo {
 +    display: inline-block;
 +    vertical-align: top;
 +    max-width: 65%;
    }
    ul p {
      margin-left: 0;
@@@ -966,8 -962,7 +966,8 @@@
    }
    h4 {
      width: 33.3333%;
 -    float: left;
 +    display: inline-block;
 +    vertical-align: top;
    }
  }
  
@@@ -1789,3 -1784,11 +1789,11 @@@ a.button.submit 
      text-align: right;
    }
  }
+ 
+ /*
+  * Rules for the iD editor
+  */
+ .id-embed {
+   width: 100%;
+   height: 100%;
+ }
diff --combined config/locales/en.yml
index 7b5a3d96a,0186d446d..315cc4aa6
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -85,6 -85,9 +85,9 @@@ en
      potlatch:
        name: "Potlatch 1"
        description: "Potlatch 1 (in-browser editor)"
+     id:
+       name: "iD"
+       description: "iD (in-browser editor)"
      potlatch2:
        name: "Potlatch 2"
        description: "Potlatch 2 (in-browser editor)"
@@@ -1312,6 -1315,7 +1315,7 @@@
        potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)"
        potlatch2_not_configured: "Potlatch 2 has not been configured - please see http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for more information"
        potlatch2_unsaved_changes: "You have unsaved changes. (To save in Potlatch 2, you should click save.)"
+       id_not_configured: "iD has not been configured"
        no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
      sidebar:
        search_results: Search Results
@@@ -1992,14 -1996,14 +1996,14 @@@
        needs_view: "The user needs to log in before this block will be cleared."
    note:
      description:
 -      opened_at: "Created %{when} ago"
 -      opened_at_by: "Created %{when} ago by %{user}"
 -      commented_at: "Updated %{when} ago"
 -      commented_at_by: "Updated %{when} ago by %{user}"
 -      closed_at: "Resolved %{when} ago"
 -      closed_at_by: "Resolved %{when} ago by %{user}"
 -      reopened_at: "Reactivated %{when} ago"
 -      reopened_at_by: "Reactivated %{when} ago by %{user}"
 +      opened_at_html: "Created %{when} ago"
 +      opened_at_by_html: "Created %{when} ago by %{user}"
 +      commented_at_html: "Updated %{when} ago"
 +      commented_at_by_html: "Updated %{when} ago by %{user}"
 +      closed_at_html: "Resolved %{when} ago"
 +      closed_at_by_html: "Resolved %{when} ago by %{user}"
 +      reopened_at_html: "Reactivated %{when} ago"
 +      reopened_at_by_html: "Reactivated %{when} ago by %{user}"
      rss:
        title: "OpenStreetMap Notes"
        description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]"