Convert OpenID authentication to generic third party authentication

[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 6ac85560d3720b78fef0829d49c1574502b4c6fd..687857bfd709e93d84fdb49216305b97d827b2ad 100644 (file)
--- a/app/views/user/new.html.erb
+++ b/app/views/user/new.html.erb
@@ -1,37 +1,82 @@
-<h1><%= t 'user.new.heading' %></h1>
+<% content_for :head do %>
+  <%= javascript_include_tag "user" %>
+<% end %>

 
 

-<% if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"}) %>
+<% 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 %>

 
 

-<p><%= t 'user.new.no_auto_account_create' %>
-</p>
+<%= form_for :user, :url => { :action => 'create' }, :html => { :class => 'standard-form fillL col6 inner22' } do %>
+  <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>

 
 

-<p><%= t 'user.new.contact_webmaster' %>
-</p>
+  <fieldset>
+    <div class="form-row">
+      <label for="email" class="standard-label">
+        <%= t 'user.new.email address' %>
+      </label>
+      <%= email_field(:user, :email, { :tabindex => 1 }) %>
+      <%= error_message_on(:user, :email) %>
+    </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) %>
+    </div>
+    <span class="form-help deemphasize"><%= raw(t 'user.new.not displayed publicly') %></span>
+  </fieldset>

 
 

-<% else %>
+  <fieldset>
+    <div class="form-row">
+      <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) %>
+    </div>
+    <span class="form-help deemphasize"><%= t 'user.new.display name description' %></span>
+  </fieldset>

 
 

-<p><%= t 'user.new.fill_form' %>
-</p>
+  <fieldset class="form-divider" id="auth_field">
+    <div class="form-row">
+      <label for="openid_url" class="standard-label">
+        <%= raw t 'user.new.external auth' %>
+      </label>
+      <%= select(:user, :auth_provider, { "None" => "", "OpenID" => "openid" }, { :default => "", :tabindex => 4 }) %>
+      <%= text_field(:user, :auth_uid, { :tabindex => 5 }) %>
+      <%= error_message_on(:user, :auth_uid) %>
+    </div>
+    <span class="form-help deemphasize"><%= t 'user.new.auth no password' %></span>
+  </fieldset>

 
 

-<p><%= t 'user.new.license_agreement' %>
-</p>
+  <fieldset>
+    <div class="form-row">
+      <label for='user[pass_crypt]' class="standard-label">
+        <%= t 'user.new.password' %>
+      </label>
+      <%= password_field(:user, :pass_crypt, { :tabindex => 6 }) %>
+      <%= error_message_on(:user, :pass_crypt) %>
+    </div>
+    <div class="form-row">
+      <label class="standard-label">
+        <%= t 'user.new.confirm password' %>
+      </label>
+      <%= password_field(:user, :pass_crypt_confirmation, { :tabindex => 7 }) %>
+      <%= error_message_on(:user, :pass_crypt_confirmation) %>
+    </div>
+  </fieldset>

 
 

-<%= error_messages_for 'user' %>
+  <div id="auth_prompt" class="form-row">
+    <%= link_to raw(t("user.new.use external auth")), "#", :id => "auth_enable" %>
+  </div>

 
 

-<% form_tag :action => 'save' do %>
-<table id="loginForm">
-  <tr><td class="fieldName"><%= t 'user.new.email address' %></td><td><%= text_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}) %></td></tr>
-  <tr><td></td><td><span class="minorNote"><%= 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}) %></td></tr>
-  <tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>
-  <tr><td class="fieldName"><%= t 'user.new.password' %></td><td><%= password_field('user', 'pass_crypt',{:size => 30, :maxlength => 255, :tabindex => 4}) %></td></tr>
-  <tr><td class="fieldName"><%= t 'user.new.confirm password' %></td><td><%= password_field('user', 'pass_crypt_confirmation',{:size => 30, :maxlength => 255, :tabindex => 5}) %></td></tr>
-  
-  <tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>
-  <tr><td></td><td align=right><input type="submit" value="<%= t'user.new.signup' %>" tabindex="6"></td></tr>
-</table>
+  <%= submit_tag t('user.new.continue'), :tabindex => 8 %>

 <% end %>
 
 <% end %>
 

-<% end %>
+<div class='aside col6 deemphasize inner22'>
+  <h4><%= t 'user.new.about.header' %></h4>
+  <%= t 'user.new.about.html' %>
+</div>