social_stream 0.21.3 → 0.21.4

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

@@ -237,7 +237,7 @@ div.chzn-container ul.chzn-choices li.search-field input{ cursor:pointer;}
   text-decoration: none;
 }
 .menu_plain_list li span {
-  padding: 5px 10px;
+  padding: 5px 7px;
   background-color: $secondary-color;
 }
 .menu_plain_list li span.selected {

data/base/app/assets/stylesheets/header.css.scss

@@ -1,7 +1,7 @@
 @import "colors";
 
 /****************** HEADER STRUCTURE ******/
-#headerFront {	width: 100%;	padding: 0;	background: $header-color;  padding: 0px 0px 0px 0px;}
+#headerFront {	width: 100%;	padding: 0px;	background: $header-color; }
 #header_left {	left: 0px;	float: left;	padding-left: 15px; padding-right: 5px; width:155px;}
 #header_right {	right: 0px;	float: right; padding-right: 10px;  }
 .banner_top{	width: 960px;	margin-left: auto;	margin-right: auto;	margin-top: 0px;

data/base/app/helpers/notifications_helper.rb

@@ -28,4 +28,10 @@ module NotificationsHelper
     end
   end
 
+  # Add notification_id param to URL in order to mark notification read
+  def notification_url_of(target, notification)
+    return polymorphic_url(target, :notification_id => notification.id) unless notification.nil?
+    polymorphic_url(target)
+  end
+
 end

data/base/app/models/activity.rb

@@ -17,6 +17,10 @@ class Activity < ActiveRecord::Base
   # See {SocialStream::Models::Channeled}
   channeled
 
+  # This has to be declared before 'has_ancestry' to work around rails issue #670
+  # See: https://github.com/rails/rails/issues/670
+  before_destroy :destroy_children_comments
+
   has_ancestry
 
   paginates_per 10
@@ -397,6 +401,15 @@ class Activity < ActiveRecord::Base
     direct_activity_object.increment!(:like_count)
   end
 
+  # before_destroy callback
+  #
+  # Destroy children comments when the activity is destroyed
+  def destroy_children_comments
+    comments.each do |c|
+      c.direct_object.destroy
+    end
+  end
+
   # after_destroy callback
   #
   # Decrement like counter in objects when like activity is destroyed

data/base/app/models/comment.rb

@@ -4,6 +4,13 @@ class Comment < ActiveRecord::Base
   alias_attribute :text, :description
   validates_presence_of :text
 
+  define_index do
+    indexes activity_object.description
+
+    has created_at
+  end
+
+
   def parent_post
     self.post_activity.parent.direct_object
   end

data/base/app/models/post.rb

@@ -5,7 +5,7 @@ class Post < ActiveRecord::Base
   validates_presence_of :text
 
   define_index do
-    indexes text
+    indexes activity_object.description
 
     has created_at
   end

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

@@ -0,0 +1,37 @@
+<% activity = comment.post_activity %>
+<%= div_for activity, :class => 'super_activity' do %>
+<div class="actor_logo">
+  <%= link_to image_tag(activity.sender_subject.logo.url(:actor),
+  :alt => activity.sender_subject.name),
+  activity.sender_subject %>
+</div>
+<div class="activity_content">
+  <div class="actor_name">
+    <%= activity.title(self) %>
+  </div>
+  <div class="activity_objects">
+    <%= link_to comment do%>
+      <% text = excerpt(strip_tags(comment.text),get_search_query_words.first,:radius => 180) || "" %>
+      <% if text.length < 400 %>
+        <% text = excerpt(strip_tags(comment.text),get_search_query_words.first,:radius => 540 - text.length) || "" %>
+      <% end %>
+      <%= highlight(text,get_search_query_words) %>
+      <% end %>
+  </div>
+  <div class="activity_options">
+    <div class="comment_time_ago">
+      <%= t('time.ago', :time => time_ago_in_words(activity.created_at)) %>
+    </div>
+    <% if user_signed_in? %>
+    ·
+    <%= link_to activity.audience_in_words(current_subject, :details => :summary),
+    'javascript:;',
+    :class => 'activity_audience_summary' %>
+    <div class="activity_audience">
+      <%= activity.audience_in_words(current_subject) %>
+    </div>
+    <% end %>
+  </div>
+</div>
+<% end %> 
+

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

@@ -0,0 +1,18 @@
+<% author = comment.author_subject %>
+<div class="model_with_details">
+  <div class="logo">
+    <%= link_to (image_tag(author.logo.url , :size => "50x50", :alt => author.name )), author  %>
+  </div>
+  <div class="sub-block">
+    <div class="brief">
+    <%= link_to comment do%>
+      <% text = excerpt(strip_tags(comment.text),get_search_query_words.first,:radius => 25) || "" %>
+      <% if text.length < 60 %>
+        <% text = excerpt(strip_tags(comment.text),get_search_query_words.first,:radius => 30 + (60 - text.length)) || "" %>
+      <% end %>
+      <%= highlight(text,get_search_query_words) %>
+      <% end %>
+      <br>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,3 @@
+<%= div_for comment, :class => 'content_size' do %>
+  <%= simple_format comment.text %>
+<% end %>

data/base/app/views/notifications/_index.html.erb

@@ -13,6 +13,7 @@
 
 <div class="conversations"> 
   <% @notifications.each do |notification|%>
+    <% @notification = notification %>
     <% read_class = notification.is_unread?(@actor) ? 'unread' : '' %>
     <%= render :partial => 'notification', :object => notification, :locals => {:read_class => read_class} %>
   <% end %>

data/base/app/views/notifications/activities/_like.html.erb

@@ -16,15 +16,15 @@
               :whose => t('notification.whose.'+ activity.receiver.subject.class.to_s.underscore,
                         :receiver => truncate_name(activity.receiver.name)),
               :thing => link_to(t(activity.direct_object.class.to_s.underscore+'.name'),
-                        polymorphic_url( activity.direct_object))) %>
+                        notification_url_of( activity.direct_object, @notification))) %>
   </div>
   <div class="briefing">
     <% if activity.direct_object.respond_to? :text %>
       "<%= link_to(sanitize(activity.direct_object.text.truncate(100, :separator =>' ')),
-                  polymorphic_url( activity.direct_object))%>"
+                  notification_url_of( activity.direct_object, @notification))%>"
     <% else%>
       <%= link_to(t('notification.watch_it'),
-                  polymorphic_url( activity.direct_object))%>
+                  notification_url_of( activity.direct_object, @notification))%>
     <%end%>
   </div>
-<% end %>
+<% end %>

data/base/app/views/notifications/activities/_like.text.erb

@@ -13,9 +13,9 @@
 
   <% if activity.direct_object.respond_to? :text %>
     "<%= sanitize(activity.direct_object.text.truncate(100, :separator =>' '))%>"
-  <%= raw t('notification.all_text', :url => polymorphic_url(activity.direct_object))%>
+  <%= raw t('notification.all_text', :url => notification_url_of(activity.direct_object, @notification))%>
   <% else%>
---><%= raw t('notification.watch', :url => polymorphic_url( activity.direct_object))%>
+--><%= raw t('notification.watch', :url => notification_url_of( activity.direct_object, @notification))%>
   <%end%>  
 <% end %>
 

data/base/app/views/notifications/activities/_post.html.erb

@@ -5,9 +5,9 @@
  :whose => t('notification.whose.'+ activity.receiver.subject.class.to_s.underscore,
             :receiver => truncate_name(activity.receiver.name)),
  :title => link_to(title_of(activity.direct_object),
-                   polymorphic_url(activity.direct_object))) %>
+                   notification_url_of(activity.direct_object, @notification))) %>
 </div>
 <div class="briefing">
-  "<%= link_to(description_of(activity.direct_object), polymorphic_url(activity.direct_object))%>"
+  "<%= link_to(description_of(activity.direct_object), notification_url_of(activity.direct_object, @notification))%>"
 </div>
  

data/base/app/views/notifications/activities/_post.text.erb

@@ -6,7 +6,7 @@
            :title => title_of(activity.direct_object)) %>
 
 "<%= description_of(activity.direct_object) %>"
---><%= t('notification.all_text', :url => polymorphic_url(activity.direct_object))%>
+--><%= t('notification.all_text', :url => notification_url_of(activity.direct_object, @notification))%>
 
 <%= raw t('notification.look', 
           :sender => truncate_name(activity.sender.name))%>: <%=polymorphic_url(activity.sender.subject)%>

data/base/app/views/notifications/activities/_update.html.erb

@@ -5,14 +5,14 @@
    :whose => t('notification.whose.'+ activity.receiver.subject.class.to_s.underscore,
               :receiver => truncate_name(activity.receiver.name)),
    :thing => link_to(t(activity.direct_object.class.to_s.underscore+'.one'),
-                     polymorphic_url( activity.direct_object))) %>
+                     notification_url_of( activity.direct_object, @notification))) %>
 </div>
 <div class="briefing">
   <% if activity.direct_object.respond_to? :text %>
     "<%= link_to(sanitize(activity.direct_object.text.truncate(100, :separator =>' ')),
-                     polymorphic_url(activity.direct_object))%>"
+                     notification_url_of(activity.direct_object, @notification))%>"
   <% else%>
     <%= link_to(t('notification.watch_it'),
-                polymorphic_url( activity.direct_object))%>
+                notification_url_of( activity.direct_object, @notification))%>
   <%end%>
 </div>

data/base/app/views/notifications/activities/_update.text.erb

@@ -6,10 +6,10 @@
 
 <% if activity.direct_object.respond_to? :text %>
   "<%= sanitize activity.direct_object.text.truncate(100, :separator =>' ')%>"
---><%= t('notification.all_text', :url => polymorphic_url(activity.direct_object))%>
+--><%= t('notification.all_text', :url => notification_url_of(activity.direct_object, @notification))%>
 <% else%>
-  <%= t('notification.watch', :url => polymorphic_url( activity.direct_object))%>
+  <%= t('notification.watch', :url => notification_url_of( activity.direct_object, @notification))%>
 <% end%>
 
 <%= raw t('notification.look', 
-          :sender => truncate_name(activity.sender.name))%>: <%=polymorphic_url(activity.sender.subject)%>
+          :sender => truncate_name(activity.sender.name))%>: <%=polymorphic_url(activity.sender.subject)%>

data/base/lib/social_stream-base.rb

@@ -10,6 +10,7 @@ module SocialStream
   autoload :TestHelpers, 'social_stream/test_helpers'
 
   module Controllers
+    autoload :MarkNotificationsRead,   'social_stream/controllers/mark_notifications_read'
     autoload :I18nIntegration,         'social_stream/controllers/i18n_integration'
     autoload :CancanDeviseIntegration, 'social_stream/controllers/cancan_devise_integration'
     autoload :Helpers,  'social_stream/controllers/helpers'
@@ -62,7 +63,7 @@ module SocialStream
   @@quick_search_models = [ :user, :group, :post ]
   
   mattr_accessor :extended_search_models
-  @@extended_search_models = [ :user, :group, :post ]
+  @@extended_search_models = [ :user, :group, :post, :comment ]
 
   mattr_accessor :cleditor_controls
   @@cleditor_controls = "bold italic underline strikethrough subscript superscript | size style | bullets | image link unlink"

data/base/lib/social_stream/base/engine.rb

@@ -31,6 +31,7 @@ module SocialStream
           include SocialStream::Controllers::Helpers
           include SocialStream::Controllers::CancanDeviseIntegration
           include SocialStream::Controllers::I18nIntegration
+          include SocialStream::Controllers::MarkNotificationsRead
         end
       end
 

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.16.1".freeze
+    VERSION = "0.16.2".freeze
   end
 end

data/base/lib/social_stream/controllers/mark_notifications_read.rb

@@ -0,0 +1,19 @@
+module SocialStream
+  module Controllers
+    # Common methods added to ApplicationController
+    module MarkNotificationsRead
+      extend ActiveSupport::Concern
+
+      included do
+         before_filter :mark_notifications_read
+      end
+
+      # Mark notifications read when following a link
+      def mark_notifications_read
+        return if params[:notification_id].blank? or !user_signed_in?
+        n = Notification.find(params[:notification_id])
+        current_subject.read n
+      end
+    end
+  end
+end

data/documents/app/models/audio.rb

@@ -8,9 +8,9 @@ class Audio < Document
   process_in_background :file    
   
   define_index do
-    indexes title
+    indexes activity_object.title
     indexes file_file_name, :as => :file_name
-    indexes description
+    indexes activity_object.description
     indexes activity_object.tags.name, :as => :tags
     
     has created_at

data/documents/app/models/document.rb

@@ -15,9 +15,9 @@ class Document < ActiveRecord::Base
   end
   
   define_index do
-    indexes title
+    indexes activity_object.title
     indexes file_file_name, :as => :file_name
-    indexes description
+    indexes activity_object.description
     indexes activity_object.tags.name, :as => :tags
     
     where "type IS NULL"

data/documents/app/models/picture.rb

@@ -8,9 +8,9 @@ class Picture < Document
                                }                              
                                
   define_index do
-    indexes title
+    indexes activity_object.title
     indexes file_file_name, :as => :file_name
-    indexes description
+    indexes activity_object.description
     indexes activity_object.tags.name, :as => :tags
     
     has created_at

data/documents/app/models/video.rb

@@ -13,9 +13,9 @@ class Video < Document
   process_in_background :file
   
   define_index do
-    indexes title
+    indexes activity_object.title
     indexes file_file_name, :as => :file_name
-    indexes description
+    indexes activity_object.description
     indexes activity_object.tags.name, :as => :tags
     
     has created_at

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.11.0".freeze
+    VERSION = "0.11.1".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.16.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.16.2')
   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.8.0".freeze
+    VERSION = "0.8.1".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.16.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.16.2')
   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.21.3".freeze
+  VERSION = "0.21.4".freeze
 end

data/linkser/app/models/link.rb

@@ -8,8 +8,8 @@ class Link < ActiveRecord::Base
   before_create :check_loaded
 
   define_index do
-    indexes title
-    indexes description
+    indexes activity_object.title
+    indexes activity_object.description
     indexes url
 
     has created_at

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Linkser
-    VERSION = "0.6.0".freeze
+    VERSION = "0.6.1".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.16.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.16.2')
   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

@@ -1,5 +1,4 @@
 var global;
-
 ////////////////////
 //Reconnect button interface functions
 ////////////////////
@@ -27,49 +26,25 @@ function requestConnectToChat(){
   } 
 }
 
+function changeChatHeaderTitle(msg){
+  if(mainChatBox==null){
+    $("#chat_header_title").html(msg)
+  } else {
+    changeMainChatBoxHeaderTitle(msg);
+  }
+}
+       
 
 ////////////////////
-//Chat interface: Connection boxes
+//Chat interface: Setting Functions
 ////////////////////
 
 var focusSearchContactsFlag=false;
+var changeSelectContactValueFlag = false;
 
-function setUserFunctions(){
-
-	settingTooltips();
-	
-	///////////////////////
-	//Open chatbox function
-	///////////////////////
-  $("div.user_presence").click(function(event, ui){
-    var guest_name = $(this).attr("name");
-    var guest_slug = $(this).attr("slug");
-    var guest_jid = guest_slug + "@" + domain;
-    
-    if (createChatBox(guest_slug, guest_name, guest_jid, user_name, user_jid)) {
-    } else {
-      window[getChatVariableFromSlug(guest_slug)].chatbox("option", "boxManager").toggleBox(true);
-    };
-  });
-  
-	
-	//Hide tooltips on mouseleave
-	$("div.user_presence").mouseleave(function(e){
-		var div = $(this);
-		$.each($(".tooltip:visible"), function(index, value) {
-			if ( $($(".tooltip:visible")[0]).html() == $(div).attr("name") ){
-				$($(".tooltip:visible")[index]).hide();
-			}
-		});
-  });
-  
-	
-	////////////////////
-	//Chat interface: Status selector
-	////////////////////
 
-  //JQuery DropdwanStatus
-  
+function settingStatusSelector(){
+  //JQuery DropdwanStatus 
   $(".dropdown dt a").click(function(event) {
     event.preventDefault();
     $(".dropdown dd ul").toggle();
@@ -81,7 +56,6 @@ function setUserFunctions(){
     }
     
     restartAwayTimer();
-    
   });
           
   $(".dropdown dd ul li a.option").click(function(event) { 
@@ -98,64 +72,41 @@ function setUserFunctions(){
   
   $(document).bind('click', function(e) {
     var $clicked = $(e.target);
-		
+    
     if (! $clicked.parents().hasClass("dropdown")){
       //Click outside the select...
         $(".dropdown dd ul").hide();
         setStatusWidgetTitle(userStatus);
     }
   });
-	
-	///////////////
-	//Search contacts enabling
-	///////////////
-	$("select.flexselect").flexselect({
-    allowMismatch: true,
-		defaultmessage: I18n.t('chat.zerocontacts')
-  });
-
-	$("#search_chat_contact_flexselect").Watermark(I18n.t('chat.search'),"#666");
-	
-	//Select contact function
-	//callback in changeSelectContactValue()
-
-  
-  $("#search_chat_contact_flexselect").focus(function(e) {
-		changeContactListVisibility(true);
-	});
-	
-	$("#search_chat_contact_flexselect").blur(function(e) {
-    changeContactListVisibility(false);
-  });
-
 }
 
 
-function changeSelectContactValue(name,value){
-
-  $("#search_chat_contact_flexselect").blur();
-
-	if(value == "ZERO_CONTACTS"){
-		return;
-	}
+function settingChatBoxFunctions(){
 	
-  var guest_slug = value;
-  var guest_name = name;
-  var guest_jid = guest_slug + "@" + domain;
-  if (createChatBox(guest_slug, guest_name, guest_jid, user_name, user_jid)) {
-  } else {
-    window[getChatVariableFromSlug(guest_slug)].chatbox("option", "boxManager").toggleBox(true);
-  };
-  
-  //Check for online status and show notification
-  if (getAllConnectedSlugs().indexOf(guest_slug)==-1) {
-		showOfflineChatNotificationForSlug(guest_slug);
-  }
+  $("div.user_presence").click(function(event, ui){
+    var guest_name = $(this).attr("name");
+    var guest_slug = $(this).attr("slug");
+    var guest_jid = guest_slug + "@" + domain;
+    
+    if (createChatBox(guest_slug, guest_name, guest_jid, user_name, user_jid)) {
+    } else {
+      window[getChatVariableFromSlug(guest_slug)].chatbox("option", "boxManager").toggleBox(true);
+    };
+  });
   
-	changeContactListVisibility(false);
+  //Hide tooltips on mouseleave
+  $("div.user_presence").mouseleave(function(e){
+    var div = $(this);
+    $.each($(".tooltip:visible"), function(index, value) {
+      if ( $($(".tooltip:visible")[0]).html() == $(div).attr("name") ){
+        $($(".tooltip:visible")[index]).hide();
+      }
+    });
+  });
+	
 }
 
-
 function settingTooltips(){
   if (mainChatBox == null) {
     //Enabling default tooltips
@@ -177,14 +128,65 @@ function settingTooltips(){
       opacity: 0.95,
       relative: false,
       position: 'top left',
-      offset: [0,37]
+      offset: [0,31]
     });
   }
 }
 
+function settingSearchContactFunctions(){
+
+  $("#chat_partial select.flexselect").flexselect({
+    allowMismatch: true,
+    defaultmessage: I18n.t('chat.zerocontacts')
+  });
+
+  $("#chat_partial #search_chat_contact_flexselect").Watermark(I18n.t('chat.search'),"#666");
+  
+  //Select contact function
+  //callback in changeSelectContactValue()
+
+  
+  $("#chat_partial #search_chat_contact_flexselect").focus(function(e) {
+    changeContactListVisibility(true);
+  });
+  
+  $("#chat_partial #search_chat_contact_flexselect").blur(function(e) {
+    changeContactListVisibility(false);
+  });
+}
+
+function setAllUserFunctions(){
+	settingStatusSelector();
+  settingChatBoxFunctions();
+  settingTooltips();
+}
+
+
+function changeSelectContactValue(name,valueSelectedInSearchContacts){
+
+	if((valueSelectedInSearchContacts != "ZERO_CONTACTS")&&(valueSelectedInSearchContacts != "")){
+		var guest_slug = valueSelectedInSearchContacts;
+    var guest_name = getNameFromSlug(guest_slug);
+    var guest_jid = guest_slug + "@" + domain;
+  
+	  if (createChatBox(guest_slug, guest_name, guest_jid, user_name, user_jid)) {
+	  } else {
+	    window[getChatVariableFromSlug(guest_slug)].chatbox("option", "boxManager").toggleBox(true);
+	  };
+  
+	  //Check for online status and show notification
+	  if (! isSlugChatConnected(guest_slug)) {
+	    showOfflineChatNotificationForSlug(guest_slug);
+	  }
+	}
+  
+	$("#chat_partial #search_chat_contact_flexselect").blur();
+	changeContactListVisibility(false);
+}
+
 
 function changeContactListVisibility(visible){
-  var nItems = $("#search_chat_contact_flexselect_dropdown ul li").length-1;
+  var nItems = getAllSlugsLength();
 	if (visible){
 		  focusSearchContactsFlag=true;
 		  if(nItems > 9){
@@ -207,7 +209,6 @@ function setStatusWidgetTitle(status){
 		status = sstreamChatStatus[status];
 	}
 	
-	
   if ($(".dropdown dt a span").length == 0){
     return;
   }
@@ -286,17 +287,27 @@ function refreshChatWindow(){
 }
 
 
-function updateChatWindow(){
-  timerCounter=0;
-  log("updateChatWindow()");
-  var stropheConnectedAndOnlineStatus = ((isStropheConnected()) && (userStatus!="offline") && (!disconnectionFlag));
-  $.post("/chatWindow", { userConnected: stropheConnectedAndOnlineStatus }, function(data){
-      $(".tooltip").hide() //Prevent tooltips
-      $("#chat_partial").html(modifyChatPartialIfMainBox(data));
+function updateChatWindow(){	
+	var stropheConnectedAndOnlineStatus = ((isStropheConnected()) && (userStatus!="offline") && (!disconnectionFlag));
+	timerCounter=0;
+	
+	log("updateChatWindow()");
+	log("Connected " + stropheConnectedAndOnlineStatus);
+	
+	if(! stropheConnectedAndOnlineStatus){
+		loadDisconnectionDiv();
+		updateConnectedUsersOfMainChatBox();
+		return;
+	}
+	 
+  $.post("/chatWindow", { }, function(data){	
+		  //Prevent tooltips
+      $(".tooltip").hide() 
+			loadWidgetsDiv(data);
+			hideConnectionBoxesFromDisconnectedSlugs();
+			setAllUserFunctions();
 			updateConnectedUsersOfMainChatBox();
       if (isStropheConnected()) {
-        setStatusWidgetTitle(userStatus);
-				setUserFunctions();
         if (afterNewConnectionFlag){
           afterNewConnectionFlag = false;
 					if(afterFirstConnectionFlag){
@@ -310,55 +321,158 @@ function updateChatWindow(){
   });
 }
 
-function getConnectionBoxFromSlug(slug){
-  if ($('div.user_presence[slug=' + slug + ']').length > 0){
-    return ($('div.user_presence[slug=' + slug + ']'))[0];
-  }  else {
-    return null;
-  }
-}
 
-var cacheConnectedUsers = [];
+//////////////
+//Divs Load
+//////////////
 
-function hideConnectionBoxFromSlug(slug){
-  if ($('div.user_presence[slug=' + slug + ']').length > 0){
-    $('div.user_presence[slug=' + slug + ']').hide();
-    if(cacheConnectedUsers.indexOf(slug)==-1){
-      cacheConnectedUsers.push(slug);
+function loadConnectingDiv(){
+  $("#chat_partial").html($("#chat_connecting").html());
+}
+
+function loadDisconnectionDiv(){
+	$("#chat_partial").html(modifyChatPartialIfMainBox($("#chat_connection_off").html()));
+	
+	$('.connectChatButton').bind('click', function () {
+    if (requestConnectToChat()){
+      if (authByCookie()) {
+        connectToChat(user_jid,cookie,null);
+      } else {
+        connectToChat(user_jid,null,$('#user_password').val());
+      }
     }
-		updateMainChatBoxAfterUserDisconnect();
+  });
+  
+  if (authByCookie()){
+    $("#chat_partial #passwordFormChat").hide();
+  } else {
+		//Authentication by password
 		
-		//Last user disconnected?
-		if (getAllConnectedSlugs().length ==0){
-			if($(".users_connected p.zero_users_connected").length > 0){
-				$(".users_connected p.zero_users_connected").show();
-			} else {
-				var msg = I18n.t('chat.zerousers');
-        $(".users_connected").append('<p class="zero_users_connected">' + msg + '</p>')
-			}
+		$('.storePass').bind('click', function () {
+      storePassword();
+    });
+		
+    if ((window.sessionStorage) && (sessionStorage.getItem("ss_user_pass") != null)) {
+      $("#chat_partial #passwordFormChat").hide()
+    } else {
+      $("#chat_partial #passwordFormChat").show();
     }
   }
 }
 
+
+function loadWidgetsDiv(data){
+  $("#chat_partial").html(modifyChatPartialIfMainBox($("#chat_widgets").html()));
+  $("#chat_partial").append(data);
+	fillSearchContactSelect();
+	settingSearchContactFunctions();
+}
+
+function fillSearchContactSelect(){
+	$("#chat_partial #search_chat_contact").children().remove()
+	$("#chat_partial #search_chat_contact").append('<option value=""></option>')
+	$.each(getAllSlugs(), function(index, value) {
+     $("#chat_partial #search_chat_contact").append('<option value=' + value + '>' + getNameFromSlug(value) + '</option>')
+  });
+}
+
+
+
+/////////////////////
+// Connection Box Management
+/////////////////////
+
+function hideConnectionBoxesFromDisconnectedSlugs(){
+  $('div.user_presence[slug][connected="false"]').hide();
+}
+
+function hideConnectionBoxFromSlug(slug){
+  $('div.user_presence[slug=' + slug + ']').attr("connected","false");
+  $('div.user_presence[slug=' + slug + ']').hide();
+}
+
 function showConnectionBoxFromSlug(slug){
-  if ($('div.user_presence[slug=' + slug + ']').length > 0){
-    if (!($('div.user_presence[slug=' + slug + ']').is(":visible"))){
-       $('div.user_presence[slug=' + slug + ']').show();
-			 $(".users_connected p.zero_users_connected").hide();
+	$('div.user_presence[slug=' + slug + ']').attr("connected","true");
+  $('div.user_presence[slug=' + slug + ']').show();
+}
+
+function updateInterfaceAfterPresenceStanza(slug,available){
+	if(available){
+		showConnectionBoxFromSlug(slug);
+		hideChatNotificationForSlug(slug);
+	} else {
+		hideConnectionBoxFromSlug(slug);
+		showOfflineChatNotificationForSlug(slug);
+	}
+  updateMainChatBoxAfterConnectionBoxChanges();
+	checkForZeroUsersConnected();
+}
+
+function checkForZeroUsersConnected(){
+  if (getConnectedSlugsLength() == 0){
+    if($(".users_connected p.zero_users_connected").length > 0){
+      $(".users_connected p.zero_users_connected").show();
+    } else {
+      var msg = I18n.t('chat.zerousers');
+      $(".users_connected").append('<p class="zero_users_connected">' + msg + '</p>')
     }
-  }
+  } else {
+		$(".users_connected p.zero_users_connected").hide();
+	}
 }
 
+
+////////////////////
+// Set Status Interface
+////////////////////
+
 function setUserIconStatus(slug, status){
    if (status in statusIcons) {
      var iconName = statusIcons[status];
      var $img_status = $('img.presence_status');
 		 var path = '<%=image_path("status")%>';
-     connectionBox = getConnectionBoxFromSlug(slug);
+     var connectionBox = getConnectionBoxFromSlug(slug);
      $(connectionBox).find($img_status).attr("src", path + "/" + iconName + ".png")
    }
 }
 
+
+//////////////////////
+//Getters and Setters
+//////////////////////
+
+function getConnectionBoxFromSlug(slug){
+  if ($('div.user_presence[slug=' + slug + ']').length > 0){
+    return ($('div.user_presence[slug=' + slug + ']'))[0];
+  }  else {
+    return null;
+  }
+}
+
+function isSlugChatConnected(slug){
+  return $('div.user_presence[slug=' + slug + ']').attr("connected")=="true";
+}
+
+function existsSlugChatBox(slug){
+	return getConnectionBoxFromSlug(slug)!=null;
+}
+
+function getConnectedSlugsLength(){
+  return $('div.user_presence[slug][connected="true"]').length;
+}
+
+function getAllSlugsLength(){
+	return $('div.user_presence[slug]').length;
+}
+
+function getDisconnectedSlugsLength(){
+   return $('div.user_presence[slug][connected="false"]').length;
+}
+
+function getAllSlugs(){
+	return getAllSlugsByChatConnectedState()[2];
+}
+
 function getAllConnectedSlugs(){
   return getAllSlugsByChatConnectedState()[0];
 }
@@ -371,9 +485,9 @@ function getAllSlugsByChatConnectedState(){
   var onlineSlugs=[];
 	var offlineSlugs=[];
 	var allSlugs=[];
-  connectionBoxes = $('div.user_presence[slug]');
+  var connectionBoxes = $('div.user_presence[slug]');
   $.each(connectionBoxes, function(index, value) {
-    if($(value).css("display")!="none"){
+    if($(value).attr("connected")=="true"){
         onlineSlugs.push($(value).attr("slug"))
     } else {
 				offlineSlugs.push($(value).attr("slug"))
@@ -383,6 +497,8 @@ function getAllSlugsByChatConnectedState(){
   return [onlineSlugs,offlineSlugs,allSlugs]
 }
 
+
+
 ////////////////////
 //Insert received message in chatbox
 ////////////////////
@@ -394,17 +510,20 @@ function putReceivedMessageOnChatWindow(from_jid,from_slug,body,msgID){
     return;
    }
   
-  //Check for from_slug name and connectionBox visibility
-  if (typeof($('div.user_presence[slug=' + from_slug + ']').attr('name')) == 'undefined') {
+  //Check slug connection and slugs connectionBox
+  if (existsSlugChatBox(from_slug)) {
     //No connectionBox for this user!
-    var from_name = from_slug;
-    refreshChatWindow();
+    var from_name = getNameFromSlug(from_slug);
+		if(! isAdminSlug(from_slug)){
+			refreshChatWindow();
+		}
   } else {
-    showConnectionBoxFromSlug(from_slug);
+		if(! isSlugChatConnected(from_slug)){
+			updateInterfaceAfterPresenceStanza(from_slug,"true");
+		}
     var from_name = $('div.user_presence[slug=' + from_slug + ']').attr('name');
   }
   
-  
   //Create or toggle from_slug's chatBox.
   if (createChatBox(from_slug, from_name, from_jid, user_name, user_jid)) {
   } else {
@@ -436,15 +555,16 @@ function putReceivedMessageOnChatWindow(from_jid,from_slug,body,msgID){
 //Notifications on chat Window
 ////////////////////
 
-function showChatNotification(notification,msg){
-  notification.html("<p class==\"ui-chatbox-notify-text\">" + msg + "</p>");
-  notification.css("visibility","visible");
+function showChatNotification(notification,type,msg){
+  notification.html("<p notification_type=\"" + type + "\" class=\"ui-chatbox-notify-text\">" + msg + "</p>");
+  notification.css("display","block");
+	notification.css("visibility","visible");
   notification.fadeIn();
 }
 
-function showChatNotificationForSlug(slug,msg){
+function showChatNotificationForSlug(slug,type,msg){
   var notification = $("#" + slug).parent().find("div.ui-chatbox-notify");
-  showChatNotification(notification,msg);
+  showChatNotification(notification,type,msg);
 }
 
 function showOfflineChatNotificationForSlug(slug){
@@ -452,13 +572,14 @@ function showOfflineChatNotificationForSlug(slug){
 	if(slug_chat_box!=null){
 		var name = slug_chat_box.attr("name")
     var msg =  name + ' ' + I18n.t('chat.notify.guestOffline');
-    showChatNotificationForSlug(slug,msg);
+    showChatNotificationForSlug(slug,"guestOffline",msg);
 	}
 }
 
 function hideChatNotification(notification){
   notification.fadeOut();
-  notification.css("visibility","hidden");
+  notification.css("display","none");
+	notification.css("visibility","hidden");
 }
 
 function hideChatNotificationForSlug(slug){
@@ -469,7 +590,7 @@ function hideChatNotificationForSlug(slug){
 function notifyWhenUsersDisconnect(){
   var notification = $("div.ui-chatbox-notify");
   var msg = I18n.t('chat.notify.offline');
-  showChatNotification(notification,msg);
+  showChatNotification(notification,"userOffline",msg);
 }
 
 function hideAllNotifications(){
@@ -496,8 +617,9 @@ function updateAllNotifications(){
 
 function updateConnectedUsersOfMainChatBox(){
   if(mainChatBox!=null){
-		if(isStropheConnected()){
-			var connectedUsers = getAllConnectedSlugs().length;
+		var stropheConnectedAndOnlineStatus = ((isStropheConnected()) && (userStatus!="offline") && (!disconnectionFlag));
+		if(stropheConnectedAndOnlineStatus){
+			var connectedUsers = getConnectedSlugsLength();
       changeMainChatBoxHeaderTitle( I18n.t('chat.title') + " (" + connectedUsers + ")");
       changeMainChatBoxHeight(getChatBoxHeightRequiredForConnectionBoxes());
 		} else {
@@ -510,8 +632,7 @@ function updateConnectedUsersOfMainChatBox(){
   }
 }
 
-
-function updateMainChatBoxAfterUserDisconnect(){
+function updateMainChatBoxAfterConnectionBoxChanges(){
   changeMainChatBoxHeight(getChatBoxHeightRequiredForConnectionBoxes());
   updateConnectedUsersOfMainChatBox();
 }