mirror of
				https://github.com/fspc/BikeShed-1.git
				synced 2025-10-31 08:55:36 -04:00 
			
		
		
		
	Updated Forget Password, other minor changes
This commit is contained in:
		
							parent
							
								
									a35bd2f22b
								
							
						
					
					
						commit
						2b863b8d8a
					
				| @ -1,31 +1,28 @@ | ||||
| <%- if controller_name != 'sessions' %> | ||||
|   <p> | ||||
|   <%= link_to "Sign in", new_session_path(resource_name), class: "btn btn-block" %><br /> | ||||
|   <%= link_to "Sign in", new_session_path(resource_name), class: "btn btn-block btn-default" %><br /> | ||||
|   </p> | ||||
| <% end -%> | ||||
| 
 | ||||
| <%- if devise_mapping.registerable? && controller_name != 'registrations' %> | ||||
|   <p> | ||||
|   <%= link_to "Sign up", new_registration_path(resource_name), class: "btn btn-block" %><br /> | ||||
|   <%= link_to "Sign up", new_registration_path(resource_name), class: "btn btn-block btn-default" %><br /> | ||||
|   </p> | ||||
| <% end -%> | ||||
| 
 | ||||
| <%- if devise_mapping.recoverable? && controller_name != 'passwords' %> | ||||
|   <p> | ||||
|   <%= link_to "Forgot your password?", new_password_path(resource_name), class: "btn btn-block" %><br /> | ||||
|   <%= link_to "Forgot your password?", new_password_path(resource_name), class: "btn btn-block btn-default" %><br /> | ||||
|   </p> | ||||
| <% end -%> | ||||
| 
 | ||||
| <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> | ||||
|   <p> | ||||
|   <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name), class: "btn btn-block" %><br /> | ||||
|   <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name), class: "btn btn-block btn-default" %><br /> | ||||
|   </p> | ||||
| <% end -%> | ||||
| 
 | ||||
| <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> | ||||
|   <p> | ||||
|   <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name), class: "btn btn-block" %><br /> | ||||
|   </p> | ||||
| <% end -%> | ||||
| 
 | ||||
| <%- if devise_mapping.omniauthable? %> | ||||
|  | ||||
| @ -1,12 +1,16 @@ | ||||
| <h2>Forgot your password?</h2> | ||||
| <%= stylesheet_link_tag "bootstrap_and_overrides", :media => "all" %> | ||||
| 
 | ||||
| <h2>Forgot your password?</h2> | ||||
| <br> | ||||
| <br> | ||||
| <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %> | ||||
|   <%= devise_error_messages! %> | ||||
| 
 | ||||
|   <div><%= f.label :email %><br /> | ||||
|   <%= f.email_field :email %></div> | ||||
|   <div class="form-group"> | ||||
|     <%= f.email_field :email, placeholder: "Email", class: "form-control input-lg" %> | ||||
|   </div> | ||||
| 
 | ||||
|   <div><%= f.submit "Send me reset password instructions" %></div> | ||||
|   <div><%= f.submit "Reset Password", class:"btn btn-lg btn-primary"%></div> | ||||
| <% end %> | ||||
| 
 | ||||
| <%= render "links" %> | ||||
|  | ||||
| @ -3,7 +3,6 @@ | ||||
|   %head | ||||
|     %meta{:charset => "utf-8"}/ | ||||
|     %title= content_for?(:title) ? yield(:title) : "Velocipede" | ||||
|     = load_netzke | ||||
|     = csrf_meta_tags | ||||
|     /[if lt IE 9] | ||||
|       = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js" | ||||
| @ -24,11 +23,11 @@ | ||||
|         - if flash[:alert] | ||||
|           %p{:class => 'alert'}= flash[:alert] | ||||
|         .row | ||||
|           .span13 | ||||
|           .span12 | ||||
|             = yield | ||||
| 
 | ||||
|       %footer | ||||
|         %p © Velocipede 2013 | ||||
|         %p © BikeShed 2014 | ||||
| 
 | ||||
|     = javascript_include_tag "application" | ||||
|     = javascript_include_tag params[:controller]  | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user