X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/007b985835a70ac37bbb68abe2eba126fe36cd64..75e178e6b884f3b2199f69e354ece2cae0a1f5fc:/app/views/user/new.html.erb?ds=sidebyside diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb index 3707bb070..5a207060e 100644 --- a/app/views/user/new.html.erb +++ b/app/views/user/new.html.erb @@ -1,110 +1,82 @@ +<% content_for :head do %> + <%= javascript_include_tag "user" %> +<% end %> + <% content_for :heading do %>

<%= t 'user.new.title' %>

-
-
+
+
<% end %> -<%= form_for :user, :url => { :action => 'create' }, :html => { :class => 'signup-form-wrapper fillL col6 pad2' } do %> - <%= error_messages_for 'user' %> - +<%= 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? %> -
- -
-
- - <%= email_field(:user, :email, { :tabindex => 1 }) %> -
-
- - <%= email_field(:user, :email_confirmation, { :tabindex => 2 }) %> -
+
+
+ + <%= f.email_field(:email, { :tabindex => 1 }) %> + <%= f.error_message_on(:email) %> +
+
+ + <%= f.email_field(:email_confirmation, { :tabindex => 2 }) %> + <%= f.error_message_on(:email_confirmation) %> +
<%= raw(t 'user.new.not displayed publicly') %> -
- -
-
- - <%= text_field(:user, :display_name, { :tabindex => 3 }) %> -
- <%= t 'user.new.display name description' %> -
- -
-
- - <%= url_field(:user, :openid_url, { :id => "openid_url", :tabindex => 4, :class => "openid_url" }) %> -
- - <%= t 'user.new.openid no password' %> - -
- -
-
- - <%= password_field(:user, :pass_crypt, {:tabindex => 5 }) %> -
-
- - <%= password_field(:user, :pass_crypt_confirmation, { :tabindex => 6 }) %> -
-
- -
- <%= link_to raw(t("user.new.use openid", :logo => openid_logo)), "#", :id => "openid_enable" %> +
+ +
+
+ + <%= f.text_field(:display_name, { :tabindex => 3 }) %> + <%= f.error_message_on(:display_name) %> +
+ <%= t 'user.new.display name description' %> +
+ +
+
+ + <%= f.select(:auth_provider, Auth::PROVIDERS, { :default => "", :tabindex => 4 }) %> + <%= f.text_field(:auth_uid, { :tabindex => 5 }) %> + <%= f.error_message_on(:auth_uid) %>
+ <%= t 'user.new.auth no password' %> +
+ +
+
+ + <%= f.password_field(:pass_crypt, { :tabindex => 6 }) %> + <%= f.error_message_on(:pass_crypt) %> +
+
+ + <%= f.password_field(:pass_crypt_confirmation, { :tabindex => 7 }) %> + <%= f.error_message_on(:pass_crypt_confirmation) %> +
+
- <%= submit_tag t('user.new.continue'), :tabindex => 6 %> +
+ <%= link_to raw(t("user.new.use external auth")), "#", :id => "auth_enable" %>
+ + <%= submit_tag t('user.new.continue'), :tabindex => 8 %> <% end %> -
+

<%= t 'user.new.about.header' %>

<%= t 'user.new.about.html' %>
- -