Preparation for anon edit change

diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
index ceb4702d43808345da7a8bb18b5103f6d073af28..8ff98a3b1d00d9a376da105c009dc7094a01b6ed 100644 (file)
--- a/app/views/site/edit.rhtml
+++ b/app/views/site/edit.rhtml
@@ -90,5 +90,16 @@
 
   window.onresize = handleResize;
   window.onload = handleResize;
 
   window.onresize = handleResize;
   window.onload = handleResize;

+
+
+<% unless @user.data_public? %>
+    var warningtext ="<div style='padding-left:8px;padding-right:8px;'><p>You haven't set your edits to be public.</p><p><b>From mid-November, you will no longer be able to use the online editor unless you do so.</b> You can set your edits as public from your ";
+       var warningtext=warningtext+'<%= link_to 'user page', {:controller => 'user', :action => 'account', :display_name => @user.display_name}%>.</p>';
+       var warningtext=warningtext+'<p>(<a href="http://wiki.openstreetmap.org/index.php/Disabling_anonymous_edits">Find out why this is changing.</a>)</p></div>';
+       updateSidebar("Warning",warningtext);
+       openSidebar();
+<% end %>
+
+

 </script>
 <% end %>
 </script>
 <% end %>

diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml
index f405e0b3cf5d0a09bb9ecb2e659980b3f58b6d40..53c3553165b015d4c707c18fd8fc8987e5e599e9 100644 (file)
--- a/app/views/user/account.rhtml
+++ b/app/views/user/account.rhtml
@@ -103,11 +103,11 @@
 // -->
 </script>
 
 // -->
 </script>
 

-<h2>Privacy</h2>
+<h2>Public editing</h2>

 <% if @user.data_public? %>
   All your edits are public.
 <% else %>
 <% if @user.data_public? %>
   All your edits are public.
 <% else %>

-  Currently your edits are anonymous and people can't find out where you are located. To show what you edited and allow people to contact you through the website, click the button below. This action cannot be reversed.
+  Currently your edits are anonymous and people can't send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>You will need to do this if you want to use the online editor after mid-November</b> (<a href="http://wiki.openstreetmap.org/index.php/Disabling_anonymous_edits">find out why</a>). This action cannot be reversed.

   <br /><br />
   <%= button_to "Make all my edits public, forever", :action => :go_public %>
 <% end %>
   <br /><br />
   <%= button_to "Make all my edits public, forever", :action => :go_public %>
 <% end %>