diff options
| -rw-r--r-- | app/views/devise/registrations/new.html.erb | 27 | ||||
| -rw-r--r-- | app/views/devise/sessions/new.html.erb | 23 | ||||
| -rw-r--r-- | app/views/devise/shared/_form_registration.html.erb | 17 |
3 files changed, 22 insertions, 45 deletions
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index 2a1456c58..045357c22 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -1,26 +1,5 @@ <div id="registrations_new" class="col-lg-offset-4 col-lg-4"> - - <% if Rails.application.config.accept_user_creation %> - <div class="panel panel-default"> - <div class="panel-heading"><%= t("devise.registrations.new.title") %></div> - <div class="panel-body"> - <%= simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name), :wrapper => "form_without_label", html: {class: 'form-horizontal' } ) do |form| %> - <%= form.simple_fields_for :organisation, Organisation.new do |organisation| %> - <%= organisation.input :name, :label => false, input_html: { :class => "form-control" } %> - <% end %> - <% if resource.respond_to?( :name) %> - <%= form.input :name, :label => false, input_html: { :class => "form-control" } %> - <% end %> - <%= form.input :email, :label => false, input_html: { :class => "form-control" } %> - <%= form.input :password, :as => :password, :label => false, input_html: { :class => "form-control" } %> - <%= form.input :password_confirmation, :as => :password, :label => false, input_html: { :class => "form-control" } %> - - <%= form.button :submit, :class => "btn-primary" %> - <% end %> - </div> - </div> - <% end %> - +<%= render partial: 'devise/shared/form_registration', locals: { + organisation: (resource.organisation || Organisation.new) +} %> </div> - - diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 279eb3ca8..35b874e64 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -34,27 +34,8 @@ <% end %> </div> </div> - - <% if Rails.application.config.accept_user_creation %> - <div class="panel panel-default"> - <div class="panel-heading"><%= t("devise.registrations.new.title") %></div> - <div class="panel-body"> - <%= simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name), :wrapper => "form_without_label", html: { class: "form-horizontal registration_new" } ) do |form| %> - <%= form.simple_fields_for :organisation, Organisation.new do |organisation| %> - <%= organisation.input :name, :label => false, input_html: { :class => "form-control" } %> - <% end %> - <% if resource.respond_to?( :name) %> - <%= form.input :name, :label => false, input_html: { :class => "form-control" } %> - <% end %> - <%= form.input :email, :label => false, input_html: { :class => "form-control" } %> - <%= form.input :password, :as => :password, :label => false, input_html: { :class => "form-control" } %> - <%= form.input :password_confirmation, :as => :password, :label => false, input_html: { :class => "form-control" } %> - - <%= form.button :submit, t("devise.registrations.new.commit"), :class => "btn-info" %> - <% end %> - </div> - </div> - <% end %> + <%= render partial: 'devise/shared/form_registration', locals: { + organisation: (resource.organisation || Organisation.new) } %> </div> </div> diff --git a/app/views/devise/shared/_form_registration.html.erb b/app/views/devise/shared/_form_registration.html.erb new file mode 100644 index 000000000..4b66121d6 --- /dev/null +++ b/app/views/devise/shared/_form_registration.html.erb @@ -0,0 +1,17 @@ +<% if Rails.application.config.accept_user_creation %> + <div class="panel panel-default"> + <div class="panel-heading"><%= t("devise.registrations.new.title") %></div> + <div class="panel-body"> + <%= simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name), :wrapper => "form_without_label", html: { class: "form-horizontal registration_new" } ) do |form| %> + <%= form.simple_fields_for :organisation, organisation do |organisation| %> + <%= organisation.input :name, :label => false, input_html: { :class => "form-control" } %> + <% end %> + <%= form.input :name, :label => false, input_html: { :class => "form-control" } %> + <%= form.input :email, :label => false, input_html: { :class => "form-control" } %> + <%= form.input :password, :as => :password, :label => false, input_html: { :class => "form-control" } %> + <%= form.input :password_confirmation, :as => :password, :label => false, input_html: { :class => "form-control" } %> + <%= form.button :submit, t("devise.registrations.new.commit"), :class => "btn-info" %> + <% end %> + </div> + </div> +<% end %> |