Commit d39df3b8
Changed files (3)
app
views
devise
registrations
sessions
config
app/views/devise/registrations/new.html.erb
@@ -31,7 +31,7 @@
<%= f.password_field :password, :placeholder => 'Password', :class=> "input-medium" %>
<%= f.submit "Sign In", :class => "btn" %>
<br />
- <label for="checkbox" class="checkbox"><%= f.check_box :remember_me %> Remember me <%= link_to "Forgot it?", new_password_path(resource_name) %></label>
+ <label for="checkbox" class="checkbox"><%= f.check_box :remember_me %> Remember me <%= link_to "Forgot your password?", new_password_path(resource_name) %></label>
<% end %>
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :class=> 'form-horizontal' }) do |f| %>
<fieldset>
@@ -71,7 +71,6 @@
<%= f.submit "Sign up", :id => 'submit-registration', :class=> "btn btn-primary" %>
</div>
<% end %>
- <%= render :partial => "devise/shared/links" %>
</div>
</div>
</div>
app/views/devise/sessions/new.html.erb
@@ -1,5 +1,4 @@
<% content_for :head do %>
-<% end %>
<script type="text/javascript">
$(document).ready(function(){
$('#accepted').click(function(){
@@ -12,81 +11,67 @@
});
});
</script>
+<% end %>
<div class="row">
<div class="span12">
<div class="row">
- <div class="span7">
- <div class="logo"><img src="/assets/cakeside-logo.png" width="100%" alt="cakeside logo"/></div>
+ <div class="span6" style="background: url(/assets/sunset.png) no-repeat center 0px;opacity:0.8;">
+ <img src="/assets/cakeside-logo.png" alt="" />
+ <div style="padding-left:10px;padding-right:10px;">
+ <h3>Why CakeSide?</h3>
+ <p>CakeSide is a community dedicated to giving cake artists, bakers, creators, hobbyists, and of course cake lovers a place to share ideas and creations. Explore your creativity and find your inspiration. Resources shared here are all user driven.</p>
+ <h3>About Us</h3>
+ <p>We are a passionate team dedicated to improving the cake sharing experience. Frustrated with the lack of community that provides more than just photo sharing, CakeSide was born. All features of this site will be user inspired. We love to listen so feel free to give us <a href="http://cakeside.uservoice.com/" target="_blank">feedback</a>. Check back often to see what's new in the CakeSide community!</p>
+ </div>
</div>
- <div class="span5">
- <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
- <fieldset style="padding-top:118px;">
- <%= f.email_field :email, :placeholder => 'Email', :size => 20, :class=> "span2" %>
- <%= f.password_field :password, :placeholder => 'Password',:size => 20 , :class=> "span2" %>
- <%= f.submit "Sign In", :class => "btn" %><br />
- <%= f.check_box :remember_me %> Remember me
- <%= link_to "Forgot it?", new_password_path(resource_name) %>
- </fieldset>
+ <div class="span6">
+ <%= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :class => "well form-inline"}) do |f| %>
+ <legend>Got an account? Login!</legend>
+ <%= f.email_field :email, :placeholder => 'Email', :class=> "input-medium" %>
+ <%= f.password_field :password, :placeholder => 'Password', :class=> "input-medium" %>
+ <%= f.submit "Sign In", :class => "btn" %>
+ <br />
+ <label for="checkbox" class="checkbox"><%= f.check_box :remember_me %> Remember me <%= link_to "Forgot your password?", new_password_path(resource_name) %></label>
<% end %>
- </div>
- </div>
- <div class="row"> <div class="span12"> </div> </div>
- <div class="row"> <div class="span12"> </div> </div>
- <div class="row"> <div class="span12"> </div> </div>
- <div class="row">
- <div class="span7">
- <% if notice %><p class="alert-message alert-success"><%= notice %></p> <% end %>
- <% if alert %><p class="alert-message alert-error"><%= alert %></p><% end %>
- <%= devise_error_messages! %>
- <h3>Why CakeSide?</h3>
- <p>CakeSide is a community dedicated to giving cake artists, bakers, creators, hobbyists, and of course cake lovers a place to share ideas and creations. Explore your creativity and find your inspiration. Resources shared here are all user driven.</p>
- <h3>About Us</h3>
- <p>We are a passionate team dedicated to improving the cake sharing experience. Frustrated with the lack of community that provides more than just photo sharing, CakeSide was born. All features of this site will be user inspired. We love to listen so feel free to give us <a href="http://cakeside.uservoice.com/" target="_blank">feedback</a>. Check back often to see what's new in the CakeSide community!</p>
- </div>
- <div class="span5">
- <h3>New to CakeSide? <em>Join Us!</em></h3>
- <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
- <p><%= f.text_field :name, :placeholder => 'Full name', :class =>"xlarge"%></p>
- <p><%= f.email_field :email, :placeholder => 'Email', :class=> "xlarge"%></p>
- <p><%= f.password_field :password, :placeholder => 'Password', :class=> "xlarge"%></p>
- <p><%= f.password_field :password_confirmation, :placeholder => 'Confirm Password', :class=> "xlarge"%></p>
- <p><input id="accepted" name="accepted" type="checkbox" value="" checked="checked" /> I have read the <a href="/terms.html">terms and conditions</a> and the <a href="/privacy.html">privacy policy</a></p>
- <p><%= f.submit "Sign up", :style => "height:28px;", :class => "btn primary", :id => "submit-registration" %></p>
+ <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :class=> 'form-horizontal' }) do |f| %>
+ <fieldset>
+ <legend>New to CakeSide? Join Us!</legend>
+ </fieldset>
+ <div class="control-group">
+ <%= f.label :name, 'Full Name', :class => "control-label" %>
+ <div class="controls">
+ <%= f.text_field :name, :placeholder => 'Full Name' %>
+ </div>
+ </div>
+ <div class="control-group">
+ <%= f.label :email, 'Email', :class => "control-label" %>
+ <div class="controls">
+ <%= f.email_field :email, :placeholder => 'Email' %>
+ </div>
+ </div>
+ <div class="control-group">
+ <%= f.label :password, 'Password', :class => "control-label" %>
+ <div class="controls">
+ <%= f.password_field :password, :placeholder => 'Password' %>
+ </div>
+ </div>
+ <div class="control-group">
+ <%= f.label :password_confirmation, 'Password Confirmation', :class => "control-label" %>
+ <div class="controls">
+ <%= f.password_field :password_confirmation, :placeholder => 'Password Confirmation' %>
+ </div>
+ </div>
+ <div class="control-group">
+ <label for="accepted" class="control-label"></label>
+ <div class="controls">
+ <input id="accepted" name="accepted" type="checkbox" value="" checked="checked" /> I have read the <a href="/terms.html">terms and conditions</a> and the <a href="/privacy.html">privacy policy</a>
+ </div>
+ </div>
+ <div class="form-actions">
+ <%= f.submit "Sign up", :id => 'submit-registration', :class=> "btn btn-primary" %>
+ </div>
<% end %>
</div>
</div>
</div>
</div>
-<!--
-<h1>Sign in</h1>
-<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
- <fieldset>
- <legend>Example form legend</legend>
- <div class="clearfix">
- <%= f.label :email %>
- <div class="input">
- <%= f.email_field :email, :class => "xlarge" %>
- </div>
- </div>
- <div class="clearfix">
- <%= f.label :password %>
- <div class="input">
- <%= f.password_field :password, :class => "xlarge" %></p>
- </div>
- </div>
-
- <% if devise_mapping.rememberable? -%>
- <div class="clearfix">
- <label>
- <%= f.check_box :remember_me %>
- <span>Remember me</span>
- </label>
- </div>
- <% end -%>
- <div class="actions">
- <input type="submit" class="btn primary" value="Sign in"> <button type="reset" class="btn">Cancel</button>
- </div>
- </fieldset>
-<% end %>
-<%= render :partial => "devise/shared/links" %>
--->
config/application.rb
@@ -46,7 +46,7 @@ module Cake
config.assets.version = '1.0'
config.to_prepare {
- Devise::SessionsController.layout "blank"
+ Devise::SessionsController.layout "application"
# Devise::RegistrationsController.layout proc{ |controller| user_signed_in? ? "application" : "users" }
Devise::ConfirmationsController.layout "application"
Devise::UnlocksController.layout "application"