login page

This commit is contained in:
danielvincent 2010-06-28 22:18:05 -07:00
parent 5be5d82eb7
commit 08d6a46bd8
4 changed files with 25 additions and 12 deletions

View file

@ -2,6 +2,16 @@ class ApplicationController < ActionController::Base
protect_from_forgery :except => :receive
layout 'application'
before_filter :set_friends
layout :layout_by_resource
def layout_by_resource
if devise_controller?
"session_wall"
else
"application"
end
end
def set_friends
@friends = Friend.all

View file

@ -1,12 +1,11 @@
%div.centered
= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
= f.text_field :email
%br
= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
%p
= f.password_field :password
%p
- if devise_mapping.rememberable?
= f.check_box :remember_me
= f.label :remember_me
= f.submit "Sign in"
= render :partial => "devise/shared/links"
%p
- if devise_mapping.rememberable?
/= f.check_box :remember_me
/= f.label :remember_me
= hidden_field_tag "user_email", "#{User.first.email}", :name => "user[email]"
= f.submit "Sign in"
/= render :partial => "devise/shared/links"

View file

@ -127,7 +127,7 @@ ul#stream {
li.message {
line-height: 140%;
font-family: "Lucida Grande";
font-family: "Lucida Grande", "sans-serif";
color: #999999; }
li.message span.from {
color: black;

View file

@ -239,3 +239,7 @@ ul.comment_set
img#profile_picture
:width 100%