summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2017-03-27 16:38:20 +0000
committerazul <azul@riseup.net>2017-03-27 16:38:20 +0000
commitd53ff24edb72f35b710cb300738c330316475de5 (patch)
tree7623101cb8f65cd9477d7bc61dabcd18fa02ef1e /app/views
parent9beeee8aa2d1656e7c80e54137156e7922737aa5 (diff)
parentb1b523f08a9ce7ea5fe0d50dc8b86995e00b48d6 (diff)
Merge branch 'fix/bootstrap-3' into 'master'
Fix/bootstrap 3 See merge request !31
Diffstat (limited to 'app/views')
-rw-r--r--app/views/account/new.html.haml15
1 files changed, 10 insertions, 5 deletions
diff --git a/app/views/account/new.html.haml b/app/views/account/new.html.haml
index d40259e..4766945 100644
--- a/app/views/account/new.html.haml
+++ b/app/views/account/new.html.haml
@@ -6,7 +6,12 @@
-# to prevent submission in the clear.
-#
-- form_options = {url: '/not-used', html: {id: 'new_user', class: user_form_class('form-horizontal'), style: 'display:none'}, validate: true}
+- form_options = { url: '/not-used',
+ html: { id: 'new_user',
+ class: user_form_class('form-horizontal'),
+ style: 'display:none' },
+ validate: true,
+ wrapper: :horizontal_form }
.col-md-1
.col-md-9
@@ -14,14 +19,14 @@
.lead=t :signup_info
= 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 }
- = f.input :password_confirmation, :label => t(:password_confirmation), :required => false, :validate => true, :input_html => { :id => :srp_password_confirmation }
+ = f.input :login, :label => t(:username), :validate => true, :input_html => { :id => :srp_username}
+ = f.input :password, :label => t(:password), :validate => true, :input_html => { :id => :srp_password }
+ = f.input :password_confirmation, :label => t(:password_confirmation), :validate => true, :input_html => { :id => :srp_password_confirmation }
- if APP_CONFIG[:invite_required]
= f.input :invite_code, :label => t(:invite_code), :input_html => { :id => :srp_invite_code }
- else
= f.input :invite_code, :as => "hidden", :input_html => { :value => " ", :id => :srp_invite_code }
- = f.button :wrapped, cancel: home_path
+ = f.button :submit # :wrapped, cancel: home_path
-#