Registration layouts: edit user profile, forgot password and password reset
8 changed files with 158 additions and 103 deletions
+ 5
- 5
app/views/blog_posts/_form.html.erb
@@ -37,11 +37,11 @@ |
||
| 37 | 37 |
|
| 38 | 38 |
<%= f.text_area :content, label: (t 'blog.content'), class: 'summernote', id: 'post_content', hide_label: :true %> |
| 39 | 39 |
</div> |
| 40 |
- <div class="form-actions" style="margin: 0px;"> |
|
| 41 |
- <%= f.submit (t 'blog.submit'), class: 'btn btn-success' %> |
|
| 42 |
- <%= link_to 'Show', @blog_post, class: 'btn' if action_name == 'edit' %> |
|
| 43 |
- <%= link_to (t 'blog.back'), admin_posts_path, class: 'btn btn-link' %> |
|
| 44 |
- </div> |
|
| 40 |
+ <div class="form-actions" style="margin: 0px;"> |
|
| 41 |
+ <%= f.submit (t 'blog.submit'), class: 'btn btn-success' %> |
|
| 42 |
+ <%= link_to 'Show', @blog_post, class: 'btn' if action_name == 'edit' %> |
|
| 43 |
+ <%= link_to (t 'blog.back'), admin_posts_path, class: 'btn btn-link' %> |
|
| 44 |
+ </div> |
|
| 45 | 45 |
|
| 46 | 46 |
<% end %> |
| 47 | 47 |
</div> |
+ 23
- 19
app/views/devise/passwords/edit.html.erb
@@ -1,19 +1,23 @@ |
||
| 1 |
-<h2>Change your password</h2> |
|
| 2 |
- |
|
| 3 |
-<%= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
|
|
| 4 |
- <%= f.error_notification %> |
|
| 5 |
- |
|
| 6 |
- <%= f.input :reset_password_token, as: :hidden %> |
|
| 7 |
- <%= f.full_error :reset_password_token %> |
|
| 8 |
- |
|
| 9 |
- <div class="form-inputs"> |
|
| 10 |
- <%= f.input :password, label: "New password", required: true, autofocus: true %> |
|
| 11 |
- <%= f.input :password_confirmation, label: "Confirm your new password", required: true %> |
|
| 12 |
- </div> |
|
| 13 |
- |
|
| 14 |
- <div class="form-actions"> |
|
| 15 |
- <%= f.button :submit, "Change my password" %> |
|
| 16 |
- </div> |
|
| 17 |
-<% end %> |
|
| 18 |
- |
|
| 19 |
-<%= render "devise/shared/links" %> |
|
| 1 |
+<%= bootstrap_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) 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.change_your_password' %></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 |
+ <%= f.hidden_field :reset_password_token %> |
|
| 12 |
+ <fieldset> |
|
| 13 |
+ <%= f.password_field :password, label: (t 'registration.new_password'), required: true, autofocus: true, class: "input-block-level" %> |
|
| 14 |
+ <%= f.password_field :password_confirmation, label: (t 'registration.confirm_your_new_password'), required: true, class: "input-block-level" %> |
|
| 15 |
+ <div class="form-group" style="margin-top: 25px;"> |
|
| 16 |
+ <%= f.submit t 'registration.change_password' %> |
|
| 17 |
+ </div> |
|
| 18 |
+ </fieldset> |
|
| 19 |
+ </form> |
|
| 20 |
+ </div> |
|
| 21 |
+ </div> |
|
| 22 |
+ </div> |
|
| 23 |
+<% end %> |
+ 22
- 15
app/views/devise/passwords/new.html.erb
@@ -1,15 +1,22 @@ |
||
| 1 |
-<h2>Forgot your password?</h2> |
|
| 2 |
- |
|
| 3 |
-<%= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
|
|
| 4 |
- <%= f.error_notification %> |
|
| 5 |
- |
|
| 6 |
- <div class="form-inputs"> |
|
| 7 |
- <%= f.input :email, required: true, autofocus: true %> |
|
| 8 |
- </div> |
|
| 9 |
- |
|
| 10 |
- <div class="form-actions"> |
|
| 11 |
- <%= f.button :submit, "Send me reset password instructions" %> |
|
| 12 |
- </div> |
|
| 13 |
-<% end %> |
|
| 14 |
- |
|
| 15 |
-<%= render "devise/shared/links" %> |
|
| 1 |
+<%= bootstrap_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) 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.forgot_password' %></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" style="margin-top: 25px;"> |
|
| 14 |
+ <%= f.submit t 'registration.reset_password_submit' %> |
|
| 15 |
+ <%= link_to (t 'nav.back'), new_user_session_path, class: 'btn btn-link ' %> |
|
| 16 |
+ </div> |
|
| 17 |
+ </fieldset> |
|
| 18 |
+ </form> |
|
| 19 |
+ </div> |
|
| 20 |
+ </div> |
|
| 21 |
+ </div> |
|
| 22 |
+<% end %> |
+ 55
- 27
app/views/devise/registrations/edit.html.erb
@@ -1,30 +1,58 @@ |
||
| 1 |
-<h2>Edit <%= resource_name.to_s.humanize %></h2> |
|
| 2 |
- |
|
| 3 |
-<%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
|
|
| 4 |
- <%= f.error_notification %> |
|
| 5 |
- |
|
| 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.file_field :avatar %> |
|
| 11 |
- |
|
| 12 |
- <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %> |
|
| 13 |
- <p>Currently waiting confirmation for: <%= resource.unconfirmed_email %></p> |
|
| 14 |
- <% end %> |
|
| 15 |
- |
|
| 16 |
- <%= f.input :password, autocomplete: "off", hint: "leave it blank if you don't want to change it", required: false %> |
|
| 17 |
- <%= f.input :password_confirmation, required: false %> |
|
| 18 |
- <%= f.input :current_password, hint: "we need your current password to confirm your changes", required: false %> |
|
| 19 |
- </div> |
|
| 20 |
- |
|
| 21 |
- <div class="form-actions"> |
|
| 22 |
- <%= f.button :submit, "Update" %> |
|
| 23 |
- </div> |
|
| 1 |
+<%= bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
|
|
| 2 |
+ <div class="span6 offset3 media thumbnail" style="padding: 0px"> |
|
| 3 |
+ <div class="login-panel panel panel-default" style="padding: 10px;"> |
|
| 4 |
+ <div class="panel-heading"> |
|
| 5 |
+ <h3 class="panel-title"><%= t 'registration.edit_profile'%></h3> |
|
| 6 |
+ </div> |
|
| 7 |
+ <div class="panel-body"> |
|
| 8 |
+ <%= f.alert_message "Please fix the errors below."%> |
|
| 9 |
+ <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %> |
|
| 10 |
+ <p>Currently waiting confirmation for: <%= resource.unconfirmed_email %></p> |
|
| 11 |
+ <% end %> |
|
| 12 |
+ <div class="form-inputs"> |
|
| 13 |
+ |
|
| 14 |
+ <div class="fileupload fileupload-new pull-right" data-provides="fileupload" style="margin-top: 5px;"> |
|
| 15 |
+ <div class="fileupload-preview thumbnail" data-trigger="fileinput" style="width: 140px; height: 140px;"> |
|
| 16 |
+ <%= image_tag resource.avatar.to_s if resource.avatar? %> |
|
| 17 |
+ </div> |
|
| 18 |
+ <br> |
|
| 19 |
+ <span class="btn btn-default btn-file btn-mini" style="width: 135px;"> |
|
| 20 |
+ <span class="fileinput-new"></span> |
|
| 21 |
+ <span class="fileinput-exists"></span> |
|
| 22 |
+ <%= f.file_field :image, class: 'hidden', label: (t 'blog.select_image') %> |
|
| 23 |
+ </span> |
|
| 24 |
+ </div> |
|
| 25 |
+ |
|
| 26 |
+ <%= f.text_field :first_name, label: (t 'registration.first_name'), required:true, autofocus: true, class: 'span4' %> |
|
| 27 |
+ <%= f.text_field :last_name, label: (t 'registration.last_name'), required:true, class: 'span4' %> |
|
| 28 |
+ <%= f.email_field :email, required: true, class: 'span4' %> |
|
| 29 |
+ </div> |
|
| 30 |
+ <hr> |
|
| 31 |
+ <div class="form-inputs"> |
|
| 32 |
+ <%= f.form_group :title, class: "pull-left", style: 'margin-left: 0px; width: 30%;' do %> |
|
| 33 |
+ <%= f.password_field :password, label: (t 'registration.password'), required: true, class: 'input-block-level' %> |
|
| 34 |
+ <% end %> |
|
| 35 |
+ <%= f.form_group :slug, class: "pull-left", style: 'margin-left: 27px; width: 30%;' do %> |
|
| 36 |
+ <%= f.password_field :password_confirmation, label: (t 'registration.password_confirmation'), required: true, class: 'input-block-level' %> |
|
| 37 |
+ <% end %> |
|
| 38 |
+ <%= f.form_group :slug, class: "pull-left", style: 'margin-left: 27px; width: 30%;' do %> |
|
| 39 |
+ <%= f.password_field :current_password, label: (t 'registration.current_password'), required: true, class: 'input-block-level' %> |
|
| 40 |
+ <% end %> |
|
| 41 |
+ </div> |
|
| 42 |
+ |
|
| 43 |
+ |
|
| 44 |
+ |
|
| 45 |
+ </div> |
|
| 46 |
+ <div class="clearfix"></div> |
|
| 47 |
+ </div> |
|
| 48 |
+ <div class="form-actions" style="margin: 0px; margin-top: 15px;"> |
|
| 49 |
+ <%= f.submit t 'registration.update' %> |
|
| 50 |
+ <%= link_to (t 'nav.back'), :back, class: 'btn btn-link' %> |
|
| 51 |
+ <%= link_to (t 'registration.cancel_account'), registration_path(resource_name), data: { confirm: (t 'registration.cancel_confirmation') }, method: :delete, class: 'btn btn-danger btn-mini pull-right' %>
|
|
| 52 |
+ </div> |
|
| 53 |
+ </div> |
|
| 54 |
+ </div> |
|
| 55 |
+ </div> |
|
| 24 | 56 |
<% end %> |
| 25 | 57 |
|
| 26 |
-<h3>Cancel my account</h3> |
|
| 27 |
- |
|
| 28 |
-<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %></p>
|
|
| 29 | 58 |
|
| 30 |
-<%= link_to "Back", :back %> |
+ 24
- 29
app/views/devise/registrations/new.html.erb
@@ -1,32 +1,27 @@ |
||
| 1 |
-<h2></h2> |
|
| 2 |
- |
|
| 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> |
|
| 28 |
- |
|
| 29 |
- |
|
| 1 |
+<%= bootstrap_form_for(resource, as: resource_name, url: registration_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_up'%></h3> |
|
| 6 |
+ </div> |
|
| 7 |
+ <div class="panel-body"> |
|
| 8 |
+ <form role="form"> |
|
| 9 |
+ <%= f.alert_message "Please fix the errors below."%> |
|
| 10 |
+ <div class="form-inputs"> |
|
| 11 |
+ <%= f.text_field :first_name, label: (t 'registration.first_name'), required:true, autofocus: true, class: 'input-block-level' %> |
|
| 12 |
+ <%= f.text_field :last_name, label: (t 'registration.last_name'), required:true, class: 'input-block-level' %> |
|
| 13 |
+ <%= f.email_field :email, required: true, class: 'input-block-level' %> |
|
| 14 |
+ <%= f.password_field :password, label: (t 'registration.password'), required: true, class: 'input-block-level' %> |
|
| 15 |
+ <%= f.password_field :password_confirmation, label: (t 'registration.password_confirmation'), required: true, class: 'input-block-level' %> |
|
| 16 |
+ </div> |
|
| 17 |
+ <div class="form-group" style="margin-top: 15px;"> |
|
| 18 |
+ <%= f.submit t 'registration.sign_up_submit' %> |
|
| 19 |
+ <%= link_to (t 'registration.sign_in'), new_user_session_path, class: 'btn btn-link ' %> |
|
| 20 |
+ </div> |
|
| 21 |
+ </form> |
|
| 22 |
+ </div> |
|
| 23 |
+ </div> |
|
| 24 |
+ </div> |
|
| 30 | 25 |
<% end %> |
| 31 | 26 |
|
| 32 | 27 |
|
+ 7
- 1
config/locales/en.yml
@@ -283,4 +283,10 @@ en: |
||
| 283 | 283 |
sign_up_submit: Submit |
| 284 | 284 |
sign_in_submit: Submit |
| 285 | 285 |
forgot_password: Forgot your password? |
| 286 |
- remember_me: Remember me |
|
| 286 |
+ remember_me: Remember me |
|
| 287 |
+ reset_password_submit: Reset Password |
|
| 288 |
+ change_your_password: Change your password |
|
| 289 |
+ new_password: New Password |
|
| 290 |
+ confirm_your_new_password: Confirm New Password |
|
| 291 |
+ change_password: Save Password |
|
| 292 |
+ edit_password: Edit password |
+ 12
- 1
config/locales/pt-BR.yml
@@ -285,4 +285,15 @@ pt-BR: |
||
| 285 | 285 |
sign_up_submit: Enviar |
| 286 | 286 |
sign_in_submit: Enviar |
| 287 | 287 |
forgot_password: Esqueceu a senha? |
| 288 |
- remember_me: Lembrar Senha |
|
| 288 |
+ remember_me: Lembrar Senha |
|
| 289 |
+ reset_password_submit: Resetar Senha |
|
| 290 |
+ change_your_password: Criar nova senha |
|
| 291 |
+ new_password: Nova Senha |
|
| 292 |
+ confirm_your_new_password: Confirmar Nova Senha |
|
| 293 |
+ change_password: Salvar Senha |
|
| 294 |
+ edit_profile: Editar Informações de Registro |
|
| 295 |
+ current_password: Senha Atual |
|
| 296 |
+ update: Atualizar |
|
| 297 |
+ cancel_account: Cancelar Conta |
|
| 298 |
+ cancel_confirmation: Você tem certeza que deseja cancelar sua conta? |
|
| 299 |
+ edit_password: Editar senha |
+ 10
- 6
readme.md
@@ -17,7 +17,7 @@ Other features are still under development: |
||
| 17 | 17 |
|
| 18 | 18 |
- Log |
| 19 | 19 |
- Tests |
| 20 |
- |
|
| 20 |
+- Background processing (redis) |
|
| 21 | 21 |
|
| 22 | 22 |
* Search System |
| 23 | 23 |
* Wiki/Codex |
@@ -26,15 +26,19 @@ Other features are still under development: |
||
| 26 | 26 |
- Inventory |
| 27 | 27 |
- Module Controller |
| 28 | 28 |
- geo location/maps |
| 29 |
- |
|
| 29 |
+- Help |
|
| 30 | 30 |
|
| 31 | 31 |
## Todo's |
| 32 | 32 |
|
| 33 |
-* edit account layout |
|
| 34 |
-* contact message layout |
|
| 35 |
-* devise forgot pasword layout |
|
| 36 |
-* devise change password layout |
|
| 33 |
+* Dashboard Contact_Messege Count / new messages |
|
| 34 |
+* fix admin panel navbar |
|
| 35 |
+ |
|
| 36 |
+ |
|
| 37 |
+* new admin email |
|
| 38 |
+* Invite user/admin |
|
| 39 |
+* admin panel tour |
|
| 37 | 40 |
|
| 41 |
+* rewrite readme file |
|
| 38 | 42 |
* Install instructions |
| 39 | 43 |
* Heroku Deploy button |
| 40 | 44 |
|