diff options
author | Azul <azul@riseup.net> | 2016-05-23 12:17:31 +0200 |
---|---|---|
committer | Azul <azul@riseup.net> | 2016-05-23 13:01:51 +0200 |
commit | f47fc9d6522886cf81cfea26ec1f396219c539ba (patch) | |
tree | b63490a1e515c211a15b9c3aa062a09927739c77 /app/views | |
parent | 7f0c42a5fa6d6c1952e53b9b73bad0202f746f3e (diff) |
move signup from users to account_controller
There was a lot of special case handling going on in the users_controller
for this. Lot simpler this way.
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/account/new.html.haml (renamed from app/views/users/new.html.haml) | 6 | ||||
-rw-r--r-- | app/views/sessions/_warnings.html.haml (renamed from app/views/users/_warnings.html.haml) | 0 | ||||
-rw-r--r-- | app/views/sessions/new.html.haml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/views/users/new.html.haml b/app/views/account/new.html.haml index 1b257d9..d40259e 100644 --- a/app/views/users/new.html.haml +++ b/app/views/account/new.html.haml @@ -1,8 +1,8 @@ -# -# This form is handled entirely by javascript -# Please take care when changing element ids. --# --# The form is hidden when no js is available +-# +-# The form is hidden when no js is available -# to prevent submission in the clear. -# @@ -12,7 +12,7 @@ .col-md-9 %h2=t :signup .lead=t :signup_info - = render :partial => 'warnings' + = render "sessions/warnings" = simple_form_for(@user, form_options) do |f| = f.input :login, :label => t(:username), :required => false, :input_html => { :id => :srp_username } = f.input :password, :label => t(:password), :required => false, :validate => true, :input_html => { :id => :srp_password } diff --git a/app/views/users/_warnings.html.haml b/app/views/sessions/_warnings.html.haml index baf80a4..baf80a4 100644 --- a/app/views/users/_warnings.html.haml +++ b/app/views/sessions/_warnings.html.haml diff --git a/app/views/sessions/new.html.haml b/app/views/sessions/new.html.haml index 942c485..6695123 100644 --- a/app/views/sessions/new.html.haml +++ b/app/views/sessions/new.html.haml @@ -2,7 +2,7 @@ .col-md-9 %h2=t :login .lead=t :login_info - = render :partial => 'users/warnings' + = render 'warnings' = simple_form_for [:api, @session], validate: true, html: { id: :new_session, class: 'form-horizontal hidden js-show', style: "display:none;" } do |f| = f.input :login, :required => false, :label => t(:username), :input_html => { :id => :srp_username } = f.input :password, :required => false, :input_html => { :id => :srp_password } |