Don't show "Browse Map Data" when we're not on the map view

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

diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb
index 992ec9be1aa4790e90017b4c8e1927737612fe73..e8400eb9019a687c629a5c8eac5d5eb82e8e6fdb 100644 (file)
--- a/app/views/user/new.html.erb
+++ b/app/views/user/new.html.erb
@@ -1,41 +1,31 @@
 <h1><%= t 'user.new.heading' %></h1>
 
-<% if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"}) %>
-
-<p><%= t 'user.new.no_auto_account_create' %></p>
-
-<p><%= t 'user.new.contact_webmaster' %></p>
-
-<% else %>
-
 <p><%= t 'user.new.fill_form' %></p>
 
-<p><%= t 'user.new.license_agreement' %></p>
-
 <%= error_messages_for 'user' %>
 
-<% form_tag :action => 'save' do %>
+<%= form_for :user, :url => { :action => 'terms' } do %>
   <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
 
   <table id="signupForm">
     <tr>
       <td class="fieldName"><%= t 'user.new.email address' %></td>
-      <td><%= text_field(:user, :email, { :size => 50, :maxlength => 255, :tabindex => 1, :value => params[:email] }) %></td>
+      <td><%= email_field(:user, :email, { :size => 50, :maxlength => 255, :tabindex => 1 }) %></td>
     </tr>
     <tr>
       <td class="fieldName"><%= t 'user.new.confirm email address' %></td>
-      <td><%= text_field(:user, :email_confirmation, { :size => 50, :maxlength => 255, :tabindex => 2, :value => params[:email] }) %></td>
+      <td><%= email_field(:user, :email_confirmation, { :size => 50, :maxlength => 255, :tabindex => 2 }) %></td>
     </tr>
     <tr>
       <td></td>
-      <td><span class="minorNote"><%= t 'user.new.not displayed publicly' %></span></td>
+      <td><span class="minorNote"><%= raw(t 'user.new.not displayed publicly') %></span></td>
     </tr>
 
     <tr><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
 
     <tr>
       <td class="fieldName"><%= t 'user.new.display name' %></td>
-      <td><%= text_field(:user, :display_name, { :size => 30, :maxlength => 255, :tabindex => 3, :value => params[:nickname] }) %></td></tr>
+      <td><%= text_field(:user, :display_name, { :size => 30, :maxlength => 255, :tabindex => 3 }) %></td></tr>
     <tr>
       <td></td>
       <td><span class="minorNote"><%= t 'user.new.display name description' %></span></td>
@@ -43,9 +33,9 @@
 
     <tr id="openid_spacer"><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
 
-    <tr id="openid_url">
-      <td class="fieldName"><%= t 'user.new.openid', :logo => openid_logo %></td>
-      <td><%= text_field(:user, :openid_url, { :size => 50, :maxlength => 255, :tabindex => 4, :value => params[:openid], :class => "openid_url" }) %></td>
+    <tr id="openid_field">
+      <td class="fieldName"><%= raw t 'user.new.openid', :logo => openid_logo %></td>
+      <td><%= url_field(:user, :openid_url, { :id => "openid_url", :size => 50, :maxlength => 255, :tabindex => 4, :class => "openid_url" }) %></td>
     </tr>
 
     <tr><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
@@ -61,7 +51,7 @@
     <tr>
       <td></td>
       <td>
-        <span id="openid_prompt" class="minorNote"><%= link_to_function(t('user.new.use openid', :logo => openid_logo)) { |page| page.hide 'openid_prompt'; page.show 'openid_spacer', 'openid_url', 'openid_note' } %></span>
+        <span id="openid_prompt" class="minorNote"><%= link_to_function(raw(t('user.new.use openid', :logo => openid_logo)), "enableOpenID()") %></span>
         <span id="openid_note" class="minorNote"><%= t 'user.new.openid no password' %></span>
       </td>
     </tr>
@@ -70,23 +60,37 @@
 
     <tr>
       <td></td>
-      <td align="right"><%= submit_tag t('user.new.signup'), :tabindex => 6 %></td>
+      <td class="submitButton"><%= submit_tag t('user.new.continue'), :tabindex => 6 %></td>
     </tr>
   </table>
 <% end %>
 
-<%=
-  update_page_tag do |page|
-    if params[:openid] 
-      page[:openid_prompt].hide
-    else
-      page[:openid_spacer].hide
-      page[:openid_url].hide
-      page[:openid_note].hide
-    end
-  end
-%>
+<script type="text/javascript">
+function enableOpenID()
+{
+  $("#openid_prompt").hide();
 
-<%= javascript_include_tag 'https://ethnio.com/remotes/62786' %>
+  $("#openid_spacer").show();
+  $("#openid_field").show();
+  $("#openid_note").show();
 
-<% end %>
+  $("#openid_url").prop("disabled", false);
+}
+
+function disableOpenID()
+{
+  $("#openid_prompt").show();
+
+  $("#openid_spacer").hide();
+  $("#openid_field").hide();
+  $("#openid_note").hide();
+
+  $("#openid_url").prop("disabled", true);
+}
+
+<% if params[:openid] or (@user and @user.openid_url and not @user.openid_url.empty?) -%>
+enableOpenID();
+<% else -%>
+disableOpenID();
+<% end -%>
+</script>