-<%= javascript_include_tag 'openID.js' %>
-
<h1><%= t 'user.new.heading' %></h1>
-<% if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"}) %>
+<p><%= t 'user.new.fill_form' %></p>
+
+<%= error_messages_for 'user' %>
-<p><%= t 'user.new.no_auto_account_create' %>
-</p>
+<%= form_for :user, :url => { :action => 'terms' } do %>
+ <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
-<p><%= t 'user.new.contact_webmaster' %>
-</p>
+ <table id="signupForm">
+ <tr>
+ <td class="fieldName"><%= t 'user.new.email address' %></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><%= email_field(:user, :email_confirmation, { :size => 50, :maxlength => 255, :tabindex => 2 }) %></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td><span class="minorNote"><%= raw(t 'user.new.not displayed publicly') %></span></td>
+ </tr>
-<% else %>
+ <tr><td colspan="2"> <!--vertical spacer--></td></tr>
-<p><%= t 'user.new.fill_form' %>
-</p>
+ <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></td>
+ <td><span class="minorNote"><%= t 'user.new.display name description' %></span></td>
+ </tr>
-<p><%= t 'user.new.license_agreement' %>
-</p>
+ <tr id="openid_spacer"><td colspan="2"> <!--vertical spacer--></td></tr>
-<%= error_messages_for 'user' %>
+ <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>
-<% form_tag :action => 'save' do %>
-<%= hidden_field_tag('referer', h(params[:referer])) unless params[: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 => @email}) %></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"> <!--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 => @nickname}) %></td></tr>
- <tr><td></td><td><span class="minorNote"><%= t 'user.new.display name description' %></span></td></tr>
- <tr><td colspan="2"> <!--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"> <!--vertical spacer--></td></tr>
- <tr><td></td><td><span class="minorNote"><a href="javascript:unhideopenID()">Associate an OpenID with your account</a></span></td></tr>
- <tr id="openID_row-1" style="display: none"><td class="fieldName"><%= t 'user.new.openID' %></td><td><%= text_field('user', 'openid_url',{:size => 50, :maxlength => 255, :tabindex => 6, :value => @openID, :class => "openid_url"}) %></td></tr>
- <tr id="openID_row-2" style="display: none"><td></td><td><span class="minorNote"><%= t 'user.new.openID description' %></span></td></tr>
- <tr><td colspan="2" > <!--vertical spacer--></td></tr>
- <tr><td></td><td align="right"><input type="submit" value="<%= t'user.new.signup' %>" tabindex="7"></td></tr>
-</table>
+ <tr><td colspan="2"> <!--vertical spacer--></td></tr>
+
+ <tr>
+ <td class="fieldName"><%= t 'user.new.password' %></td>
+ <td><%= password_field(:user, :pass_crypt, { :size => 30, :maxlength => 255, :tabindex => 5 }) %></td>
+ </tr>
+ <tr>
+ <td class="fieldName"><%= t 'user.new.confirm password' %></td>
+ <td><%= password_field(:user, :pass_crypt_confirmation, { :size => 30, :maxlength => 255, :tabindex => 6 }) %></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ <span id="openid_prompt" class="minorNote"><%= link_to raw(t("user.new.use openid", :logo => openid_logo)), "#", :id => "openid_enable" %></span>
+ <span id="openid_note" class="minorNote"><%= t 'user.new.openid no password' %></span>
+ </td>
+ </tr>
+
+ <tr><td colspan="2" > <!--vertical spacer--></td></tr>
+
+ <tr>
+ <td></td>
+ <td class="submitButton"><%= submit_tag t('user.new.continue'), :tabindex => 6 %></td>
+ </tr>
+ </table>
<% end %>
-<% if @openID %>
<script type="text/javascript">
-unhideopenID();
-</script>
-<% end %>
+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);
+}
+
+$(document).ready(function () {
+ $("#openid_enable").click(enableOpenID);
+
+ <% if params[:openid] or (@user and @user.openid_url and not @user.openid_url.empty?) -%>
+ enableOpenID();
+ <% else -%>
+ disableOpenID();
+ <% end -%>
+});
+</script>
projects / rails.git / blobdiff