fixed forgot password form

This commit is contained in:
Dmitriy Zaporozhets 2012-02-20 20:37:37 +02:00
parent 22f4c1908d
commit 6a445b4200
4 changed files with 21 additions and 27 deletions

View file

@ -1,16 +0,0 @@
<h2>Change your password</h2>
<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
<%= devise_error_messages! %>
<%= f.hidden_field :reset_password_token %>
<div><%= f.label :password, "New password" %><br />
<%= f.password_field :password %></div>
<div><%= f.label :password_confirmation, "Confirm new password" %><br />
<%= f.password_field :password_confirmation %></div>
<div><%= f.submit "Change my password" %></div>
<% end %>
<%= render :partial => "devise/shared/links" %>

View file

@ -0,0 +1,12 @@
= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put, :class => "login-box" }) do |f|
= image_tag "login-logo.png", :width => "304", :height => "66", :class => "login-logo", :alt => "Login Logo"
%h3 Change your password
= devise_error_messages!
= f.hidden_field :reset_password_token
%div
= f.password_field :password, :class => "text top", :placeholder => "New password"
%div
= f.password_field :password_confirmation, :class => "text bottom", :placeholder => "Confirm new password"
%div
= f.submit "Change my password", :class => "btn primary"
.right= render :partial => "devise/shared/links"

View file

@ -1,7 +1,8 @@
<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :class => "login-box", :method => :post }) do |f| %> <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :class => "login-box", :method => :post }) do |f| %>
<%= image_tag "login-logo.png", :width => "304", :height => "66", :class => "login-logo", :alt => "Login Logo" %> <%= image_tag "login-logo.png", :width => "304", :height => "66", :class => "login-logo", :alt => "Login Logo" %>
<%= devise_error_messages! %> <%= devise_error_messages! %>
<%= f.email_field :email, :placeholder => "Email", :class => "text top" %> <%= f.email_field :email, :placeholder => "Email", :class => "text" %>
<br/>
<br/> <br/>
<%= f.submit "Reset password", :class => "primary btn" %> <%= f.submit "Reset password", :class => "primary btn" %>
<div class="right"> <%= render :partial => "devise/shared/links" %></div> <div class="right"> <%= render :partial => "devise/shared/links" %></div>

View file

@ -16,16 +16,13 @@
%li{ :class => " #{'active' if (controller.controller_name == "snippets") }" } %li{ :class => " #{'active' if (controller.controller_name == "snippets") }" }
= link_to project_snippets_path(@project), :class => "snippets-tab tab" do = link_to project_snippets_path(@project), :class => "snippets-tab tab" do
Snippets Snippets
-#%li{:class => "#{'active' if current_page?(project_repository_path(@project)) }"}
-#= link_to project_repository_path(@project) do - if can? current_user, :admin_project, @project
-#%span
-#Activities
%li{:class => "#{'active' if controller.controller_name == "hooks" }"} %li{:class => "#{'active' if controller.controller_name == "hooks" }"}
= link_to project_hooks_path(@project) do = link_to project_hooks_path(@project) do
%span %span
Hooks Hooks
%li{:class => "#{'active' if controller.controller_name == "deploy_keys"}"} %li{:class => "#{'active' if controller.controller_name == "deploy_keys"}"}
- if can? current_user, :admin_project, @project
= link_to project_deploy_keys_path(@project) do = link_to project_deploy_keys_path(@project) do
%span %span
Deploy Keys Deploy Keys