social_stream 0.13.1 → 0.13.2

data/base/app/controllers/comments_controller.rb

@@ -1,18 +1,8 @@
-class CommentsController < InheritedResources::Base
-  load_and_authorize_resource
+class CommentsController < ApplicationController
+  include SocialStream::Controllers::Objects
 
-  respond_to :html, :xml, :js
-
-  def destroy
-    @post_activity = resource.post_activity
-
-    destroy!
-  end
-  
   def show    
     parent = resource.post_activity.parent
     redirect_to polymorphic_path(parent.direct_object,:anchor => dom_id(parent))
   end
-
-
 end

data/base/app/views/comments/_new.html.erb

@@ -15,7 +15,7 @@
                 :html => { :class => "new_comment", :id => "new_comment"+dom_id(activity)  },
                 :remote => true do |f| %>
 
-        <%= f.hidden_field :_contact_id %>
+        <%= f.hidden_field :owner_id %>
         <%= f.hidden_field :_activity_parent_id %>
         
         <div class="input_new_comments_container">

data/base/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.10.1".freeze
+    VERSION = "0.10.2".freeze
   end
 end

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.13.1".freeze
+  VERSION = "0.13.2".freeze
 end

data/presence/app/assets/javascripts/chat_interface_manager.js.erb

@@ -18,19 +18,20 @@ statusIcons['dnd'] = "dnd";
 
 var connectButtonTimer;
 var periodBetweenAttempts=15; //(seg)
-var connectButtonTimerCounter=periodBetweenAttempts;
+var connectButtonTimerCounter=periodBetweenAttempts+1;
 
 function connectButtonTimerFunction(){
-	  if(connectButtonTimerCounter < periodBetweenAttempts){
-			connectButtonTimerCounter++;
-		} else if (connectButtonTimerCounter == periodBetweenAttempts) {
+		connectButtonTimerCounter++;
+		if (connectButtonTimerCounter > (periodBetweenAttempts-1)) {
+			clearTimeout(connectButtonTimer);
 			$("#chat_header_title").html('<%=I18n.t('chat.disconnected')%>')
 		}
 }
 
 function requestConnectToChat(){
   if (connectButtonTimerCounter > (periodBetweenAttempts-1)) {
-    connectButtonTimerCounter=0; 
+    connectButtonTimerCounter=0;
+		connectButtonTimer = setInterval("connectButtonTimerFunction()", 1000) 
 		$("#chat_header_title").html('<%=I18n.t('chat.connecting')%>')
     return true
   } else {
@@ -292,4 +293,41 @@ function putReceivedMessageOnChatWindow(from_jid,from_slug,body,msgID){
 		playSound("onMessageAudio");
 	}
 	
+}
+
+
+////////////////////
+//Notifications on chat Window
+////////////////////
+
+function showChatNotificationForSlug(slug,msg){
+	var notification = $("#" + slug).parent().find("div.ui-chatbox-notify");
+	showChatNotification(notification,msg);
+}
+
+function showChatNotification(notification,msg){
+  notification.html("<p class==\"ui-chatbox-notify-text\">" + msg + "</p>");
+  notification.css("visibility","visible");
+  notification.fadeIn();
+}
+
+function hideChatNotificationForSlug(slug){
+  var notification = $("#" + slug).parent().find("div.ui-chatbox-notify");
+	hideChatNotification(notification);
+}
+
+function hideChatNotification(notification){
+  notification.fadeOut();
+  notification.css("visibility","hidden");
+}
+
+function notifyWhenUsersDisconnect(){
+	var notification = $("div.ui-chatbox-notify");
+	var msg = '<%=I18n.t('chat.notify.offline')%>';
+	showChatNotification(notification,msg);
+}
+
+function hideAllNotifications(){
+	var notification = $("div.ui-chatbox-notify");
+  hideChatNotification(notification);
 }

data/presence/app/assets/javascripts/chat_utilities.js

@@ -65,6 +65,19 @@ function blinkTitleOnMessage(username){
 
 
 
+////////////////////
+//Control user data input on the chatbox
+////////////////////
+
+//Return true to allow user to send data to the chatbox.
+function userChatDataInputControl(){
+	var floodControlBoolean = floodControl();
+  var offlineDataSendControlBoolean = offlineDataSendControl();
+	return (floodControlBoolean && offlineDataSendControlBoolean);
+}
+
+
+
 ////////////////////
 //Antiflood
 ////////////////////
@@ -190,6 +203,19 @@ function mustBounceBoxForChatWindow(jqueryUIChatbox){
 	
 }
 
+
+
+////////////////////
+//Prevent user to send data to the chatbox when he is offline.
+////////////////////
+
+function offlineDataSendControl(){
+	return ((!disconnectionFlag) && (isStropheConnected()));
+}
+
+
+
+
 ////////////////////
 //Next features...
 ////////////////////

data/presence/app/assets/javascripts/xmpp_client_management.js.erb

@@ -160,6 +160,7 @@ function onConnect(status) {
     log('Strophe is disconnected.');
 		disconnectionFlag = true;
 	  clearTimeout(awayTimer);
+		notifyWhenUsersDisconnect();
 	  reconnectTimer = setTimeout ("onReconnect()", 5000);
   } else if (status == Strophe.Status.CONNECTED) {
     log('Strophe is connected.');
@@ -173,13 +174,14 @@ function onConnect(status) {
 	  sendStatus(userStatus);
     awayTimer = setInterval("awayTimerFunction()", awayTimerPeriod);
 	  timer = setInterval("timerFunction()", timerPeriod);
+		hideAllNotifications();
   }
 	
 	updateChatWindow();
 }
 
 function onReconnect(){
-	log("onReconnect!")
+	
 	if ((!isStropheConnected())&&(userStatus!="offline")) {
 		
 		if (reconnectAttempts>0) {
@@ -273,6 +275,7 @@ function processAvailablePresenceStanza(presence){
       setUserIconStatus(slug, status);
 			if (cacheConnectedUsers.indexOf(slug) != -1) {
 	  	  showConnectionBoxFromSlug(slug);
+				hideChatNotificationForSlug(slug);
 	    }	
 	  } else {
 	    setTimeout("refreshChatWindow()", 3000);
@@ -287,6 +290,7 @@ function processUnavailablePresenceStanza(presence){
 	if (slug != user_slug) {
 	  if (getConnectionBoxFromSlug(slug)!=null){
 	    hideConnectionBoxFromSlug(slug)
+			showChatNotificationForSlug(slug,$(getConnectionBoxFromSlug(slug)).attr("name") + " is offline");
 	  }
   }
 }

data/presence/app/assets/stylesheets/chat.css

@@ -62,6 +62,30 @@
     clear: both;
 }
 
+div.ui-chatbox-notify{
+	visibility: hidden;
+	background: #E5E5E5;
+	background-color: #E5E5E5;
+	color: black;
+	z-index: 1;
+	position:absolute;
+	top: 0;
+	margin-top: 30px;
+	padding: 4px 0px 4px 0px;
+	width: 236px;
+	text-align: center;
+	border-style:solid;
+  border-width:1px;
+	border-color: #CCCCCC;
+	opacity:0.95;
+  filter:alpha(opacity=95); /* For IE8 and earlier */
+}
+
+p.ui-chatbox-notify-text{
+  text-align: center;
+	font-weight: bold;
+}
+
 
 /* Ticks */
 

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

@@ -1,9 +1,6 @@
      <script type="text/javascript">
 				$(document).ready(function () {
 
-          connectButtonTimer = setInterval("connectButtonTimerFunction()", 1000)
-					connectButtonTimerCounter=periodBetweenAttempts+1
-
 					if (authByCookie()){
 					  //Authentication by cookie
             

data/presence/config/locales/en.yml

@@ -3,7 +3,7 @@ en:
     connecting: "Chat Connecting"
     reconnecting: "Chat Reconnecting"
     disconnected: "Chat Disconnected"
-    unableconnect: "Chat Disconnected"
+    unableconnect: "Chat Out of Service"
     title: "Chat"
     password: "Password"
     status: 
@@ -15,4 +15,6 @@ en:
     settings:
       title: "Enable and configure Social Stream Chat"  
       checkbox: "Enable or disable Social Stream Chat"  
-      update: "Update Settings"
+      update: "Update Settings"
+    notify:
+      offline: "You are offline"

data/presence/config/locales/es.yml

@@ -3,7 +3,7 @@ es:
     connecting: "Chat Conectando"
     reconnecting: "Chat Reconectando"
     disconnected: "Chat Desconectado"
-    unableconnect: "Chat Desconectado"
+    unableconnect: "Chat Fuera de servicio"
     title: "Chat"
     password: "Contraseña"
     status:
@@ -16,4 +16,6 @@ es:
       title: "Activación y configuración del chat de Social Stream"
       checkbox: "Activar o desactivar chat"  
       update: "Guardar configuración"
+    notify:
+      offline: "Desconectado"
        

data/presence/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module Socialstream
   module Presence
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/presence/vendor/assets/javascripts/jquery.ui.chatbox.js

@@ -167,7 +167,9 @@
 		.addClass('ui-icon-minusthick ' +  'chat-thick ' + ' chat-minusthick')
 		.text('minimize')
 		.appendTo(uiChatboxTitlebarMinimize),
-	    // content
+	    
+			
+			// content
 	    uiChatboxContent = (self.uiChatboxContent = $('<div></div>'))
 		.addClass('ui-widget-content ' +
 			  'ui-chatbox-content '
@@ -179,6 +181,19 @@
 			  'ui-chatbox-log'
 			 )
 		.appendTo(uiChatboxContent),
+		
+		//Notification div
+		uiChatboxNotify = (self.uiChatboxNotify = $('<div></div>'))
+    .addClass('ui-widget-content ' + 
+       'ui-chatbox-notify'
+       )
+    .click(function(event) {
+        // anything?
+				self.uiChatboxNotify.fadeOut();
+    })
+    .appendTo(uiChatboxContent),
+		
+		
 	    uiChatboxInput = (self.uiChatboxInput = $('<div></div>'))
 		.addClass('ui-widget-content ' + 
 			 'ui-chatbox-input'
@@ -195,7 +210,8 @@
 		.appendTo(uiChatboxInput)
 	        .keydown(function(event) {
 				    if(event.keyCode && event.keyCode == $.ui.keyCode.ENTER) {
-							if (((typeof floodControl == 'function')&&(floodControl()))||((typeof floodControl != 'function'))) {
+							var userChatDataInputControlBoolean = (((typeof userChatDataInputControl == 'function')&&(userChatDataInputControl()))||((typeof userChatDataInputControl != 'function')));
+							if (userChatDataInputControlBoolean) {
 						  	msg = $.trim($(this).val());
 						  	if (msg.length > 0) {
 						  		self.options.messageSent(self.options.id, self.options.user, msg);

data/social_stream.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.10.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.10.2')
   s.add_runtime_dependency('social_stream-documents', '~> 0.5.0')
   s.add_runtime_dependency('social_stream-events', '~> 0.1.0')
  

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 47
   prerelease: 
   segments: 
   - 0
   - 13
-  - 1
-  version: 0.13.1
+  - 2
+  version: 0.13.2
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-28 00:00:00 +01:00
+date: 2011-12-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 53
+        hash: 51
         segments: 
         - 0
         - 10
-        - 1
-        version: 0.10.1
+        - 2
+        version: 0.10.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency