social_stream-presence 0.6.0 → 0.6.1

data/app/assets/javascripts/chat_audio.js

@@ -23,7 +23,7 @@ function initSound(sound){
   var html5audio=document.createElement('audio')
   
   if (html5audio.canPlayType){ 
-    path = 'assets/chat/' + sound;
+    path = '/assets/chat/' + sound;
     window[sound] = new Audio();
 
     for(i=0; i<html5_audiotypes.length; i++){

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

@@ -183,6 +183,7 @@ function updateChatWindow(){
         setStatusWidgetTitle(userStatus);
         $(".user_presence a[title]").tooltip();
         setUserFunctions();
+				updateConnectedUsersOfMainChatBox();
         if (afterNewConnectionFlag){
           afterNewConnectionFlag = false;
           restoreChatData();
@@ -230,7 +231,7 @@ function getAllConnectedSlugs(){
   connectedSlugs=[];
   connectionBoxes = $('div.user_presence[slug]');
   $.each(connectionBoxes, function(index, value) {
-      if($(value).is(":visible")){
+		if($(value).css("display")!="none"){
           connectedSlugs.push($(value).attr("slug"))
       }
   });
@@ -321,4 +322,15 @@ function notifyWhenUsersDisconnect(){
 function hideAllNotifications(){
   var notification = $("div.ui-chatbox-notify");
   hideChatNotification(notification);
-}
+}
+
+
+
+////////////////////
+//Update connected users of MainChatBox
+////////////////////
+
+function updateConnectedUsersOfMainChatBox(){
+	var connectedUsers = getAllConnectedSlugs().length;
+	changeMainChatBoxHeaderTitle( '<%=I18n.t('chat.title')%>' + " (" + connectedUsers + ")");
+}

data/app/assets/javascripts/chat_parser.js

@@ -143,7 +143,7 @@ function splitFirst(word,key){
 function buildIconImage(icon){
   if (icon in chatIcons){
     image_file = chatIcons[icon]
-    return "<img class=\"chatEmoticon\" src=\"assets/emoticons/" + image_file + "\"/>";
+    return "<img class=\"chatEmoticon\" src=\"/assets/emoticons/" + image_file + "\"/>";
   }
   return icon
 }

data/app/assets/javascripts/chat_window_manager.js

@@ -250,6 +250,8 @@ function createMainChatBox(){
       $("#chat_partial").css("margin-left",-3)
 			$(".dropdown dd ul").css("min-width",147) 
 			
+			//Header title
+			updateConnectedUsersOfMainChatBox();
 		}
 	}
 }
@@ -270,3 +272,7 @@ function modifyChatPartialIfMainBox(chatPartial){
 	
 	return chatPartial;
 }
+
+function changeMainChatBoxHeaderTitle(title){
+  $($(mainChatBox.parent().parent()).find(".ui-chatbox-titlebar").find("span")[0]).html(title);
+}

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

@@ -2,7 +2,6 @@
 //Global constants
 ////////////////////
 var domain = '<%=SocialStream::Presence.domain%>';
-var sound_path = "/assets/audio/chat/onMessage";
 
 
 ////////////////////
@@ -319,6 +318,7 @@ function processAvailablePresenceStanza(presence){
       if (cacheConnectedUsers.indexOf(slug) != -1) {
         showConnectionBoxFromSlug(slug);
         hideChatNotificationForSlug(slug);
+				updateConnectedUsersOfMainChatBox();
       } 
     } else {
       setTimeout("refreshChatWindow()", 3000);
@@ -334,6 +334,7 @@ function processUnavailablePresenceStanza(presence){
     if (getConnectionBoxFromSlug(slug)!=null){
       hideConnectionBoxFromSlug(slug)
       showChatNotificationForSlug(slug,$(getConnectionBoxFromSlug(slug)).attr("name") + " is offline");
+			updateConnectedUsersOfMainChatBox();
     }
   }
 }

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

@@ -28,6 +28,8 @@
 .ui-chatbox-titlebar {
     padding: 3px 3px 3px 3px;
     height: 20px;
+		background-color: $secondary-color;
+		color: $main-color;
 }
 
 .ui-chatbox-content {
@@ -53,6 +55,7 @@
     margin: 5px 5px 5px 5px;
     border: 1px solid $separation-color;
     height: 35px;
+		color: $main-color;
 }
 
 

data/app/views/chat/_contacts.html.erb

@@ -12,10 +12,10 @@
 			    <dt><a href=""><span><%=t('chat.status.choose')%></span></a></dt>
 			    <dd>
 			        <ul id="statusList">
-					      <li><a id="available" href="#" class="option"><img class="flag" src="assets/status/available.png" alt=""/> <%=t('chat.status.available')%> <span class="value">available</span></a></li>
-					      <li><a id="away" href="#" class="option"><img class="flag" src="assets/status/away.png" alt=""/> <%=t('chat.status.away')%> <span class="value">away</span></a></li>
-					      <li><a id="dnd" href="#" class="option"><img class="flag" src="assets/status/dnd.png" alt=""/> <%=t('chat.status.dnd')%> <span class="value">dnd</span></a></li>
-								<li><a id="offline" href="#" class="option"><img class="flag" src="assets/status/offline.png" alt=""/> <%=t('chat.status.offline')%> <span class="value">offline</span></a></li>
+					      <li><a id="available" href="#" class="option"><img class="flag" src="/assets/status/available.png" alt=""/> <%=t('chat.status.available')%> <span class="value">available</span></a></li>
+					      <li><a id="away" href="#" class="option"><img class="flag" src="/assets/status/away.png" alt=""/> <%=t('chat.status.away')%> <span class="value">away</span></a></li>
+					      <li><a id="dnd" href="#" class="option"><img class="flag" src="/assets/status/dnd.png" alt=""/> <%=t('chat.status.dnd')%> <span class="value">dnd</span></a></li>
+								<li><a id="offline" href="#" class="option"><img class="flag" src="/assets/status/offline.png" alt=""/> <%=t('chat.status.offline')%> <span class="value">offline</span></a></li>
 			        </ul>
 			    </dd>
         </div>

data/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module Socialstream
   module Presence
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   end
 end

data/social_stream-presence.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.15.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.15.1')
   
   s.add_runtime_dependency "xmpp4r"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-presence
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,18 +13,18 @@ date: 2012-02-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &79169370 !ruby/object:Gem::Requirement
+  requirement: &80060050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
   type: :runtime
   prerelease: false
-  version_requirements: *79169370
+  version_requirements: *80060050
 - !ruby/object:Gem::Dependency
   name: xmpp4r
-  requirement: &79169160 !ruby/object:Gem::Requirement
+  requirement: &80059820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79169160
+  version_requirements: *80059820
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &79168920 !ruby/object:Gem::Requirement
+  requirement: &80059590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79168920
+  version_requirements: *80059590
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &79168690 !ruby/object:Gem::Requirement
+  requirement: &80059370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79168690
+  version_requirements: *80059370
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &79168470 !ruby/object:Gem::Requirement
+  requirement: &80059160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79168470
+  version_requirements: *80059160
 description: Social Stream is a Ruby on Rails engine providing your application with
   social networking features and activity streams.
 email: