social_stream 0.19.3 → 0.20.0

data/base/app/views/toolbar/_home.html.erb

@@ -8,7 +8,7 @@
 </div>
 
 <% if defined?(SocialStream::Presence) and SocialStream::Presence.enable %>
-  <%= render :partial => 'chat/index' , :locals => {:flow => true} %>
+  <%= render :partial => 'chat/index' , :locals => {:flow => false} %>
 <% end %>
 
 <div class="block space_center">

data/base/app/views/toolbar/_messages.html.erb

@@ -9,3 +9,7 @@
 
 <div class="block space_center">
 </div>
+
+<% if defined?(SocialStream::Presence) and SocialStream::Presence.enable %>
+  <%= render :partial => 'chat/index' , :locals => {:flow => true} %>
+<% end %>

data/base/app/views/toolbar/_profile.html.erb

@@ -22,3 +22,7 @@
 <div class="block space_center">
 </div>
 
+<% if defined?(SocialStream::Presence) and SocialStream::Presence.enable %>
+  <%= render :partial => 'chat/index' , :locals => {:flow => true} %>
+<% end %>
+

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.14.3".freeze
+    VERSION = "0.15.0".freeze
   end
 end

data/base/social_stream-base.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   # Avatar attachments
   s.add_runtime_dependency('avatars_for_rails', '~> 0.2.2')
   # jQuery
-  s.add_runtime_dependency('jquery-rails', '~> 1.0.9')
+  s.add_runtime_dependency('jquery-rails', '>= 1.0.9')
   # Authorization
   s.add_runtime_dependency('cancan', '~> 1.6.4')
   # Pagination

data/documents/lib/social_stream/documents/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.9.1".freeze
+    VERSION = "0.10.0".freeze
   end
 end

data/documents/social_stream-documents.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.14.3')
+  s.add_runtime_dependency('social_stream-base', '~> 0.15.0')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   s.add_runtime_dependency('paperclip','= 2.4.5')
   s.add_runtime_dependency('delayed_paperclip','2.4.5.1')

data/events/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.6.2".freeze
+    VERSION = "0.7.0".freeze
   end
 end

data/events/social_stream-events.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.14.3')
+  s.add_runtime_dependency('social_stream-base', '~> 0.15.0')
   s.add_runtime_dependency('rails-scheduler', '~> 0.0.6')
   s.add_runtime_dependency('coffee-rails', '>= 3.1.0')
 

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.19.3".freeze
+  VERSION = "0.20.0".freeze
 end

data/linkser/lib/social_stream/linkser/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Linkser
-    VERSION = "0.4.0".freeze
+    VERSION = "0.5.0".freeze
   end
 end

data/linkser/social_stream-linkser.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.14.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.15.0')
   s.add_runtime_dependency('linkser', '~> 0.0.10')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')

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

@@ -178,7 +178,7 @@ function updateChatWindow(){
   var stropheConnectedAndOnlineStatus = ((isStropheConnected()) && (userStatus!="offline") && (!disconnectionFlag));
   $.post("/chatWindow", { userConnected: stropheConnectedAndOnlineStatus }, function(data){
       $(".tooltip").hide() //Prevent tooltips
-      $("#chat_partial").html(data);
+      $("#chat_partial").html(modifyChatPartialIfMainBox(data));
       if (isStropheConnected()) {
         setStatusWidgetTitle(userStatus);
         $(".user_presence a[title]").tooltip();

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

@@ -4,7 +4,6 @@
 
 
 function storeChatData(){
-	return
 	
   //Check for Session Storage support
   if (! window.sessionStorage){

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

@@ -8,6 +8,7 @@ var chatBoxWidth = 230;
 var chatBoxHeight = 170;
 var videoBoxHeight = 150;
 var visibleChatBoxes = new Array();
+var offsetForFlowBox = 0;
 var chatBoxSeparation = chatBoxWidth+12;
 
 
@@ -98,6 +99,11 @@ function getBoxParams(){
 		} else {
 		  nBox++;
 		  boxParams[0] = (nBox-1)*(chatBoxSeparation);
+			
+			if((nBox!=1)&&(mainChatBox!=null)){
+				boxParams[0] = boxParams[0] - offsetForFlowBox;
+			}
+			
 		  boxParams[1] = nBox;
 		}
 		
@@ -218,7 +224,7 @@ function createMainChatBox(){
 			
 			//Delete closeTick and video Tick
 			$(mainChatBox.parent().parent()).find(".ui-chatbox-titlebar").find(".ui-icon-closethick").remove();
-			$(mainChatBox.parent().parent()).find(".ui-videobox-icon").remove()
+			$(mainChatBox.parent().parent()).find(".ui-videobox-icon").remove();
 			//Delete nofitications div
 			$(mainChatBox.parent()).find(".ui-chatbox-notify").remove();
 			//Delete video div
@@ -227,16 +233,40 @@ function createMainChatBox(){
 			$(mainChatBox.parent()).find(".ui-chatbox-input").remove();
 			
 			//Set height
-			//window[getChatVariableFromSlug(chatSlugId)].css( "width", "160" ) 
+			window[getChatVariableFromSlug(chatSlugId)].css( "height", "180" ); 
 			
 			//Set width
+			var windowWidth=150;
+			window[getChatVariableFromSlug(chatSlugId)].parent().parent().css( "width", windowWidth );
+			$(mainChatBox.parent().parent()).find(".ui-chatbox-titlebar").css( "width", windowWidth-6 );
+			$(mainChatBox).css( "width", windowWidth-6 );
+			
 			
-			//Adjust 
+			//Adjust window offset
+			offsetForFlowBox = 235-windowWidth;
+			
+			//CSS Adjusts
+			$("#chat_partial").css("margin-top",-3)
+      $("#chat_partial").css("margin-left",-3)
+			$(".dropdown dd ul").css("min-width",147) 
 			
 		}
 	}
 }
 
+
 function addContentToMainChatBox(content){
 	$(mainChatBox.parent()).find("#" + chatSlugId).html(content);
 }
+
+
+function modifyChatPartialIfMainBox(chatPartial){
+	if (mainChatBox != null) {
+		p = $(chatPartial)
+		$(p).find(".header").remove();
+		$(p).find(".dropdown dd ul").css("min-width",147);
+		return $(p); 
+  }
+	
+	return chatPartial;
+}

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

@@ -11,7 +11,7 @@
 				<div id="status" class="dropdown">
 			    <dt><a href=""><span><%=t('chat.status.choose')%></span></a></dt>
 			    <dd>
-			        <ul>
+			        <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>

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

@@ -1,6 +1,3 @@
-<% flow = false %>
-
-
 <% if current_user and current_user.chat_enabled and current_subject.subject_type=="User" %>
 	
 <div id="chat_wrapper"> 
@@ -45,7 +42,7 @@
 	  <script type="text/javascript">
 	  	 $(document).ready(function () {
 			 	createMainChatBox();
-				addContentToMainChatBox($("#chat_partial"));
+				addContentToMainChatBox(modifyChatPartialIfMainBox($("#chat_partial")));
 				$("#chat_wrapper").find("#chat_partial").remove();
 			 });
 		</script>

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

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

data/presence/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.14.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.15.0')
   
   s.add_runtime_dependency "xmpp4r"
 

data/social_stream.gemspec

@@ -11,11 +11,11 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.14.3')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.9.1')
-  s.add_runtime_dependency('social_stream-events', '~> 0.6.2')
-  s.add_runtime_dependency('social_stream-linkser', '~> 0.4.0')
-  s.add_runtime_dependency('social_stream-presence', '~> 0.5.2')
+  s.add_runtime_dependency('social_stream-base', '~> 0.15.0')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.10.0')
+  s.add_runtime_dependency('social_stream-events', '~> 0.7.0')
+  s.add_runtime_dependency('social_stream-linkser', '~> 0.5.0')
+  s.add_runtime_dependency('social_stream-presence', '~> 0.6.0')
  
   # Development Gem dependencies
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 0.19.3
+  version: 0.20.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,66 +10,66 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-03 00:00:00.000000000Z
+date: 2012-02-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &87805300 !ruby/object:Gem::Requirement
+  requirement: &82031270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.3
+        version: 0.15.0
   type: :runtime
   prerelease: false
-  version_requirements: *87805300
+  version_requirements: *82031270
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
-  requirement: &87805030 !ruby/object:Gem::Requirement
+  requirement: &82031010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *87805030
+  version_requirements: *82031010
 - !ruby/object:Gem::Dependency
   name: social_stream-events
-  requirement: &87804790 !ruby/object:Gem::Requirement
+  requirement: &82030760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *87804790
+  version_requirements: *82030760
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
-  requirement: &87804550 !ruby/object:Gem::Requirement
+  requirement: &82030470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *87804550
+  version_requirements: *82030470
 - !ruby/object:Gem::Dependency
   name: social_stream-presence
-  requirement: &87804320 !ruby/object:Gem::Requirement
+  requirement: &82030180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *87804320
+  version_requirements: *82030180
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &87804090 !ruby/object:Gem::Requirement
+  requirement: &82029820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *87804090
+  version_requirements: *82029820
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &87803880 !ruby/object:Gem::Requirement
+  requirement: &82017900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *87803880
+  version_requirements: *82017900
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &87803630 !ruby/object:Gem::Requirement
+  requirement: &82017650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *87803630
+  version_requirements: *82017650
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &87803380 !ruby/object:Gem::Requirement
+  requirement: &82017400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *87803380
+  version_requirements: *82017400
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &87785500 !ruby/object:Gem::Requirement
+  requirement: &82017150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *87785500
+  version_requirements: *82017150
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &87785270 !ruby/object:Gem::Requirement
+  requirement: &82016920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *87785270
+  version_requirements: *82016920
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &87785040 !ruby/object:Gem::Requirement
+  requirement: &82016690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,7 +143,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *87785040
+  version_requirements: *82016690
 description: Social Stream is a Ruby on Rails engine for building social network websites.
   It supports contacts, posts, file uploads, private messages and many more.
 email: