login page
This commit is contained in:
parent
5be5d82eb7
commit
08d6a46bd8
4 changed files with 25 additions and 12 deletions
|
|
@ -3,6 +3,16 @@ class ApplicationController < ActionController::Base
|
||||||
layout 'application'
|
layout 'application'
|
||||||
before_filter :set_friends
|
before_filter :set_friends
|
||||||
|
|
||||||
|
layout :layout_by_resource
|
||||||
|
|
||||||
|
def layout_by_resource
|
||||||
|
if devise_controller?
|
||||||
|
"session_wall"
|
||||||
|
else
|
||||||
|
"application"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def set_friends
|
def set_friends
|
||||||
@friends = Friend.all
|
@friends = Friend.all
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,11 @@
|
||||||
%div.centered
|
= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
|
||||||
|
%p
|
||||||
= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
|
|
||||||
= f.text_field :email
|
|
||||||
%br
|
|
||||||
= f.password_field :password
|
= f.password_field :password
|
||||||
%p
|
%p
|
||||||
- if devise_mapping.rememberable?
|
- if devise_mapping.rememberable?
|
||||||
= f.check_box :remember_me
|
/= f.check_box :remember_me
|
||||||
= f.label :remember_me
|
/= f.label :remember_me
|
||||||
|
|
||||||
|
= hidden_field_tag "user_email", "#{User.first.email}", :name => "user[email]"
|
||||||
= f.submit "Sign in"
|
= f.submit "Sign in"
|
||||||
= render :partial => "devise/shared/links"
|
/= render :partial => "devise/shared/links"
|
||||||
|
|
|
||||||
|
|
@ -127,7 +127,7 @@ ul#stream {
|
||||||
|
|
||||||
li.message {
|
li.message {
|
||||||
line-height: 140%;
|
line-height: 140%;
|
||||||
font-family: "Lucida Grande";
|
font-family: "Lucida Grande", "sans-serif";
|
||||||
color: #999999; }
|
color: #999999; }
|
||||||
li.message span.from {
|
li.message span.from {
|
||||||
color: black;
|
color: black;
|
||||||
|
|
|
||||||
|
|
@ -239,3 +239,7 @@ ul.comment_set
|
||||||
|
|
||||||
img#profile_picture
|
img#profile_picture
|
||||||
:width 100%
|
:width 100%
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue