Commit bd30a30f0f007d01a6a1d2e328a6ea6e5c131cb9 to insoshi's insoshi

insoshi / insoshi

Description:	The open source social networking platform in Ruby on Rails from the author of RailsSpace
Homepage:	http://insoshi.com
Clone URL:	git://github.com/insoshi/insoshi.git Give this clone URL to anyone. `git clone git://github.com/insoshi/insoshi.git`
Search Repo:

Login

Michael Hartl (author)

Mon Apr 21 17:38:24 -0700 2008

commit bd30a30f0f007d01a6a1d2e328a6ea6e5c131cb9
tree 345e6e54296b3ec71bcbb59c44181ab31ff0c5a8
parent 6cae89a98262c48efc0778ff23921c784e433354

app/controllers/sessions_controller.rb
app/views/layouts/application.html.erb
app/views/password_reminders/new.html.erb
app/views/sessions/new.html.erb

app/controllers/sessions_controller.rb

0
@@ -4,6 +4,7 @@ class SessionsController < ApplicationController
0
   skip_before_filter :require_activation, :only => [:new, :destroy]
0
 
0
   def new
0
+    @body = "login single-col"
0
   end
0
 
0
   def create
0
@@ -21,7 +22,8 @@ class SessionsController < ApplicationController
0
       redirect_back_or_default('/')
0
       flash[:success] = "Logged in successfully"
0
     else
0
-      flash[:error] = "Invalid email/password combination"
0
+      @body = "login single-col"
0
+      flash.now[:error] = "Invalid email/password combination"
0
       params[:password] = nil      
0
       render :action => 'new'
0
     end

app/views/layouts/application.html.erb

0
@@ -5,6 +5,7 @@
0
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
0
     <title>Insoshi Social Software - Open Source Social Network</title>
0
     <%= stylesheet_link_tag "default" %>
0
+    <%= javascript_include_tag :defaults %>
0
   </head>
0
   <body class="<%= @body %>">
0
     <div id="header-wrap">

app/views/password_reminders/new.html.erb

0
@@ -1,4 +1,4 @@
0
-<h1>Password reminder</h1>
0
+<h2>Password reminder</h2>
0
 
0
 <% form_for :person, :url => password_reminders_path do |form| %>
0
   <div class="field_row">
0
@@ -9,6 +9,6 @@
0
   </div>
0
   
0
   <div class="field_row">
0
-    <%= submit_tag "Send reminder", :class => "submit" %>
0
+    <%= submit_tag "Send reminder", :class => "submit button" %>
0
   </div>
0
 <% end %>
0
\ No newline at end of file

app/views/sessions/new.html.erb

0
@@ -1,20 +1,32 @@
0
+<div class="col1">
0
+<h2>Sign in</h2>
0
+
0
 <% form_tag session_path do -%>
0
-<div class="form_row"><label for="username">Email address</label><br/>
0
-<%= text_field_tag 'email', params[:email],
0
-                               :maxlength => Person::MAX_EMAIL  %></div>
0
+<div class="form_row">
0
+  <label for="username">Email address</label>
0
+  <%= text_field_tag 'email', params[:email],
0
+                              :maxlength => Person::MAX_EMAIL  %>
0
+</div>
0
 <%= set_focus_to_id "email" %>
0
 
0
-<div class="form_row"><label for="password">Password</label><br/>
0
-<%= password_field_tag 'password', params[:password],
0
-                                   :maxlength => Person::MAX_PASSWORD %></div>
0
-
0
-<div class="form_row"><label for="remember_me">Remember me:</label>
0
-<%= check_box_tag 'remember_me', '1', true %></div>
0
-
0
+<div class="form_row">
0
+  <label for="password">Password</label>
0
+  <%= password_field_tag 'password', params[:password],
0
+                                     :maxlength => Person::MAX_PASSWORD %>
0
+</div>
0
 
0
-<div class="form_row"><%= submit_tag 'Sign in' %> or <%= link_to "Sign up", signup_path %></div>
0
+<div class="form_row">
0
+  <label for="remember_me" class="checkbox">Remember me:</label>
0
+  <%= check_box_tag 'remember_me', '1', true, :class => "checkbox" %>
0
+</div>
0
 
0
 <div class="form_row">
0
-  <%= link_to "I forgot my password!", new_password_reminder_path %>
0
+  <%= submit_tag 'Sign in', :class => "button" %>
0
+  <p>or <%= link_to "Sign up", signup_path %></p>
0
 </div>
0
+
0
+<p class="form_row">
0
+  <%= link_to "I forgot my password!", new_password_reminder_path %>
0
+</p>
0
 <% end -%>
0
+</div>
0
\ No newline at end of file

Comments

No one has commented yet.