Merge branch 'master' into moderation

[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 6c89a7830d5b8f6461822c26631981433d2a166c..5a207060eeaf101548c6400f4f5b4808caf09ec3 100644 (file)
--- a/app/views/user/new.html.erb
+++ b/app/views/user/new.html.erb
@@ -1,10 +1,14 @@
+<% content_for :head do %>
+  <%= javascript_include_tag "user" %>
+<% end %>
+

 <% content_for :heading do %>
   <h1><%= t 'user.new.title' %></h1>
   <div class='header-illustration new-user-main'></div>
   <div class='header-illustration new-user-arm'></div>
 <% end %>
 
 <% content_for :heading do %>
   <h1><%= t 'user.new.title' %></h1>
   <div class='header-illustration new-user-main'></div>
   <div class='header-illustration new-user-arm'></div>
 <% end %>
 

-<%= form_for :user, :url => { :action => 'create' }, :html => { :class => 'signup-form-wrapper standard-form fillL col6 pad2' } do %>
+<%= form_for current_user, :url => { :action => 'create' }, :html => { :class => 'standard-form fillL col6 inner22' } do |f| %>

   <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
 
   <fieldset>
   <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
 
   <fieldset>


@@ -12,15 +16,15 @@
       <label for="email" class="standard-label">
         <%= t 'user.new.email address' %>
       </label>
       <label for="email" class="standard-label">
         <%= t 'user.new.email address' %>
       </label>

-      <%= email_field(:user, :email, { :tabindex => 1 }) %>
-      <%= error_message_on(:user, :email) %>
+      <%= f.email_field(:email, { :tabindex => 1 }) %>
+      <%= f.error_message_on(:email) %>

     </div>
     <div class="form-row">
       <label for="email_confirmation" class="standard-label">
         <%= t 'user.new.confirm email address' %>
       </label>
     </div>
     <div class="form-row">
       <label for="email_confirmation" class="standard-label">
         <%= t 'user.new.confirm email address' %>
       </label>

-      <%= email_field(:user, :email_confirmation, { :tabindex => 2 }) %>
-      <%= error_message_on(:user, :email_confirmation) %>
+      <%= f.email_field(:email_confirmation, { :tabindex => 2 }) %>
+      <%= f.error_message_on(:email_confirmation) %>

     </div>
     <span class="form-help deemphasize"><%= raw(t 'user.new.not displayed publicly') %></span>
   </fieldset>
     </div>
     <span class="form-help deemphasize"><%= raw(t 'user.new.not displayed publicly') %></span>
   </fieldset>


@@ -30,21 +34,22 @@
       <label for="display_name" class="standard-label">
         <%= t 'user.new.display name' %>
       </label>
       <label for="display_name" class="standard-label">
         <%= t 'user.new.display name' %>
       </label>

-      <%= text_field(:user, :display_name, { :tabindex => 3 }) %>
-      <%= error_message_on(:user, :display_name) %>
+      <%= f.text_field(:display_name, { :tabindex => 3 }) %>
+      <%= f.error_message_on(:display_name) %>

     </div>
     <span class="form-help deemphasize"><%= t 'user.new.display name description' %></span>
   </fieldset>
 
     </div>
     <span class="form-help deemphasize"><%= t 'user.new.display name description' %></span>
   </fieldset>
 

-  <fieldset class="form-divider" id="openid_field">
+  <fieldset class="form-divider" id="auth_field">

     <div class="form-row">
       <label for="openid_url" class="standard-label">
     <div class="form-row">
       <label for="openid_url" class="standard-label">

-        <%= raw t 'user.new.openid', :logo => openid_logo %>
+        <%= raw t 'user.new.external auth' %>

       </label>
       </label>

-      <%= url_field(:user, :openid_url, { :id => "openid_url", :tabindex => 4, :class => "openid_url" }) %>
-      <%= error_message_on(:user, :openid_url) %>
+      <%= f.select(:auth_provider, Auth::PROVIDERS, { :default => "", :tabindex => 4 }) %>
+      <%= f.text_field(:auth_uid, { :tabindex => 5 }) %>
+      <%= f.error_message_on(:auth_uid) %>

     </div>
     </div>

-    <span class="form-help deemphasize"><%= t 'user.new.openid no password' %></span>
+    <span class="form-help deemphasize"><%= t 'user.new.auth no password' %></span>

   </fieldset>
 
   <fieldset>
   </fieldset>
 
   <fieldset>


@@ -52,52 +57,26 @@
       <label for='user[pass_crypt]' class="standard-label">
         <%= t 'user.new.password' %>
       </label>
       <label for='user[pass_crypt]' class="standard-label">
         <%= t 'user.new.password' %>
       </label>

-      <%= password_field(:user, :pass_crypt, {:tabindex => 5 }) %>
-      <%= error_message_on(:user, :pass_crypt) %>
+      <%= f.password_field(:pass_crypt, { :tabindex => 6 }) %>
+      <%= f.error_message_on(:pass_crypt) %>

     </div>
     <div class="form-row">
       <label class="standard-label">
         <%= t 'user.new.confirm password' %>
       </label>
     </div>
     <div class="form-row">
       <label class="standard-label">
         <%= t 'user.new.confirm password' %>
       </label>

-      <%= password_field(:user, :pass_crypt_confirmation, { :tabindex => 6 }) %>
-      <%= error_message_on(:user, :pass_crypt_confirmation) %>
+      <%= f.password_field(:pass_crypt_confirmation, { :tabindex => 7 }) %>
+      <%= f.error_message_on(:pass_crypt_confirmation) %>

     </div>
   </fieldset>
 
     </div>
   </fieldset>
 

-  <div id="openid_prompt" class="form-row">
-    <%= link_to raw(t("user.new.use openid", :logo => openid_logo)), "#", :id => "openid_enable" %>
+  <div id="auth_prompt" class="form-row">
+    <%= link_to raw(t("user.new.use external auth")), "#", :id => "auth_enable" %>

   </div>
 
   </div>
 

-  <%= submit_tag t('user.new.continue'), :tabindex => 6 %>
+  <%= submit_tag t('user.new.continue'), :tabindex => 8 %>

 <% end %>
 
 <% end %>
 

-<div class='col6 deemphasize pad2'>
+<div class='aside col6 deemphasize inner22'>

   <h4><%= t 'user.new.about.header' %></h4>
   <%= t 'user.new.about.html' %>
 </div>
   <h4><%= t 'user.new.about.header' %></h4>
   <%= t 'user.new.about.html' %>
 </div>

-
-<script type="text/javascript">
-function enableOpenID()
-{
-  $("#openid_prompt").hide();
-  $("#openid_field").show();
-  $("#openid_url").prop("disabled", false);
-}
-
-function disableOpenID()
-{
-  $("#openid_prompt").show();
-  $("#openid_field").hide();
-  $("#openid_url").prop("disabled", true);
-}
-
-$(document).ready(function () {
-  $("#openid_enable").click(enableOpenID);
-
-  <% if params[:openid] or (@user and @user.openid_url.present?) -%>
-  enableOpenID();
-  <% else -%>
-  disableOpenID();
-  <% end -%>
-});
-</script>