Merge remote-tracking branch 'upstream/pull/5459'

[rails.git] / app / views / notes / new.html.erb

diff --git a/app/views/notes/new.html.erb b/app/views/notes/new.html.erb
index c9b1275b9493f43c9bca1525341dd9b6910af7d2..4ae4a995da658be5da60b7053c2d02f509bc1228 100644 (file)
--- a/app/views/notes/new.html.erb
+++ b/app/views/notes/new.html.erb
@@ -7,8 +7,9 @@
   <% if !current_user %>
     <p class="alert alert-warning"><%= t ".anonymous_warning_html",
                                          :log_in => link_to(t(".anonymous_warning_log_in"), login_path(:referer => new_note_path)),
   <% if !current_user %>
     <p class="alert alert-warning"><%= t ".anonymous_warning_html",
                                          :log_in => link_to(t(".anonymous_warning_log_in"), login_path(:referer => new_note_path)),

-                                         :sign_up => link_to(t(".anonymous_warning_sign_up"), user_new_path) %></p>
+                                         :sign_up => link_to(t(".anonymous_warning_sign_up"), new_user_path) %></p>

   <% end %>
   <% end %>

+  <p class="alert alert-warning" id="new-note-zoom-warning" hidden><%= t "javascripts.site.createnote_disabled_tooltip" %></p>

   <form action="#">
     <input type="hidden" name="lon" autocomplete="off">
     <input type="hidden" name="lat" autocomplete="off">
   <form action="#">
     <input type="hidden" name="lon" autocomplete="off">
     <input type="hidden" name="lat" autocomplete="off">