Merge branch 'openID' of git://git.openstreetmap.org/rails into openid

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

diff --git a/app/views/user/terms.html.erb b/app/views/user/terms.html.erb
index a370d4b48cc6a6b69383dca50c4533d30b352a86..3e93ff20c6dacfda9d9a6a75c7df281137814836 100644 (file)
--- a/app/views/user/terms.html.erb
+++ b/app/views/user/terms.html.erb
@@ -1,6 +1,6 @@
 <h1><%= t 'user.terms.heading' %></h1>
 
 <h1><%= t 'user.terms.heading' %></h1>
 

-<p><%= t 'user.terms.press accept button' %></p>
+<p><%= t 'user.terms.read and accept' %></p>

 
 <!-- legale is <%= @legale %> -->
 <% form_tag :action => 'terms' do %>
 
 <!-- legale is <%= @legale %> -->
 <% form_tag :action => 'terms' do %>


@@ -13,7 +13,7 @@
             :before => update_page do |page|
               page.replace_html 'contributorTerms', image_tag('searching.gif')
             end,
             :before => update_page do |page|
               page.replace_html 'contributorTerms', image_tag('searching.gif')
             end,

-            :url => {:legale => legale}
+            :url => {:legale => legale, :has_decline => @user.new_record?}

           )
       %>
       <%= label_tag "legale_#{legale}", t('user.terms.legale_names.' + name) %>
           )
       %>
       <%= label_tag "legale_#{legale}", t('user.terms.legale_names.' + name) %>


@@ -22,10 +22,10 @@
 <% end %>
 
 <div id="contributorTerms">
 <% end %>
 
 <div id="contributorTerms">

-  <%= render :partial => "terms" %>
+  <%= render :partial => "terms", :locals => { :has_decline => @user.new_record? }  %>

 </div>
 
 </div>
 

-<% form_tag :action => 'save' do %>
+<% form_tag({:action => "save"}, { :id => "termsForm" }) do %>

   <p>
     <label for="confirm_pd_checkbox"><%= t 'user.terms.consider_pd' %></label>
     <%= check_box('user', 'consider_pd') %>
   <p>
     <label for="confirm_pd_checkbox"><%= t 'user.terms.consider_pd' %></label>
     <%= check_box('user', 'consider_pd') %>


@@ -33,14 +33,19 @@
   </p>
   <p>
     <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
   </p>
   <p>
     <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>

-    <%= hidden_field('user', 'email') %>
-    <%= hidden_field('user', 'email_confirmation') %>
-    <%= hidden_field('user', 'display_name') %>
-    <%= hidden_field('user', 'pass_crypt') %>
-    <%= hidden_field('user', 'pass_crypt_confirmation') %>
-    <div class="left_right_line">
-      <div class="left"><a class="looks_like_button" href="<%= t 'user.terms.exit_wiki' %>"><%= t 'user.terms.decline' %></a></div>
-      <div class="right"><%= submit_tag(t('user.terms.button'), :class => 'float_right') %></div>
+    <% if @user.new_record? %>
+      <%= hidden_field('user', 'email') %>
+      <%= hidden_field('user', 'email_confirmation') %>
+      <%= hidden_field('user', 'display_name') %>
+      <%= hidden_field('user', 'pass_crypt') %>
+      <%= hidden_field('user', 'pass_crypt_confirmation') %>
+      <%= hidden_field('user', 'openid_url') %>
+    <% end %>
+    <div id="buttons">
+      <% if @user.new_record? %>
+        <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>
+      <% end %>
+      <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %>

     </div>
   </p>
 <% end %>
     </div>
   </p>
 <% end %>