0
@@ -6,3 +6,4 @@
0
 /log/**/*
0
 /config/initializers/site_keys.rb
0
 /config/jabber_client_test_login.rb
0
+/db/development.sqlite3

0
@@ -1,5 +1,12 @@
0
 = juggernaut
0
 
0
-%ul#buddy_list
0
+.twocol
0
+  .left
0
+    %h2 Buddy List
0
+    %ul#buddy_list
0
+  .right
0
+    %h2 messages
0
+    %ul#messages
0
+.clear
0
 
0
-= javascript_include_tag 'buddy_list'
0
+= javascript_include_tag 'buddy_list', 'messages'

0
@@ -2,10 +2,9 @@
0
   %head
0
     %title Jabber Client test
0
     = javascript_include_tag :defaults, 'builder', :juggernaut
0
-    = stylesheet_link_tag 'base'
0
+    = stylesheet_link_tag 'base', 'twocol'
0
   %body
0
     %ul
0
-      %li= link_to "New Message", new_message_path
0
-      %li= link_to "Messages",    messages_path
0
-      %li= link_to "Buddy List",  '/buddy_list'
0
+      %li= link_to "New Message" , new_message_path
0
+      %li= link_to "Jabber User",  new_jabber_user_path
0
     = yield

0
@@ -3,6 +3,6 @@
0
   - form_tag messages_path do
0
     = submit_tag('Send', :class => 'fright', :tabindex => 3)
0
     .form_field
0
-      = text_field_tag(:to, nil, :tabindex => 1)
0
+      = text_field_tag(:to, params[:to], :tabindex => 1)
0
       %label{ :for => 'to' } To
0
-    = text_area_tag(:message, nil, :size => '40x4', :tabindex => 2)
0
+    = text_area_tag(:message, params[:body], :size => '40x4', :tabindex => 2)

0
@@ -34,7 +34,7 @@ class JabberUpdater
0
     if @client.received_messages?
0
       # TODO: This needs to restrict to the particular user it's supposed to be updating.
0
       the_messages = @client.received_messages.map do |message|
0
-        { :from => message.from.to_s, :body => message.body }
0
+        { :from => message.from.to_s.gsub(/'/, ''), :body => message.body.gsub(/'/, '') } # FIXME: Need to keep tickmarks at some point.
0
       end
0
       puts the_messages.inspect
0
       Juggernaut.send_to_all("new MessagesUpdate('#{the_messages.to_json}');")

0
@@ -1,13 +1,17 @@
0
 body {
0
   font-family: "Bitstream Vera Sans",arial,sans-serif;
0
   font-size: 12px; }
0
-  body #buddy_list li h3 {
0
-    font-weight: normal;
0
-    font-size: 12px; }
0
   body #buddy_list li.online {
0
     color: black; }
0
+    body #buddy_list li.online a {
0
+      color: black; }
0
   body #buddy_list li.away {
0
     color: #aaaaaa; }
0
+    body #buddy_list li.away a {
0
+      color: #aaaaaa; }
0
+  body #buddy_list li h3 {
0
+    font-weight: normal;
0
+    font-size: 12px; }
0
 
0
 .fright {
0
   float: right; }
0
@@ -17,3 +21,6 @@ body {
0
 
0
 label {
0
   color: #777777; }
0
+
0
+.clear {
0
+  clear: both; }

0
@@ -7,13 +7,17 @@ body
0
   :font-size= !font_base
0
   #buddy_list
0
     li
0
-      h3
0
-        :font-weight normal
0
-        :font-size= !font_base
0
       &.online
0
         :color black
0
+        a
0
+          :color black
0
       &.away 
0
         :color= !light_grey
0
+        a
0
+          :color= !light_grey
0
+      h3
0
+        :font-weight normal
0
+        :font-size= !font_base
0
 
0
 .fright
0
   :float right
0
@@ -24,3 +28,6 @@ body
0
 
0
 label
0
   :color= !medium_grey
0
+
0
+.clear
0
+  :clear both