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 6b99662a42c9a844c06ad32dc2ca11bd8bade397..f2ba4843ca594d0c4d5846a339824e1a0523c614 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1209,9 +1209,8 @@ tr.turn:hover {
   }
 
   .warning {
   }
 
   .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 {
   }
 
   .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 49922494e25906b6526e8299a44f3f8dbac37afd..f6518daf204b2d5acc8b97c0bfe1332aa02ca930 100644 (file)
--- 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">
   <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>
     <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 062fd95d48ef75d6b7d86819788e38ede82ca7f4..4ce1ae69ff7d0c173a16b0243fa437d621207cc8 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2239,7 +2239,8 @@ en:
         unhide_comment: "unhide"
     notes:
       new:
         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.
         add: Add Note
       show:
         anonymous_warning: This note includes comments from anonymous users which should be independently verified.