From: Richard Fairhurst <richard@systemed.net>
Date: Tue, 20 Nov 2007 10:08:58 +0000 (+0000)
Subject: Require data to be public before editing
X-Git-Tag: live~8091
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a8333a38a2c9abf3304d61b20c5215d75fdd5795?hp=6785ce523129b9be84a8f5b4abfae213d856a6f2

Require data to be public before editing
---

diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
index 8ff98a3b1..de2764115 100644
--- a/app/views/site/edit.rhtml
+++ b/app/views/site/edit.rhtml
@@ -6,6 +6,11 @@
 <p>The OpenStreetMap database is currently in read-only mode while
    essential database maintenance work is carried out.
 </p>
+<% elsif !@user.data_public? %>
+<p>You haven't set your edits to be public.</p>
+<p>You can't use the online editor unless you do so. You can set your edits as public from your 
+<%= link_to 'user page', {:controller => 'user', :action => 'account', :display_name => @user.display_name}%>.</p>
+<p>(<a href="http://wiki.openstreetmap.org/index.php/Disabling_anonymous_edits">Find out why this is the case.</a>)</p>
 <% else %>
 <% content_for :greeting do %>
 <% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
@@ -91,15 +96,5 @@
   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 %>
diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml
index 53c355316..b25cb0071 100644
--- a/app/views/user/account.rhtml
+++ b/app/views/user/account.rhtml
@@ -107,7 +107,7 @@
 <% if @user.data_public? %>
   All your edits are public.
 <% else %>
-  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.
+  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</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 %>