.gitignore app/controllers/messages_controller.rb app/helpers/messages_helper.rb app/views/messages/new_private_message.rjs test/functional/messages_controller_test.rb @@ -6,7 +6,7 @@ class ApplicationController < ActionController::Base include AuthenticatedSystem # See ActionController::RequestForgeryProtection for details # Uncomment the :secret if you're not using the cookie session store - protect_from_forgery # :secret => '9d0e7799e103d6e78392724afa979f3a' + #protect_from_forgery # :secret => '9d0e7799e103d6e78392724afa979f3a' # See ActionController::Base for details # Uncomment this to filter the contents of submitted sensitive data parameters app/controllers/application.rb @@ -1,5 +1,5 @@ class ChatRoomsController < ApplicationController - before_filter :is_logged_in?, :except => :index + before_filter :is_logged_in? # GET /chat_rooms # GET /chat_rooms.xml def index app/controllers/chat_rooms_controller.rb @@ -2,21 +2,15 @@ class ConnectionsController < ApplicationController around_filter :update_user_list def login - render :juggernaut => {:type => :send_to_channels, :channels => @channels } do |page| - page.insert_html :bottom, 'chat_room', "<p style='color:green;font-size:20px;'>#{@user.login} has entered the room</p>" - page.call :scrollChatPanel - end + update_chat_room("entered") unless @channels.include? 0 - #render :nothing => true + render :nothing => true end def logout Juggernaut.remove_channels_from_clients(@user.id, @channels) - render :juggernaut => {:type => :send_to_channels, :channels => @channels } do |page| - page.insert_html :bottom, 'chat_room', "<p style='color:green;font-size:20px;'>#{@user.login} has left the room</p>" - page.call :scrollChatPanel - end + update_chat_room("left") unless @channels.include? 0 render :nothing => true end @@ -26,7 +20,7 @@ class ConnectionsController < ApplicationController def update_user_list @user = User.find(params[:client_id]) - @channels = params[:channels].collect{|channel| channel.to_i } + @channels = params[:channels].collect{|channel| channel.to_i } if params[:channels] yield @@ -34,8 +28,15 @@ class ConnectionsController < ApplicationController users = User.find(Juggernaut.show_users_for_channels(@channels).collect{ |user| user["id"] }) render :juggernaut => {:type => :send_to_channels, :channels => @channels } do |page| - page.replace_html 'user_list', users.collect{ |user| "<li>#{user.login}</li>" }.join + page.replace_html 'user_list', users.collect{ |user| "<li>"+ link_to_remote(user.login, :url => "/messages/new_private_message/#{user.id}")+"</li>" }.join end end end + + def update_chat_room(action) + render :juggernaut => {:type => :send_to_channels, :channels => @channels } do |page| + page.insert_html :bottom, 'chat_room', "<p style='color:green;font-size:20px;'>#{@user.login} has #{action} the room</p>" + page.call :scrollChatPanel + end + end end \ No newline at end of file app/controllers/connections_controller.rb @@ -1,3 +1,5 @@ +<%= juggernaut(:channels => [0], :client_id => session[:user_id]) %> + <h1>Listing chat_rooms</h1> <table> @@ -22,3 +24,9 @@ <br /> <%= link_to 'New chat_room', new_chat_room_path %> + +<br /> + +<div id="user_list"></div> + +<div id="private_messages"></div> \ No newline at end of file app/views/chat_rooms/index.html.erb @@ -1,12 +1,5 @@ <%= juggernaut(:channels => [@chat_room.id], :client_id => session[:user_id]) %> -<script type="text/javascript"> -function scrollChatPanel(){ - div = $('chat_room'); - div.scrollTop = 0xffff; -} -</script> - <p><%= link_to 'Back', chat_rooms_path %></p> <h1><%=h @chat_room.name %></h1> app/views/chat_rooms/show.html.erb @@ -7,6 +7,12 @@ <title>ChatRooms: <%= controller.action_name %></title> <%= javascript_include_tag 'prototype', :juggernaut %> <%= stylesheet_link_tag 'scaffold' %> + <script type="text/javascript"> + function scrollChatPanel(room){ + div = $(room); + div.scrollTop = 0xffff; + } + </script> </head> <body> app/views/layouts/application.html.erb @@ -32,7 +32,7 @@ # :allowed_ips: - 127.0.0.1 - # - 192.168.0.1 + #- 192.168.0.6 # 2) Via HTTP request # juggernaut.yml @@ -64,6 +64,18 @@ a:hover { color: #fff; background-color:#000; } scrollbar-3dlight-color:B1D0F0; } +.scroller{ + border:1px solid black; + overflow-y: scroll; + scrollbar-arrow-color:000000; + scrollbar-track-color:000000; + scrollbar-shadow-color:B1D0F0; + scrollbar-face-color:B1D0F0; + scrollbar-highlight-color:B1D0F0; + scrollbar-darkshadow-color:B1D0F0; + scrollbar-3dlight-color:B1D0F0; +} + #chat_room { float: left; @@ -90,4 +102,16 @@ a:hover { color: #fff; background-color:#000; } margin-top: 10px; font-size: 15px; border: 1px solid black; +} + +.private_message{ + margin-left :10px; + float: left; + height: 400px; + padding: 10px; + border: 1px solid black; +} + +.private_chat_room{ + height: 350px; } \ No newline at end of file public/stylesheets/scaffold.css 48b84003b3bbe874eccdd164582aba77cf9c9450 Taylor Redden thredden21@tntech.edu http://github.com/taelor/chat_sandbox/commit/338e9657999fe4618ac3d24e8b8d4c1012e52bb4 338e9657999fe4618ac3d24e8b8d4c1012e52bb4

2008-08-11T19:23:20-07:00

added private messaging, needs refactoring 8fcd4dda879b52ba864186ff517510952eda5096 Taylor Redden thredden21@tntech.edu