From: Tom Hughes <tom@compton.nu>
Date: Thu, 14 Dec 2017 16:03:48 +0000 (+0000)
Subject: Move advice on what to enter in a note to guide text
X-Git-Tag: live~3221
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/30757696bd01b54cb95309fa61cf8b15ce066ff9?hp=c6b66ddeeeeaeca67eb8ed57f8c3f1831d611154

Move advice on what to enter in a note to guide text
---

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 6b99662a4..f2ba4843c 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1209,9 +1209,8 @@ tr.turn:hover {
   }
 
   .warning {
-    margin: $lineheight/2 0;
-    padding: $lineheight/2;
-    font-size: 90%;
+    margin: 0 0 $lineheight/2 0;
+    padding: 0 $lineheight/2;
   }
 
   .note-comments li, .changeset-comments li {
diff --git a/app/views/browse/new_note.html.erb b/app/views/browse/new_note.html.erb
index 49922494e..f6518daf2 100644
--- a/app/views/browse/new_note.html.erb
+++ b/app/views/browse/new_note.html.erb
@@ -10,7 +10,7 @@
   <form action="#">
     <input type="hidden" name="lon">
     <input type="hidden" name="lat">
-    <textarea class="comment" name="text" cols="40" rows="10"></textarea>
+    <textarea class="comment" name="text" cols="40" rows="10" placeholder="<%= t('javascripts.notes.new.advice') %>"></textarea>
     <div class="buttons clearfix">
       <input type="submit" name="add" value="<%= t('javascripts.notes.new.add') %>" disabled="1">
     </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 062fd95d4..4ce1ae69f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2239,7 +2239,8 @@ en:
         unhide_comment: "unhide"
     notes:
       new:
-        intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem. (Please don't enter personal information or information from copyrighted maps or directory listings.)"
+        intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem."
+        advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings."
         add: Add Note
       show:
         anonymous_warning: This note includes comments from anonymous users which should be independently verified.