From: Tom Hughes <tom@compton.nu>
Date: Tue, 16 Apr 2013 17:22:47 +0000 (+0100)
Subject: Merge branch 'master' into notes
X-Git-Tag: live~5104^2
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/52611a5bfa69165179bd871b925b5f8b14942e2e?hp=-c

Merge branch 'master' into notes
---

52611a5bfa69165179bd871b925b5f8b14942e2e
diff --combined app/assets/stylesheets/common.css.scss
index 0d8b882cb,99e10d165..30905b96c
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@@ -75,7 -75,7 +75,7 @@@ h1, h2 
  }
  
  #content h2 {
-   font-size: 24px;
+   font-size: 21px;
  }
  
  h3 {
@@@ -511,7 -511,6 +511,7 @@@ table 
  #greeting {
    float: right;
    padding-top: 3px;
 +  margin-right: 5px;
  }
  
  .greeting-bar-unread {
@@@ -538,12 -537,6 +538,12 @@@
    background:#fff;
  }
  
 +.leaflet-control-attribution a.disabled {
 +  color: #99c9dc;
 +  cursor: default;
 +  text-decoration: none;
 +}
 +
  .site-index .leaflet-top,
  .site-export .leaflet-top {
    top: 10px !important;
@@@ -557,12 -550,6 +557,12 @@@
    left: 10px !important;
  }
  
 +.leaflet-popup-scrolled {
 +  padding-right: 20px;
 +  border-bottom: 0px !important;
 +  border-top: 0px !important;
 +}
 +
  /* Rules for edit menu */
  
  .menuicon {
@@@ -935,20 -922,12 +935,20 @@@ ul.results-list li { border-bottom: 1p
    &:first-child {
      margin-top: 0;
    }
 +  &.warning {
 +    color: #ff7070;
 +    font-weight: bold;
 +  }
    h4, p {
      margin-bottom: 5px;
    }
    p, ul, .bbox {
      margin-left: 33.3333%;
    }
 +  ul p {
 +    margin-left: 0;
 +    margin-bottom: 0;
 +  }
    h4 {
      width: 33.3333%;
      float: left;
@@@ -1139,6 -1118,7 +1139,7 @@@
  }
  
  .diary_post {
+   max-width: 740px;
    position: relative;
    margin-top: 20px;
    padding-top: 20px;
@@@ -1154,12 -1134,9 +1155,9 @@@
      line-height: 21px;
    }
    small.deemphasize {
+     float: left;
      display: block;
    }
-   ul,
-   ol {
-     font-style: italic;
-   }
    ul.secondary-actions { display: inline-block;}
  }
  
@@@ -1167,14 -1144,12 +1165,12 @@@
    display: inline;
  }
  
- .post_heading {
+ #content  .post_heading {
    margin-bottom: 20px;
    h2 {
      margin-top: 0;
-     margin-bottom: 0;
+     margin-bottom: 10px;
      font-size: 24px;
-     float: left;
-     line-height: 32px;
    }
  }
  
@@@ -1194,8 -1169,13 +1190,13 @@@
      padding-top: 20px;
      margin-top: 10px;
    }
+   .comments {
+     max-width: 740px;
+   }
    .diary-comment {
      margin-top: 10px;
+     border-top: 1px dashed #ccc;
+     padding-top: 10px;
      &:first-child {
        margin-top: 20px;
        padding-top: 20px;
@@@ -1203,7 -1183,6 +1204,6 @@@
      }
      p {
        margin-bottom: 10px;
-       margin-left: 70px;
      }
      .comment-heading {
        margin-bottom: 0;
@@@ -1509,9 -1488,6 +1509,9 @@@ ul.secondary-actions 
        border-left: 0;
        padding-left: 0;
      }
 +    &:last-child {
 +      margin-right: 0px;
 +    }
    }
  }
  
@@@ -1573,11 -1549,48 +1573,48 @@@ a.button.submit 
  /* Rules for rich text */
  
  .richtext {
-   ul,
-   ol {
+   h1, h2 {
+     padding-bottom: 10px;
+     border-bottom: 1px dashed #cccccc;
+     margin-bottom: 10px;
+   }
+ 
+   h1 {
+     font-size: 24px;
+   }
+ 
+   h2 {
+     font-size: 18px;
+   }
+ 
+   h3 {
+     font-size: 14px;
+   }
+ 
+   img {
+     padding: 20px;
+     background-color: #f4f4ff;
+     display: block;
+     max-width: 100%;
+     margin: auto;
+     box-sizing: border-box;
+     -moz-box-sizing: border-box;
+   }
+ 
+   blockquote {
+     border-left: 20px solid #f4f4ff;
+     padding-left: 20px;
+     margin: 0;
+     color: #7E7E7E;
+   }
+ 
+   ul, ol {
+     font-style: italic;
+     padding-left: 20px;
      margin-bottom: 20px;
      margin-left: 20px;
    }
+ 
    ul li {
      list-style: disc;
    }
@@@ -1587,6 -1600,15 +1624,15 @@@
    }
  }
  
+ .diary_post .richtext {
+     margin-top: 20px;
+   }
+ 
+ .comments .richtext {
+   margin-left: 70px;
+   margin-top: 0;
+ }
+ 
  /* Rules for rich text editors */
  
  .richtext_container {
@@@ -1619,83 -1641,38 +1665,88 @@@
      vertical-align: top;
      margin-left: 15px;
      background-color: #f8f8ff;
-     padding: 20px;
+     padding: 10px;
+     width: 200px;
  
-     p {
-       margin: 0px;
+     ul {
+       margin-bottom: 0;
+     }
+ 
+     h4.heading, li {
+       border-bottom: 1px solid #ccc;
+       margin-bottom: 5px;
+       padding-bottom: 5px;
      }
  
-     th {
-       vertical-align: top;
-       text-align: left;
-       padding: 0px 15px 0px 0px !important;
+     li h4, li span {
+       display: block;
+       font-size: 11px;
      }
  
-     td {
-       font-family: fixed;
-       line-height: 16px;
-       text-align: left;
-       padding: 0px !important;
+     li h4 {
+       margin: 0;
+       float: left;
      }
  
-     input.richtext_doedit {
-       margin-top: 5px !important;
-       margin-right: 10px !important;
+     li span {
+       float: right;
+       width: 50%;
+       margin-left: 10px;
      }
  
+     input.richtext_doedit,
      input.richtext_dopreview {
-       margin-top: 5px !important;
-       margin-left: 10px !important;
+       margin-right: 10px;
      }
    }
  }
 +
 +/* Rules for the user notes list */
 +
 +.note_list {
 +  tr.creator {
 +    background-color: #eeeeee;
 +  }
 +
 +  td {
 +    padding: 3px;
 +  }
 +
 +  p {
 +    margin-bottom: 0px;
 +  }
 +}
 +
 +/* Rules for the notes interface */
 +
 +.note {
 +  h2 {
 +    margin-bottom: 10px;
 +  }
 +
 +  .warning {
 +    display: block;
 +    background-color: #ff7070;
 +    padding: 4px 6px;
 +    margin-bottom: 10px;
 +  }
 +
 +  .comment_body {
 +    margin-top: 4px;
 +    margin-bottom: 4px;
 +
 +    p {
 +      margin-top: 0px;
 +      margin-bottom: 0px;
 +    }
 +  }
 +
 +  .comment {
 +    width: 100%;
 +  }
 +
 +  .buttons {
 +    margin-top: 5px;
 +    text-align: right;
 +  }
 +}
diff --combined config/locales/en.yml
index 01e4abecb,04ad99f12..ba23b11df
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -4,6 -4,7 +4,7 @@@ en
    time:
      formats:
        friendly: "%e %B %Y at %H:%M"
+       blog: "%e %B %Y"
    activerecord:
      # Translates all the model names, which is used in error handling on the web site
      models:
@@@ -120,8 -121,6 +121,8 @@@
          next_relation_tooltip: "Next relation"
          prev_changeset_tooltip: "Previous changeset"
          next_changeset_tooltip: "Next changeset"
 +        prev_note_tooltip: "Previous note"
 +        next_note_tooltip: "Next note"
      changeset_details:
        created_at: "Created at:"
        closed_at: "Closed at:"
@@@ -158,13 -157,11 +159,13 @@@
          node: "View node on larger map"
          way: "View way on larger map"
          relation: "View relation on larger map"
 +        note: "View note on larger map"
        edit:
          area: "Edit area"
          node: "Edit node"
          way: "Edit way"
          relation: "Edit relation"
 +        note: "Edit note"
      node_details:
        coordinates: "Coordinates:"
        part_of: "Part of:"
@@@ -224,7 -221,6 +225,7 @@@
        download_xml: "Download XML"
        view_history: "View history"
      start_rjs:
 +      notes_layer_name: "Browse Notes"
        data_layer_name: "Browse Map Data"
        data_frame_title: "Data"
        zoom_or_select: "Zoom in or select an area of the map to view"
@@@ -284,16 -280,6 +285,16 @@@
        download_xml: "Download XML"
        view_history: "View history"
        edit: "Edit way"
 +    note:
 +      open_title: "Unresolved issue: %{note_name}"
 +      closed_title: "Resolved issue: %{note_name}"
 +      opened: "Opened:"
 +      last_modified: "Last modified:"
 +      closed: "Closed:"
 +      at_html: "%{when} ago"
 +      at_by_html: "%{when} ago by %{user}"
 +      description: "Description:"
 +      comments: "Comments:"
    changeset:
      changeset_paging_nav:
        showing_page: "Page %{page}"
@@@ -1206,14 -1192,6 +1207,14 @@@
        greeting: "Hi,"
        hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
        click_the_link: "If this is you, please click the link below to reset your password."
 +    note_comment_notification:
 +      anonymous: An anonymous user
 +      subject_own: "[OpenStreetMap] %{commenter} has commented on one of your notes"
 +      subject_other: "[OpenStreetMap] %{commenter} has commented on a note you are interested in"
 +      greeting: "Hi,"
 +      your_note: "%{commenter} has left a comment on one of your map notes near %{place}."
 +      commented_note: "%{commenter} has left a comment on a map note you have commented on. The note is near %{place}."
 +      details: "More details about the note can be found at %{url}."
    message:
      inbox:
        title: "Inbox"
@@@ -1288,7 -1266,6 +1289,7 @@@
        js_2: "OpenStreetMap uses JavaScript for its slippy map."
        permalink: Permalink
        shortlink: Shortlink
 +      createnote: Add a note
        license:
          copyright: "Copyright OpenStreetMap and contributors, under an open license"
          license_url: "http://openstreetmap.org/copyright"
@@@ -1699,7 -1676,6 +1700,7 @@@
        new diary entry: new diary entry
        my edits: my edits
        my traces: my traces
 +      my notes: my map notes
        my settings: my settings
        my comments: my comments
        oauth settings: oauth settings
@@@ -1709,7 -1685,6 +1710,7 @@@
        diary: diary
        edits: edits
        traces: traces
 +      notes: map notes
        remove as friend: unfriend
        add as friend: add friend
        mapper since: "Mapper since:"
@@@ -1980,33 -1955,6 +1981,33 @@@
        back: "View all blocks"
        revoker: "Revoker:"
        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}"
 +    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})]"
 +      description_item: "An rss feed for note %{id}"
 +      closed: "closed note (near %{place})"
 +      new: "new note (near %{place})"
 +      comment: "new comment (near %{place})"
 +    mine:
 +      title: "Notes submitted or commented on by %{user}"
 +      heading: "%{user}'s notes"
 +      subheading: "Notes submitted or commented on by %{user}"
 +      id: "Id"
 +      creator: "Creator"
 +      description: "Description"
 +      created_at: "Created at"
 +      last_changed: "Last changed"
 +      ago_html: "%{when} ago"
    javascripts:
      map:
        base:
@@@ -2023,28 -1971,6 +2024,28 @@@
        history_tooltip: View edits for this area
        history_disabled_tooltip: Zoom in to view edits for this area
        history_zoom_alert: You must zoom in to view edits for this area
 +      createnote_tooltip: Add a note to the map
 +      createnote_disabled_tooltip: Zoom in to add a note to the map
 +      createnote_zoom_alert: You must zoom in to add a note to the map
 +    notes:
 +      new:
 +        intro: "In order to improve the map the information you enter is shown to other mappers, so please be as descriptive and precise as possible when moving the marker to the correct position and entering your note below."
 +        add: Add Note
 +      show:
 +        title: Note %{id}
 +        anonymous_warning: This note includes comments from anonymous users which should be independently verified.
 +        opened_by: "created by <a href='%{user_url}'>%{user}</a> at %{time}"
 +        opened_by_anonymous: "created by anonymous at %{time}"
 +        commented_by: "comment from <a href='%{user_url}'>%{user}</a> at %{time}"
 +        commented_by_anonymous: "comment from anonymous at %{time}"
 +        closed_by: "resolved by <a href='%{user_url}'>%{user}</a> at %{time}"
 +        closed_by_anonymous: "resolved by anonymous at %{time}"
 +        reopened_by: "reactivated by <a href='%{user_url}'>%{user}</a> at %{time}"
 +        reopened_by_anonymous: "reactivated by anonymous at %{time}"
 +        hide: Hide
 +        resolve: Resolve
 +        comment_and_resolve: Comment & Resolve
 +        comment: Comment
    redaction:
      edit:
        description: "Description"