social_stream 0.12.8 → 0.12.9

data/presence/app/views/chat/_settings.html.erb

@@ -0,0 +1,38 @@
+<% if current_user and current_subject and current_user==current_subject %>
+	
+<div class="block" id="chat_settings">
+    <div class="header">
+        <div class="header_text">
+             Chat
+        </div>
+        <div class="header_icon_right">
+          <%= link_to (image_tag('btn/edit.png')),  "javascript:showSettings(\"chat_settings\");" %>
+        </div>
+    </div>
+    <div id="chat_settings_briefing" class="settings_briefing content">        
+        <div class="form_row">
+            Enable and configure Social Stream Chat
+        </div>
+    </div>
+    <div class="content settings_content" id="chat_settings_content" style="display:none;">
+				<%= form_tag(:controller => "Xmpp", :action => "updateSettings", :method => "get") do %>
+        <ul>
+        <div class="settings_block">
+        	<div class="form_row">
+          </div>
+          <div class="form_sub_row">
+            <% checked = current_user.chat_enabled %>
+            <%= check_box_tag 'enable_chat', true, checked %>
+            <%= label_tag(:enable_chat, "Enable or disable Social Stream Chat") %> 
+          </div>
+          <div class="actions center">
+              <%= hidden_field_tag :settings_section, :chat %>
+              <%= submit_tag "Update Settings", :class => "button" %>
+          </div>
+        </div>
+        </ul>
+        <% end %>
+    </div>
+</div>
+	
+<% end %>

data/presence/config/routes.rb

@@ -11,6 +11,6 @@ Rails.application.routes.draw do
   match '/xmpp/setPresence' => "Xmpp#setPresence"
   match '/xmpp/unsetPresence' => "Xmpp#unsetPresence"
   match '/chatWindow'=> "Xmpp#chatWindow"
-  match '/chatAuthWithCookie'=> "Xmpp#chatAuthWithCookie"
+  match '/xmpp/updateSettings'=> "Xmpp#updateSettings"
    
 end

data/presence/db/migrate/20111116194112_add_chat_enabled_column_to_user.rb

@@ -0,0 +1,9 @@
+class AddChatEnabledColumnToUser < ActiveRecord::Migration
+  def self.up
+     add_column :users, :chat_enabled, :boolean, :default => true
+  end
+
+  def self.down
+    remove_column :users, :chat_enabled
+  end
+end

data/presence/{app → vendor}/assets/javascripts/jquery.ui.chatbox.js

@@ -43,17 +43,21 @@
 		    self._scrollToBottom();
 
 		    if(!self.elem.uiChatboxTitlebar.hasClass("ui-state-focus") && !self.highlightLock) {
-			self.highlightLock = true;
-			self.highlightBox();
+			   self.highlightLock = true;
+			   self.highlightBox();
 		    }
 		},
 		highlightBox: function() {
-		    //this.elem.uiChatbox.addClass("ui-state-highlight");
+		    this.elem.uiChatbox.addClass("ui-state-highlight");
 		    var self = this;
-		    self.elem.uiChatboxTitlebar.effect("highlight", {}, 300);
+				
+				//Get highlight color from css
+				var dummy_element = $("<p class=\"chatWindowhighlighted\"></div>");
+        var options = {color: $(dummy_element).css("color")};
+		    self.elem.uiChatboxTitlebar.effect("highlight", options, 300);
 		    self.elem.uiChatbox.effect("bounce", {times:3}, 300, function(){
-			self.highlightLock = false;
-			self._scrollToBottom();
+			     self.highlightLock = false;
+			     self._scrollToBottom();
 		    });
 		},
 		toggleBox: function(show) {
@@ -69,7 +73,7 @@
 	toggleContent: function(event) {
 	    this.uiChatboxContent.toggle();
 	    if(this.uiChatboxContent.is(":visible")) {
-		this.uiChatboxInputBox.focus();
+		    this.uiChatboxInputBox.focus();
 	    }
 	},
 
@@ -91,7 +95,7 @@
 		.attr('outline', 0)
 		.focusin(function(){
 		    // ui-state-highlight is not really helpful here
-		    //self.uiChatbox.removeClass('ui-state-highlight');
+		    self.uiChatbox.removeClass('ui-state-highlight');
 		    self.uiChatboxTitlebar.addClass('ui-state-focus');
 		})
 		.focusout(function(){
@@ -131,8 +135,7 @@
 		})
 		.appendTo(uiChatboxTitlebar),
 	    uiChatboxTitlebarCloseText = $('<span></span>')
-		.addClass('ui-icon ' +
-			  'ui-icon-closethick')
+		.addClass('ui-icon-closethick ' + 'chat-thick ' + 'chat-closethick')
 		.text('close')
 		.appendTo(uiChatboxTitlebarClose),
 	    uiChatboxTitlebarMinimize = (self.uiChatboxTitlebarMinimize = $('<a href="#"></a>'))
@@ -154,8 +157,7 @@
 		})
 		.appendTo(uiChatboxTitlebar),
 	    uiChatboxTitlebarMinimizeText = $('<span></span>')
-		.addClass('ui-icon ' +
-			  'ui-icon-minusthick')
+		.addClass('ui-icon-minusthick ' +  'chat-thick ' + ' chat-minusthick')
 		.text('minimize')
 		.appendTo(uiChatboxTitlebarMinimize),
 	    // content

data/social_stream.gemspec

@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.30')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.4.4')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.31')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.4.5')
   s.add_runtime_dependency('social_stream-events', '~> 0.0.20')
  
   # Development Gem dependencies

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 12
-  - 8
-  version: 0.12.8
+  - 9
+  version: 0.12.9
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-16 00:00:00 +01:00
+date: 2011-11-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 0
         - 9
-        - 30
-        version: 0.9.30
+        - 31
+        version: 0.9.31
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,12 +43,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 0
         - 4
-        - 4
-        version: 0.4.4
+        - 5
+        version: 0.4.5
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -1135,23 +1135,23 @@ files:
 - presence/app/assets/images/status/available.png
 - presence/app/assets/images/status/away.png
 - presence/app/assets/images/status/dnd.png
-- presence/app/assets/javascripts/jquery-ui-1.8.14.custom.min.js
-- presence/app/assets/javascripts/jquery.tools.min.js
-- presence/app/assets/javascripts/jquery.tools.tooltip.js
-- presence/app/assets/javascripts/jquery.ui.chatbox.js
+- presence/app/assets/javascripts/chat_audio.js
+- presence/app/assets/javascripts/chat_interface_manager.js.erb
+- presence/app/assets/javascripts/chat_parser.js
+- presence/app/assets/javascripts/chat_utilities.js
+- presence/app/assets/javascripts/chat_window_manager.js
 - presence/app/assets/javascripts/social_stream-presence.js
 - presence/app/assets/javascripts/store.js
-- presence/app/assets/javascripts/strophe.js
-- presence/app/assets/javascripts/xmpp_client.js.erb
+- presence/app/assets/javascripts/xmpp_client_management.js.erb
 - presence/app/assets/stylesheets/chat.css
-- presence/app/assets/stylesheets/jquery.ui.chatbox.css
 - presence/app/assets/stylesheets/social_stream-presence.css
 - presence/app/controllers/xmpp_controller.rb
 - presence/app/helpers/xmpp_helper.rb
-- presence/app/views/xmpp/_chat.html.erb
-- presence/app/views/xmpp/_chat_connecting.html.erb
-- presence/app/views/xmpp/_chat_contacts.html.erb
-- presence/app/views/xmpp/_chat_off.html.erb
+- presence/app/views/chat/_connecting.html.erb
+- presence/app/views/chat/_contacts.html.erb
+- presence/app/views/chat/_index.html.erb
+- presence/app/views/chat/_off.html.erb
+- presence/app/views/chat/_settings.html.erb
 - presence/app/views/xmpp/active_users.html.erb
 - presence/app/views/xmpp/index.html
 - presence/app/views/xmpp/test.html.erb
@@ -1160,6 +1160,7 @@ files:
 - presence/config/routes.rb
 - presence/db/migrate/20110711111408_add_connected_column_to_user.rb
 - presence/db/migrate/20110928135031_add_status_column_to_user.rb
+- presence/db/migrate/20111116194112_add_chat_enabled_column_to_user.rb
 - presence/ejabberd/conf/ejabberd_example.cfg
 - presence/ejabberd/conf/ssconfig_example.cfg
 - presence/ejabberd/ejabberd_scripts/authentication_script
@@ -1241,6 +1242,10 @@ files:
 - presence/spec/demo/vendor/plugins/.gitkeep
 - presence/spec/discover.rb
 - presence/spec/spec_helper.rb
+- presence/vendor/assets/javascripts/jquery.tools.tooltip.js
+- presence/vendor/assets/javascripts/jquery.ui.chatbox.js
+- presence/vendor/assets/javascripts/strophe.js
+- presence/vendor/assets/stylesheets/jquery.ui.chatbox.css
 - social_stream.gemspec
 - social_stream.thor
 - spec/controllers/frontpage_controller_spec.rb