social_stream 0.19.2 → 0.19.3

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

@@ -91,11 +91,7 @@ div.ui-chatbox-notify{
 	background: $fill-color;
 	background-color: $fill-color;
 	color: black;
-	z-index: 1;
-	position:absolute;
-	top: 0;
-	margin-top: 30px;
-	padding: 4px 0px 4px 0px;
+	height: 12px;
 	width: 236px;
 	text-align: center;
 	border-style:solid;
@@ -103,9 +99,12 @@ div.ui-chatbox-notify{
 	border-color: $fill-color;
 	opacity:0.95;
   filter:alpha(opacity=95); /* For IE8 and earlier */
+	padding: 5px 0px 5px 0px;
+	display: none;
 }
 
 p.ui-chatbox-notify-text{
+	margin-top: 10px;
   text-align: center;
 	font-weight: bold;
 }

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

@@ -12,7 +12,7 @@
 			    <dt><a href=""><span><%=t('chat.status.choose')%></span></a></dt>
 			    <dd>
 			        <ul>
-					      <li><a id="available" href="#" class="option"><img class="flag" src="assets/status/available.png" alt=""/> <%=t('chat.status.available')%> <span class="value">chat</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>
@@ -41,7 +41,4 @@
 			
 	  </div>
  	
-		<div id="chat_divs">	
-	    <div id="chat_div">
-	    </div>
-		</div>
+		

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

@@ -1,41 +1,55 @@
+<% flow = false %>
+
+
 <% if current_user and current_user.chat_enabled and current_subject.subject_type=="User" %>
 	
+<div id="chat_wrapper"> 
+  <div id="chat_partial">   
+    <%= render :partial => 'chat/connecting' %>
+  </div>
+	<div id="chat_divs">  
+	  <div id="chat_div"></div>
+	</div>
+</div>
 
-	<script type="text/javascript">
 
-    //Global variables
-		var BOSH_SERVICE = '<%= SocialStream::Presence.bosh_service || root_url + "http-bind/" %>';
-		var cookie = "AuthenticationByCookie>>" + "<%=cookies[Rails.application.config.session_options[:key]]%>";
-		var domain = '<%=SocialStream::Presence.domain%>';
-		var user_name = '<%=current_user.name%>';
-		var user_slug = '<%=current_user.slug%>';
-		var user_jid = '<%=current_user.slug%>'+"@"+domain;
-		var sound_path = "/assets/audio/chat/onMessage";
+<script type="text/javascript">
 
+  //Global variables
+  var cookie = "AuthenticationByCookie>>" + "<%=cookies[Rails.application.config.session_options[:key]]%>";
+	var BOSH_SERVICE = '<%= SocialStream::Presence.bosh_service || root_url + "http-bind/" %>';
+  var user_name = '<%=current_user.name%>';
+  var user_slug = '<%=current_user.slug%>';
+  var user_jid = '<%=current_user.slug%>'+"@"+domain;
 
-		$(document).ready(function () {	
-			
-			  if (authByCookie()){
-					if (connectToServerWithCookie()==false){
-	          refreshChatWindow();
-	        }
-				} else {
-					if (connectToServerWithPassword(null)==false){
-	          refreshChatWindow();
-	        }
-				}
-				
-				initialTimer = setTimeout("updateChatWindow()", 15000);
-	      initAudio();
-				initFocusListeners();
-				
-		});
-		
-	</script>
+
+  $(document).ready(function () {
+    
+      if(getRestoreUserChatStatus()!="offline"){
+        connectToChat(user_jid,cookie,null);
+        //connectToChat(user_jid,null,null); //To use auth by password.
+        
+        initialTimer = setTimeout("updateChatWindow()", 15000);
+      } else {
+        initialTimer = setTimeout("updateChatWindow()", 1);
+      }
+      
+      initAudio();
+      initFocusListeners();
 			
+  });
+  
+</script>
+
+	<% if flow %>
+	  <script type="text/javascript">
+	  	 $(document).ready(function () {
+			 	createMainChatBox();
+				addContentToMainChatBox($("#chat_partial"));
+				$("#chat_wrapper").find("#chat_partial").remove();
+			 });
+		</script>
+	<% end %>
+
 
-	<div id="chat_partial">		
-	  <%= render :partial => 'chat/connecting' %>
-	</div>
-	
 <% end %>

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

@@ -7,7 +7,7 @@
             $("#passwordFormChat").hide();
             $('.connectChatButton').bind('click', function () {
 							if (requestConnectToChat()){
-								connectToServerWithCookie();
+								connectToChat(user_jid,cookie,null);
 							}
             });
             
@@ -22,7 +22,7 @@
             
             $('.connectChatButton').bind('click', function () {
 							if (requestConnectToChat()) {
-								connectToServerWithPassword($('#user_password').val());
+								connectToChat(user_jid,null,$('#user_password').val());
 			        }
             });
           

data/presence/config/routes.rb

@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
-  #match "/active_users" => "Xmpp#active_users"
+  match "/active_users" => "Xmpp#active_users"
   
   match '/xmpp/setConnection' => "Xmpp#setConnection"
   match '/xmpp/unsetConnection' => "Xmpp#unsetConecction"

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

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

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

@@ -196,6 +196,19 @@
 			 )
 		.appendTo(uiChatbox),
 		
+		
+		//Notification div
+    uiChatboxNotify = (self.uiChatboxNotify = $('<div></div>'))
+    .addClass('ui-widget-content ' + 
+       'ui-chatbox-notify'
+       )
+    .click(function(event) {
+        // anything?
+        self.uiChatboxNotify.fadeOut();
+    })
+    .appendTo(uiChatboxContent),
+		
+		
 		//VideoBox div
     uiVideobox = (self.uiVideobox = $('<div></div>'))
     .addClass('ui-widget-content ' + 
@@ -207,6 +220,7 @@
     })
     .appendTo(uiChatboxContent),
 		
+		
 		//ChatBoxLog
 	    uiChatboxLog = (self.uiChatboxLog = self.element)
 		//.show()
@@ -215,17 +229,6 @@
 			 )
 		.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 ' + 

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.2')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.9.0')
-  s.add_runtime_dependency('social_stream-events', '~> 0.6.1')
+  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.0')
+  s.add_runtime_dependency('social_stream-presence', '~> 0.5.2')
  
   # Development Gem dependencies
   #

data/spec/support/db.rb

@@ -1,3 +1,7 @@
+ActiveRecord::Base.connection.tables.each do |t|
+  ActiveRecord::Base.connection.drop_table t
+end
+
 gems = %w{ documents events linkser presence }
 
 gems.each do |g|
@@ -6,10 +10,6 @@ end
 
 gems.unshift("base")
 
-gems.reverse.each do |g|
-  "SocialStream::Migrations::#{ g.camelize }".constantize.new.down
-end
-
 gems.each do |g|
   "SocialStream::Migrations::#{ g.camelize }".constantize.new.up
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 0.19.2
+  version: 0.19.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,44 +10,44 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-01 00:00:00.000000000Z
+date: 2012-02-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &88831090 !ruby/object:Gem::Requirement
+  requirement: &87805300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.14.3
   type: :runtime
   prerelease: false
-  version_requirements: *88831090
+  version_requirements: *87805300
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
-  requirement: &88830720 !ruby/object:Gem::Requirement
+  requirement: &87805030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *88830720
+  version_requirements: *87805030
 - !ruby/object:Gem::Dependency
   name: social_stream-events
-  requirement: &88830370 !ruby/object:Gem::Requirement
+  requirement: &87804790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *88830370
+  version_requirements: *87804790
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
-  requirement: &88830030 !ruby/object:Gem::Requirement
+  requirement: &87804550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,21 +55,21 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *88830030
+  version_requirements: *87804550
 - !ruby/object:Gem::Dependency
   name: social_stream-presence
-  requirement: &88829670 !ruby/object:Gem::Requirement
+  requirement: &87804320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *88829670
+  version_requirements: *87804320
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &88829340 !ruby/object:Gem::Requirement
+  requirement: &87804090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *88829340
+  version_requirements: *87804090
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &88829040 !ruby/object:Gem::Requirement
+  requirement: &87803880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *88829040
+  version_requirements: *87803880
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &88828640 !ruby/object:Gem::Requirement
+  requirement: &87803630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *88828640
+  version_requirements: *87803630
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &88828340 !ruby/object:Gem::Requirement
+  requirement: &87803380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *88828340
+  version_requirements: *87803380
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &88828080 !ruby/object:Gem::Requirement
+  requirement: &87785500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *88828080
+  version_requirements: *87785500
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &88827830 !ruby/object:Gem::Requirement
+  requirement: &87785270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *88827830
+  version_requirements: *87785270
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &88827590 !ruby/object:Gem::Requirement
+  requirement: &87785040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,7 +143,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *88827590
+  version_requirements: *87785040
 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: 
@@ -460,6 +460,7 @@ files:
 - base/app/views/avatars/update.js.erb
 - base/app/views/cheesecake/_cheesecake.html.erb
 - base/app/views/cheesecake/_index.html.erb
+- base/app/views/cheesecake/_sector_form.html.erb
 - base/app/views/cheesecake/index.html.erb
 - base/app/views/cheesecake/update.js.erb
 - base/app/views/comments/_comment.html.erb
@@ -633,6 +634,7 @@ files:
 - base/app/views/users/show.xml.builder
 - base/config/locales/en.yml
 - base/config/locales/es.yml
+- base/config/locales/rails.es.yml
 - base/config/routes.rb
 - base/db/migrate/20110610112023_create_social_stream.rb
 - base/db/migrate/20110705103202_empty_ties_count.rb
@@ -645,6 +647,7 @@ files:
 - base/db/migrate/20120109081509_update_notify_permissions.rb
 - base/db/migrate/20120111120920_remove_language_default.rb
 - base/db/migrate/20120111141717_activity_channels.rb
+- base/db/migrate/20120201185454_singleton_single_relations.rb
 - base/lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb
 - base/lib/acts_as_taggable_on/social_stream.rb
 - base/lib/generators/social_stream/base/install_generator.rb
@@ -825,14 +828,14 @@ files:
 - documents/app/assets/images/16/zip.png
 - documents/app/assets/images/48/audio.png
 - documents/app/assets/images/48/default.png
-- documents/app/assets/images/48/excel.png
+- documents/app/assets/images/48/doc.png
 - documents/app/assets/images/48/mpeg.png
 - documents/app/assets/images/48/pdf.png
 - documents/app/assets/images/48/ppt.png
 - documents/app/assets/images/48/rar.png
 - documents/app/assets/images/48/resource.png
 - documents/app/assets/images/48/video.png
-- documents/app/assets/images/48/word.png
+- documents/app/assets/images/48/xls.png
 - documents/app/assets/images/48/zip.png
 - documents/app/assets/images/btn/btn_audio.png
 - documents/app/assets/images/btn/btn_document.png
@@ -1073,6 +1076,7 @@ files:
 - linkser/config/routes.rb
 - linkser/db/migrate/20111129100618_create_social_stream_linkser.rb
 - linkser/db/migrate/20111219122952_add_width_height_to_link.rb
+- linkser/db/migrate/20120202104549_add_links_foreign_key.rb
 - linkser/lib/generators/social_stream/linkser/install_generator.rb
 - linkser/lib/social_stream-linkser.rb
 - linkser/lib/social_stream/linkser/engine.rb
@@ -1191,6 +1195,7 @@ files:
 - 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_persistence.js
 - presence/app/assets/javascripts/chat_utilities.js
 - presence/app/assets/javascripts/chat_window_manager.js
 - presence/app/assets/javascripts/social_stream-presence.js