Download as
Browse Code »

Commit 0dc5364aecc11158d72465231944267f243bab79

Authored by gitlabhq
1 parent 5d879a06
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

reset pwd

Showing 2 changed files with 10 additions and 17 deletions   Show diff stats
app/views/devise/passwords/new.html.erb
  Diff comments   View file @0dc5364
1   -<h2>Forgot your password?</h2>
2   -
3   -<div class="span-12 colborder">
4   - <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
5   - <%= devise_error_messages! %>
6   -
7   - <div><%= f.label :email %><br />
8   - <%= f.email_field :email %></div>
9   -
10   - <div><%= f.submit "Send me reset password instructions", :class => "lbutton vm" %></div>
11   - <% end %>
12   -</div>
13   -<div>
14   - <%= render :partial => "devise/shared/links" %>
15   -</div>
  1 +<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :class => "login-box", :method => :post }) do |f| %>
  2 + <%= image_tag "login-logo.png", :width => "304", :height => "66", :class => "login-logo", :alt => "Login Logo" %>
  3 + <%= devise_error_messages! %>
  4 + <%= f.email_field :email, :placeholder => "Email", :class => "text top" %>
  5 + <br/>
  6 + <%= f.submit "Reset password", :class => "grey-button" %>
  7 + <div class="right"> <%= render :partial => "devise/shared/links" %></div>
  8 +<% end %>
... ...
app/views/devise/sessions/new.html.erb
  Diff comments   View file @0dc5364
1 1 <%= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :class => "login-box" }) do |f| %>
2 2 <%= image_tag "login-logo.png", :width => "304", :height => "66", :class => "login-logo", :alt => "Login Logo" %>
3   - <%= f.text_field :email, :class => "text top" %>
4   - <%= f.password_field :password, :class => "text bottom" %>
  3 + <%= f.text_field :email, :class => "text top", :placeholder => "Email" %>
  4 + <%= f.password_field :password, :class => "text bottom", :placeholder => "Password" %>
5 5  
6 6 <% if devise_mapping.rememberable? -%>
7 7 <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
... ...