| @@ -1,19 +1,32 @@ | ||
| 1 | -<h2>Sign up</h2> | |
| 1 | +<h2></h2> | |
| 2 | 2 |  | 
| 3 | -<%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> | |
| 4 | - <%= f.error_notification %> | |
| 3 | +<%= bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> | |
| 4 | + | |
| 5 | +<div class="span4 offset4 well" style=""> | |
| 6 | + <div class="login-panel panel panel-default"> | |
| 7 | + <div class="panel-heading"> | |
| 8 | + <h3 class="panel-title"><%= t 'registration.sign_up'%></h3> | |
| 9 | + </div> | |
| 10 | + <div class="panel-body"> | |
| 11 | + <form role="form"> | |
| 12 | + <%= f.alert_message "Please fix the errors below."%> | |
| 13 | + <div class="form-inputs"> | |
| 14 | + <%= f.text_field :first_name, label: (t 'registration.first_name'), required:true, autofocus: true, class: 'input-block-level' %> | |
| 15 | + <%= f.text_field :last_name, label: (t 'registration.last_name'), required:true, class: 'input-block-level' %> | |
| 16 | + <%= f.email_field :email, required: true, class: 'input-block-level' %> | |
| 17 | + <%= f.password_field :password, label: (t 'registration.password'), required: true, class: 'input-block-level' %> | |
| 18 | + <%= f.password_field :password_confirmation, label: (t 'registration.password_confirmation'), required: true, class: 'input-block-level' %> | |
| 19 | + </div> | |
| 20 | + <div class="form-group" style="margin-top: 15px;"> | |
| 21 | + <%= f.submit t 'registration.sign_up_submit' %> | |
| 22 | + <%= link_to (t 'registration.sign_in'), new_user_session_path, class: 'btn btn-link ' %> | |
| 23 | + </div> | |
| 24 | + </form> | |
| 25 | + </div> | |
| 26 | + </div> | |
| 27 | +</div> | |
| 5 | 28 |  | 
| 6 | - <div class="form-inputs"> | |
| 7 | - <%= f.input :first_name, required: true, autofocus: true %> | |
| 8 | - <%= f.input :last_name, required: true %> | |
| 9 | - <%= f.input :email, required: true %> | |
| 10 | - <%= f.input :password, required: true %> | |
| 11 | - <%= f.input :password_confirmation, required: true %> | |
| 12 | - </div> | |
| 13 | - | |
| 14 | - <div class="form-actions"> | |
| 15 | - <%= f.button :submit, "Sign up" %> | |
| 16 | - </div> | |
| 29 | + | |
| 17 | 30 | <% end %> | 
| 18 | 31 |  | 
| 19 | -<%= render "devise/shared/links" %> | |
| 32 | + | 
| @@ -1,15 +1,35 @@ | ||
| 1 | -<h2>Sign in</h2> | |
| 1 | +<%= bootstrap_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> | |
| 2 | +<div class="span4 offset4 well" style=""> | |
| 3 | + <div class="login-panel panel panel-default"> | |
| 4 | + <div class="panel-heading"> | |
| 5 | + <h3 class="panel-title"><%= t 'registration.sign_in' %></h3> | |
| 6 | + </div> | |
| 7 | + <div class="panel-body"> | |
| 8 | + <form role="form"> | |
| 9 | + <%= bootstrap_flash %> | |
| 10 | + <%= f.alert_message "Please fix the errors below."%> | |
| 11 | + <fieldset> | |
| 12 | + <%= f.email_field :email, required: true, autofocus: true, class: "input-block-level" %> | |
| 13 | + <div class="form-group"> | |
| 14 | + <%= f.password_field :password, label: (t 'registration.password'), required: true, class: "input-block-level" %> | |
| 15 | + </div> | |
| 16 | + <%= f.check_box :remember_me, as: :boolean, label: (t 'registration.remember_me') if devise_mapping.rememberable? %> | |
| 17 | + <!-- Change this to a button or input when using this as a form --> | |
| 18 | + <div class="form-group" style="margin-top: 25px;"> | |
| 19 | + <%= f.submit t 'registration.sign_in_submit' %> | |
| 20 | + <%= link_to (t 'registration.sign_up'), new_user_registration_path, class: 'btn btn-link ' %> | |
| 21 | + <%= link_to (t 'registration.forgot_password'), new_user_password_path, class: 'btn btn-link ' %> | |
| 22 | + | |
| 23 | + | |
| 24 | + </div> | |
| 25 | + <div class="form-group" style="margin-top: 10px;"> | |
| 26 | + | |
| 27 | + </div> | |
| 28 | + </fieldset> | |
| 29 | + </form> | |
| 30 | + </div> | |
| 31 | + </div> | |
| 32 | +</div> | |
| 2 | 33 |  | 
| 3 | -<%= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> | |
| 4 | - <div class="form-inputs"> | |
| 5 | - <%= f.input :email, required: false, autofocus: true %> | |
| 6 | - <%= f.input :password, required: false %> | |
| 7 | - <%= f.input :remember_me, as: :boolean if devise_mapping.rememberable? %> | |
| 8 | - </div> | |
| 9 | 34 |  | 
| 10 | - <div class="form-actions"> | |
| 11 | - <%= f.button :submit, "Sign in" %> | |
| 12 | - </div> | |
| 13 | -<% end %> | |
| 14 | - | |
| 15 | -<%= render "devise/shared/links" %> | |
| 35 | +<% end %> | 
| @@ -248,4 +248,15 @@ en: | ||
| 248 | 248 | message: Message | 
| 249 | 249 | send: Send | 
| 250 | 250 | error: Please correct the following errors | 
| 251 | - by: by | |
| 251 | + by: by | |
| 252 | + registration: | |
| 253 | + sign_in: Sign In | |
| 254 | + sign_up: Sign Up | |
| 255 | + first_name: First Name | |
| 256 | + last_name: Last Name | |
| 257 | + password: Password | |
| 258 | + password_confirmation: Password Confirmation | |
| 259 | + sign_up_submit: Submit | |
| 260 | + sign_in_submit: Submit | |
| 261 | + forgot_password: Forgot your password? | |
| 262 | + remember_me: Remember me | 
| @@ -250,4 +250,15 @@ pt-BR: | ||
| 250 | 250 | message: Mensagem | 
| 251 | 251 | send: Enviar | 
| 252 | 252 | error: Favor corrigir os erros abaixo | 
| 253 | - by: por | |
| 253 | + by: por | |
| 254 | + registration: | |
| 255 | + sign_in: Entrar | |
| 256 | + sign_up: Cadastro | |
| 257 | + first_name: Nome | |
| 258 | + last_name: Sobrenome | |
| 259 | + password: Senha | |
| 260 | + password_confirmation: Confirmar Senha | |
| 261 | + sign_up_submit: Enviar | |
| 262 | + sign_in_submit: Enviar | |
| 263 | + forgot_password: Esqueceu a senha? | |
| 264 | + remember_me: Lembrar Senha | 
| @@ -27,7 +27,6 @@ Other features are still under development: | ||
| 27 | 27 |  | 
| 28 | 28 | ## Todo's | 
| 29 | 29 |  | 
| 30 | -* Authentication layout | |
| 31 | 30 | * post form layout | 
| 32 | 31 | * edit account layout | 
| 33 | 32 | * make admin button |