Adding titles to some more pages, adding a redirect after sent messages and setting...

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 9dba46879fb7bac108bc50f1a9afed69e143d841..4b94a7071d0b1854bfc83ba6533f22cc8beb8308 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -32,7 +32,7 @@ class DiaryEntryController < ApplicationController
       rss.add(latitude, longitude, entry.title, url_for({:controller => 'user', :action => 'diary', :id => entry.id, :display_name => entry.user.display_name}), entry.body, entry.created_at)
     end
 
       rss.add(latitude, longitude, entry.title, url_for({:controller => 'user', :action => 'diary', :id => entry.id, :display_name => entry.user.display_name}), entry.body, entry.created_at)
     end
 

-    response.headers["Content-Type"] = 'application/xml+rss'
+    response.headers["Content-Type"] = 'application/rss+xml'

 
     render :text => rss.to_s
   end
 
     render :text => rss.to_s
   end

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index a95ad25b60e4eb1c9638fbbe23ca7494ee72d7ee..0fc5f212bdf3705dea3edaf98ddc285ea2d2bfd6 100644 (file)
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -5,6 +5,7 @@ class MessageController < ApplicationController
   before_filter :require_user
 
   def new
   before_filter :require_user
 
   def new

+    @title = 'send message'

     if params[:message]
       to_user = User.find(params[:user_id])
       body = params[:message][:body]
     if params[:message]
       to_user = User.find(params[:user_id])
       body = params[:message][:body]


@@ -19,6 +20,7 @@ class MessageController < ApplicationController
    
       if message.save
         flash[:notice] = 'Message sent'
    
       if message.save
         flash[:notice] = 'Message sent'

+        redirect_to :controller => 'user', :action => 'view', :display_name => @user.display_name

       else
         @message.errors.add("Sending message failed")
       end
       else
         @message.errors.add("Sending message failed")
       end


@@ -27,12 +29,16 @@ class MessageController < ApplicationController
   end
 
   def read
   end
 
   def read

+    @title = 'read message'

     if params[:message_id]
       id = params[:message_id]
       @message = Message.find_by_id(id)
     end
   end
 
     if params[:message_id]
       id = params[:message_id]
       @message = Message.find_by_id(id)
     end
   end
 

+  def inbox
+  end
+

   def mark
     if params[:message_id]
       id = params[:message_id]
   def mark
     if params[:message_id]
       id = params[:message_id]

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 631da97d0ef29907d93a257da5a8591677b276db..459058ee5bc4c0a1970bd849cd6a02126eb2675b 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -6,6 +6,7 @@ class UserController < ApplicationController
   before_filter :require_user, :only => [:set_home, :account, :go_public, :make_friend]
 
   def save
   before_filter :require_user, :only => [:set_home, :account, :go_public, :make_friend]
 
   def save

+    @title = 'create account'

     @user = User.new(params[:user])
     @user.set_defaults
 
     @user = User.new(params[:user])
     @user.set_defaults
 


@@ -19,6 +20,7 @@ class UserController < ApplicationController
   end
 
   def account
   end
 
   def account

+    @title = 'edit account'

     if params[:user] and params[:user][:display_name] and params[:user][:description]
       home_lat =  params[:user][:home_lat]
       home_lon =  params[:user][:home_lon]
     if params[:user] and params[:user][:display_name] and params[:user][:description]
       home_lat =  params[:user][:home_lat]
       home_lon =  params[:user][:home_lon]


@@ -58,6 +60,7 @@ class UserController < ApplicationController
   end
 
   def lost_password
   end
 
   def lost_password

+    @title = 'lost password'

     if params[:user] and params[:user][:email]
       user = User.find_by_email(params['user']['email'])
       if user
     if params[:user] and params[:user][:email]
       user = User.find_by_email(params['user']['email'])
       if user


@@ -74,6 +77,7 @@ class UserController < ApplicationController
   end
 
   def reset_password
   end
 
   def reset_password

+    @title = 'reset password'

     if params['token']
       user = User.find_by_token(params['token'])
       if user
     if params['token']
       user = User.find_by_token(params['token'])
       if user


@@ -92,9 +96,11 @@ class UserController < ApplicationController
   end
 
   def new
   end
 
   def new

+    @title = 'create account'

   end
 
   def login
   end
 
   def login

+    @title = 'login'

     if params[:user]
       email = params[:user][:email]
       pass = params[:user][:password]
     if params[:user]
       email = params[:user][:email]
       pass = params[:user][:password]


@@ -149,6 +155,7 @@ class UserController < ApplicationController
   end
 
   def preferences
   end
 
   def preferences

+    @title = 'preferences'

     if request.get?
       render_text @user.preferences
     elsif request.post? or request.put?
     if request.get?
       render_text @user.preferences
     elsif request.post? or request.put?


@@ -174,10 +181,12 @@ class UserController < ApplicationController
 
   def view
     @this_user = User.find_by_display_name(params[:display_name])
 
   def view
     @this_user = User.find_by_display_name(params[:display_name])

+    @title = @this_user.display_name

   end
 
   def diary
     @this_user = User.find_by_display_name(params[:display_name])
   end
 
   def diary
     @this_user = User.find_by_display_name(params[:display_name])

+    @title = @this_user.display_name + "'s diary"

   end
 
   def make_friend
   end
 
   def make_friend


@@ -196,7 +205,7 @@ class UserController < ApplicationController
       else
         flash[:notice] = "You are already friends with #{name}."  
       end
       else
         flash[:notice] = "You are already friends with #{name}."  
       end

-        redirect_to :controller => 'user', :action => 'view'
+      redirect_to :controller => 'user', :action => 'view'

     end
   end
 
     end
   end