Download as
Browse Code »

Commit 6a445b42003007cbb6c06f477c4d7a0b175688c1

Authored by Dmitriy Zaporozhets
1 parent 22f4c190
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

fixed forgot password form

Showing 4 changed files with 21 additions and 27 deletions   Show diff stats
app/views/devise/passwords/edit.html.erb
View file @22f4c19
... ... @@ -1,16 +0,0 @@
1   -<h2>Change your password</h2>
2   -
3   -<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
4   - <%= devise_error_messages! %>
5   - <%= f.hidden_field :reset_password_token %>
6   -
7   - <div><%= f.label :password, "New password" %><br />
8   - <%= f.password_field :password %></div>
9   -
10   - <div><%= f.label :password_confirmation, "Confirm new password" %><br />
11   - <%= f.password_field :password_confirmation %></div>
12   -
13   - <div><%= f.submit "Change my password" %></div>
14   -<% end %>
15   -
16   -<%= render :partial => "devise/shared/links" %>
app/views/devise/passwords/edit.html.haml 0 → 100644
  Diff comments   View file @6a445b4
... ... @@ -0,0 +1,12 @@
  1 += form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put, :class => "login-box" }) do |f|
  2 + = image_tag "login-logo.png", :width => "304", :height => "66", :class => "login-logo", :alt => "Login Logo"
  3 + %h3 Change your password
  4 + = devise_error_messages!
  5 + = f.hidden_field :reset_password_token
  6 + %div
  7 + = f.password_field :password, :class => "text top", :placeholder => "New password"
  8 + %div
  9 + = f.password_field :password_confirmation, :class => "text bottom", :placeholder => "Confirm new password"
  10 + %div
  11 + = f.submit "Change my password", :class => "btn primary"
  12 + .right= render :partial => "devise/shared/links"
... ...
app/views/devise/passwords/new.html.erb
  Diff comments   View file @6a445b4
1 1 <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :class => "login-box", :method => :post }) do |f| %>
2 2 <%= image_tag "login-logo.png", :width => "304", :height => "66", :class => "login-logo", :alt => "Login Logo" %>
3 3 <%= devise_error_messages! %>
4   - <%= f.email_field :email, :placeholder => "Email", :class => "text top" %>
  4 + <%= f.email_field :email, :placeholder => "Email", :class => "text" %>
  5 + <br/>
5 6 <br/>
6 7 <%= f.submit "Reset password", :class => "primary btn" %>
7 8 <div class="right"> <%= render :partial => "devise/shared/links" %></div>
... ...
app/views/projects/_project_head.html.haml
  Diff comments   View file @6a445b4
... ... @@ -16,16 +16,13 @@
16 16 %li{ :class => " #{'active' if (controller.controller_name == "snippets") }" }
17 17 = link_to project_snippets_path(@project), :class => "snippets-tab tab" do
18 18 Snippets
19   - -#%li{:class => "#{'active' if current_page?(project_repository_path(@project)) }"}
20   - -#= link_to project_repository_path(@project) do
21   - -#%span
22   - -#Activities
23   - %li{:class => "#{'active' if controller.controller_name == "hooks" }"}
24   - = link_to project_hooks_path(@project) do
25   - %span
26   - Hooks
27   - %li{:class => "#{'active' if controller.controller_name == "deploy_keys"}"}
28   - - if can? current_user, :admin_project, @project
  19 +
  20 + - if can? current_user, :admin_project, @project
  21 + %li{:class => "#{'active' if controller.controller_name == "hooks" }"}
  22 + = link_to project_hooks_path(@project) do
  23 + %span
  24 + Hooks
  25 + %li{:class => "#{'active' if controller.controller_name == "deploy_keys"}"}
29 26 = link_to project_deploy_keys_path(@project) do
30 27 %span
31 28 Deploy Keys
... ...