social_stream 0.20.1 → 0.20.2

data/base/app/assets/javascripts/cheesecake.js

@@ -3,4 +3,4 @@ window.requestAnimFrame = (function(callback) {
 	function(callback) {
 		window.setTimeout(callback, 1000 / 60);
 	};
-})();
+})();

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

@@ -8,6 +8,7 @@ $success-background: #DFF2BF;
 
 /**BLUES**/
 $auxiliar-color: #879EB5;
+$auxiliar-bright-color: #97AEC5;
 $input-border-color: #BDC7D8;
 $main-color: #1F4A75; /* #2A3890*/
 $secondary-color: #DEEFF8; /* #E0EEF5*/

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

@@ -11,6 +11,7 @@
   left: 410px;
   display: none;
   z-index: 3000;
+  cursor: pointer;
 }
 #edit_sector_button img {
   width: 24px;
@@ -30,8 +31,13 @@
   width: 0px;
   padding: 0px;
   margin: 0px;
+  overflow-y: visible;
+  overflow-x: hidden;
+}
+#sector_editor .truncate {
+  white-space: nowrap;
   overflow: hidden;
-  height: 450px;
+  text-overflow: ellipsis;
 }
 #contacts_explorer {
   float: right;
@@ -108,7 +114,6 @@
   height: 30px;
   text-align: right;
   float: left;
-  margin-right: 20px;
 }
 #contacts_save_form {
   overflow: visible; 
@@ -127,7 +132,7 @@
   width: 130px;
   height: 25px;
   float: left;
-  margin-top: 10px;
+  margin: 10px 0px 0px 20px;
   cursor: pointer;
 }
 #contacts_changes_title {
@@ -162,8 +167,7 @@
   display: none;
   width: 514px;
   height: 340px;
-  top: 145px !important;
-  left: 460px !important;
+  top: 135px !important;
 }
 .contacts_changes_tipsy_menu.tipsy .tipsy-arrow {
   display: none;
@@ -270,7 +274,6 @@
 }
 #sector_form {
   width: 300px;
-  height: 450px;
   float: right;
 }
 #sector_form .title {
@@ -282,6 +285,8 @@
 #sector_form .title #edited_sector_name {
   font-size: 14px;
   font-weight: bold;
+  max-width: 150px;
+  display: inline-block;
 }
 #sector_form #edited_sector_color_out {
   border: 1px solid $main-color;
@@ -295,12 +300,28 @@
   width: 14px;
   height: 14px;
 }
+#sector_form .form_row.less_padding {
+  padding: 2px 0px 2px 20px;
+}
 #sector_form .subsector {
-  border: 1px solid $input-border-color;
-  background: $fill-color;
+  border: 1px solid $main-color;
+  background: $secondary-color;
   width: 260px;
   min-height: 20px;
 }
+#sector_form .add_subsector {
+  border: 1px solid $main-color;
+  color: $main-color;
+  background: $auxiliar-color;
+  width: 260px;
+  height: 20px;
+  text-align: center;
+  font-size: 15px;
+  font-weight: bold;
+}
+#sector_form .add_subsector:hover {
+  background: $auxiliar-bright-color;
+}
 #sector_form .subsector .title {
   width: 260px;
   text-align: center;
@@ -310,4 +331,30 @@
 #sector_form .subsector .title .edited_subsector_name {
   font-size: 11px;
   font-weight: bold;
+  max-width: 150px;
+  display: inline-block;
+}
+.permissions_explanation {
+
+}
+.permissions_explanation_tipsy_menu.tipsy {
+  border: 1px solid $main-color;
+  background: $secondary-color;
+  box-shadow: 0 0 5px #000000;
+  -webkit-box-shadow: 0 0 5px #000000;
+  -moz-box-shadow: 0 0 5px #000000;
+  overflow: hidden;
+  max-width: 300px;
+  width: 300px;
+  padding-top: 3px;
+}
+.permissions_explanation_tipsy_menu.tipsy .tipsy-arrow {
+  display: none;
+}
+.permissions_explanation_tipsy_menu.tipsy .tipsy-inner {
+  max-width: 300px;
+  text-align: left;
+}
+.permissions_explanation_tipsy_menu.tipsy .tipsy-inner .permission {
+  padding-top: 3px;
 }

data/base/app/controllers/contacts_controller.rb

@@ -20,11 +20,12 @@ class ContactsController < ApplicationController
   end
 
   def update
+    # Record who is manipulating the contact, mainly in groups
+    @contact.user_author = current_user
+
     # FIXME: This should be in the model
     params[:contact][:relation_ids].present? &&
-     params[:contact][:relation_ids].delete("0")
-
-    params[:contact][:user_author] = current_user
+      params[:contact][:relation_ids].delete("0")
 
     if @contact.update_attributes(params[:contact])
       redirect_to @contact.receiver_subject

data/base/app/views/cheesecake/_cheesecake.html.erb

@@ -38,11 +38,8 @@ $(function(){
   cheese.syncSectorFocusCallbacks = false;
   cheese.onSectorFocusBegin = function(cheesecake,callback){
     if((cheese.highlightedSector)&&(cheese.highlightedSector.auxiliar)){
-      $("#contacts_explorer").animate({width: 0},500,function(){        
-        $("#contacts_explorer").hide();
-      });
-      $("#sector_editor").show();
-      $("#sector_editor").animate({width: 300},500);
+      $("#sector_editor").data("prepare")(cheese);
+      $("#sector_editor").data("show")();
     }else{
       $("#contacts_grid_available").fadeOut("fast", callback);      
     }
@@ -52,6 +49,7 @@ $(function(){
       
     }else{
       $("#contacts_grid_available").fadeIn("fast");
+      $("#edit_sector_button").on("click.edit", cheese, $("#edit_sector_button").data("edit_sector_click"));
       $("#edit_sector_button").fadeIn("fast");
     }
   };
@@ -60,19 +58,20 @@ $(function(){
       
     }else{
       $("#contacts_grid_available").fadeOut("fast", callback);
+      $("#edit_sector_button").off("click");
       $("#edit_sector_button").fadeOut("fast");
     }
   };
   cheese.onSectorUnfocusEnd = function(cheesecake){
     if((cheese.highlightedSector)&&(cheese.highlightedSector.auxiliar)){
-      $("#sector_editor").animate({width: 0},500,function(){
-        $("#sector_editor").hide();
-      });
-      $("#contacts_explorer").show();
-      $("#contacts_explorer").animate({width: 300},500);
+      
     }else{
       $("#contacts_grid_available").fadeIn("fast");      
     }
+    if($("#sector_editor").width() > 0){
+      $("#edit_sector_button").html("<%= escape_javascript image_tag "btn/cheese_edit.png" %>");
+      $("#sector_editor").data("hide")();
+    }
   };
   $("#contacts_filter_input").keyup(function(){
     cheese.searchEngine.filter($("#contacts_filter_input").val());

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

@@ -103,33 +103,87 @@
       $("#contacts_changes_button").tipsy("hide");
     }else{
       $("#contacts_changes_button").tipsy("show");
-      $("#contacts_changes_title").click(function(){
+      $(".contacts_changes_tipsy_menu").css({left: $("#cheesecake").offset().left + 132})
+      $(window).on("resize.contacs_changes",function(){
+        $(".contacts_changes_tipsy_menu").css({left: $("#cheesecake").offset().left + 132})
+      });
+      $("#contacts_changes_title").on("click",function(){
         $("#contacts_changes_button").tipsy("hide");
       });
     }
   });
-  var edit_sector_click = function(){
+  $("#sector_editor").data("show", function(callback){
+    $("#contacts_explorer").stop().animate({width: 0},500);
+    $("#sector_editor").stop().animate({width: 300},500, function(){
+      if(callback) callback();
+    });
+  });
+  $("#sector_editor").data("hide", function(callback){
+    $("#sector_editor").stop().animate({width: 0},500, function(){
+      $(".add_subsector_clone").remove();
+    });
+    $("#contacts_explorer").stop().animate({width: 300},500, function(){
+      if(callback) callback();
+    });
+  });
+  $("#sector_editor").data("prepare", function(cheese){
+    var sector = cheese.getFocusedSector();
+    var subsector_count = sector.subsectors.length;
+    var original_add_sector_row = $("#original_add_subsector_row");
+    if(sector){
+      $("#form_sector_name").val(sector.label);
+      $("#edited_sector_name").html(sector.label);
+      $("#form_sector_name").off("keyup");
+      $("#form_sector_name").on("keyup",function(){
+        $("#edited_sector_name").html($("#form_sector_name").val());
+        sector.changeLabel($("#form_sector_name").val());
+      });
+      $(".add_subsector_clone").remove();
+      for(var i = 0; i < 4; i++){
+        var subsector = sector.subsectors[i];
+        if(subsector){
+          var add_subsector_clone = original_add_sector_row.clone().attr("id", "add_subsector_" + i).addClass("add_subsector_clone").show();          
+          $("#subsector_" + i).parent().before(add_subsector_clone);
+          $("#form_subsector_name_" + i).val(subsector.label);
+          $("#edited_subsector_name_" + i).html(subsector.label);
+          $("#form_subsector_name_" + i).off("keyup");
+          $("#form_subsector_name_" + i).on("keyup", [i,subsector],function(event){
+            $("#edited_subsector_name_" + event.data[0]).html($("#form_subsector_name_" + event.data[0]).val());
+            event.data[1].changeLabel($("#form_subsector_name_" + event.data[0]).val());
+          });
+          $("#subsector_" + i).show();
+        }else{
+          if(sector.subsectors[i-1]){
+            var add_subsector_clone = original_add_sector_row.clone().attr("id", "add_subsector_" + i).addClass("add_subsector_clone").show();          
+            $("#subsector_" + (i-1)).parent().after(add_subsector_clone);
+          }
+          $("#subsector_" + i).hide();
+        }
+      }
+    }
+  });
+  $("#edit_sector_button").data("edit_sector_click", function(event){
+    var cheese = event.data;
     $("#edit_sector_button").off("click.edit");
     $("#edit_sector_button").fadeOut("fast",function(){
       $("#edit_sector_button").html("<%= escape_javascript image_tag "btn/cheese_close_edit.png" %>");
       $("#edit_sector_button").fadeIn("fast");
     });
-    $("#contacts_explorer").stop().animate({width: 0},500);
-    $("#sector_editor").stop().animate({width: 300},500, function(){
-      $("#edit_sector_button").on("click.close_edit",close_edit_sector_click);
+    $("#sector_editor").data("prepare")(cheese);
+    $("#sector_editor").data("show")(function(){
+      $("#edit_sector_button").on("click.close_edit", cheese, $("#edit_sector_button").data("close_edit_sector_click"));
     });
-  }
-  var close_edit_sector_click = function(){
+  });
+  $("#edit_sector_button").data("close_edit_sector_click", function(event){
+    var cheese = event.data;
     $("#edit_sector_button").off("click.close_edit");
     $("#edit_sector_button").fadeOut("fast",function(){
       $("#edit_sector_button").html("<%= escape_javascript image_tag "btn/cheese_edit.png" %>");
       $("#edit_sector_button").fadeIn("fast");
     });
-    $("#sector_editor").stop().animate({width: 0},500);
-    $("#contacts_explorer").stop().animate({width: 300},500,function(){
-      $("#edit_sector_button").on("click.edit",edit_sector_click);
+    $("#sector_editor").data("hide")(function(){
+      $("#edit_sector_button").on("click.edit", cheese, $("#edit_sector_button").data("edit_sector_click"));
     });
-  }
-  $("#edit_sector_button").on("click.edit",edit_sector_click);
+  });
   <%= render :partial => 'cheesecake' %>
 <% end %>

data/base/app/views/cheesecake/_sector_form.html.erb

@@ -1,19 +1,19 @@
 <form id="sector_form">
 	<div class="title">
-		Editing <span id="edited_sector_name">New sector</span>
+		<%= t('cheesecake.form.editing')%> <div id="edited_sector_name" class="truncate">New sector</div>
 	</div>
 	<div class="block">
-		<div class="form_row">
+		<div class="form_row less_padding">
 			<div class="form_label">
-				Name:
+				<%= t('cheesecake.form.fields.name')%>:
 			</div>
 			<div class="form_field">
-				<input type="text" class="form_tag" value="New sector">
+				<input type="text" id="form_sector_name" class="form_tag" value="New sector">
 			</div>
 		</div>
-		<div class="form_row">
+		<div class="form_row less_padding">
 			<div class="form_label">
-				Color:
+				<%= t('cheesecake.form.fields.color')%>:
 			</div>
 			<div class="form_field">
 				<div id="edited_sector_color_out">
@@ -21,41 +21,46 @@
 				</div>
 			</div>
 		</div>
-		<% for i in 1..4 do %>
-		<div class="form_row">
-			<div class="subsector">
+		<div class="form_row less_padding" id="original_add_subsector_row" style="display:none;">
+		  <div class="add_subsector">
+		    +
+		  </div>
+		</div>
+		<% for i in 0..3 do %>
+		<div class="form_row less_padding">
+			<div class="subsector" id="subsector_<%= i %>">
 				<div class="title">
-					Subsector <span class="edited_subsector_name">New subsector <%= i %></span>
+					<%= t('cheesecake.form.fields.subsector')%> <div class="edited_subsector_name truncate" id="edited_subsector_name_<%= i %>">New subsector <%= i %></div>
 				</div>
-				<div class="content" <%= i==1 ? '' : 'style=display:none;' %>>
+				<div class="content" <%= i==0 ? '' : 'style=display:none;' %>>
 					<div class="form_row">
 						<div class="form_label">
-							Name:
+							<%= t('cheesecake.form.fields.name')%>:
 						</div>
 						<div class="form_field">
-							<input type="text" class="form_tag" value="New subsector <%= i %>">
+							<input type="text" class="form_tag" class="form_subsector_name" id="form_subsector_name_<%= i %>" value="New subsector <%= i %>">
 						</div>
 					</div>
-					<div class="form_row">
+					<div class="form_row less_padding">
 						<div class="form_label">
-							Permissions:
+							<%= t('cheesecake.form.fields.permissions')%>:
 						</div>
 					</div>
-					<div class="form_row">
-						<div class="form_field">
-							<table class="tableCheckBoxOptions">
-								<% default_permissions.each_with_index do |p, i| %>
-								<tr>
-									<td>
-									<div contain=<%= dom_id p %> class="checkboxPermissionOptionLeft">
-										<input id=<%= dom_id p %> class="permission" type="checkbox"/>
-										<label for=<%= dom_id p %>><%= p.description(:brief) %></label>
-										<div class="clearfloat"></div>
-									</div></td>
-								</tr>
-								<% end %>
-							</table>
+					<div class="form_row less_padding">
+						<div class="form_field permissions_field">
+							<% default_permissions.each_with_index do |p, i| %>
+								<div contain=<%= dom_id p %> class="checkboxPermissionOptionLeft">
+									<input class="permission <%= dom_id p %>" type="checkbox"/>
+									<label for=<%= dom_id p %>><%= p.description(:brief) %></label>
+									<div class="clearfloat"></div>
+								</div>
+							<% end %>
 						</div>
+						<div class="permissions_explanation" style="display:none;">
+						  <% default_permissions.each_with_index do |p, i| %>
+                  <div class="permission <%= dom_id p %>"> <%= p.description(:detailed) %></div>
+              <% end %>
+					  </div>
 					</div>
 				</div>
 			</div>
@@ -78,4 +83,19 @@
       }
     })
   });
+  $(".permissions_field").each(function(){
+    $(this).tipsy({
+      delayIn: 500,
+      delayOut: 0,
+      gravity: 'e',
+      offset: 100,
+      opacity: 1,
+      className: 'permissions_explanation_tipsy_menu',
+      html: true,
+      hoverable: true,
+      title: function(){
+        return $(this).parent().find('.permissions_explanation').html();
+      }
+    });
+  });  
 <% end %>

data/base/config/locales/en.yml

@@ -97,6 +97,13 @@ en:
       none: "No changes"
       save: "Save changes"
       saving: "Saving..."
+    form:
+      editing: "Editing"
+      fields:
+        color: "Color"
+        name: "Name"
+        permissions: "Permissions"
+        subsector: "Subsector"
     select:
       hint: "Select by clicking the portraits"
   comment:
@@ -106,6 +113,7 @@ en:
     one: "a comment"
     view_all: "View all comments"
   contact:
+    addressbook: "Addressbook"
     all_n: "All contacts (%{count})"
     confirm_delete: "Delete contact?"
     current: "Current"

data/base/config/locales/es.yml

@@ -96,7 +96,14 @@ es:
       details: "Cambios detallados"
       none: "Sin cambios"
       save: "Guardar cambios"
-      saving: "Guardando..."
+      saving: "Guardando..."      
+    form:
+      editing: "Editando"
+      fields:
+        color: "Color"
+        name: "Nombre"
+        permissions: "Permisos"
+        subsector: "Subsector"
     select:
       hint: "Selecciona haciendo click en los retratos"
   comment:
@@ -106,6 +113,7 @@ es:
     one: "un comentario"
     view_all: "Ver todos los comentarios"
   contact:
+    addressbook: "Libreta de direcciones"
     all_n: "Todos los contactos (%{count})"
     confirm_delete: "¿Borrar contacto?"
     current: "Actuales"

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.15.1".freeze
+    VERSION = "0.15.2".freeze
   end
 end

data/base/spec/controllers/contacts_controller_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe ContactsController do
+  include SocialStream::TestHelpers
+  include SocialStream::TestHelpers::Controllers
 
   render_views
 
@@ -108,4 +110,26 @@ describe ContactsController do
       response.should redirect_to(home_path)
     end
   end
+
+  context "representing a group" do
+    before(:all) do
+      @group = Factory(:member, :contact => Factory(:group_contact, :receiver => @user.actor)).sender_subject
+    end
+
+    before do
+      sign_in(@user)
+      represent(@group)
+    end
+
+    it "should add other user as member" do
+      other_user = Factory(:user)
+      contact = @group.contact_to!(other_user)
+
+      put :update, :id => contact.id, :contact => { :relation_ids => @group.relation_customs.map(&:id) }
+
+      response.should redirect_to(other_user)
+
+      @group.receivers.should include(other_user.actor)
+    end
+  end
 end

data/documents/app/views/common_documents/_index.html.erb

@@ -8,10 +8,10 @@
 <div class="attachment_tile" id="<%= dom_id(document)%>">
   <div class="attachment_tile_thumb">
     <%= link_to thumb_for(document,48),
-    {:controller => "documents", :action => "show", :id => document},
-    :type => document.type,
-    :title => document.file_file_name,
-    :path => document_path(document) %>
+                document_path(document),
+                :type => document.type,
+                :title => document.file_file_name,
+                :path => document_path(document) %>
   </div>
   <div class="attachment_tile_tipsy">
     <%= link_to image_tag("btn/btn_down.png"),
@@ -31,7 +31,7 @@
   </div>
   <div class="attachment_tile_text">
     <%= link_to truncate_name(document.file_file_name,:length => 15),
-    {:controller => "documents", :action => "show", :id => document},
+      document_path(document),
     :alt => document.file_file_name,
     :type => document.type,
     :path => document_path(document) %>

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.10.1".freeze
+    VERSION = "0.10.2".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.15.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.15.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/db/migrate/20120208144948_add_events_foreign_key.rb

@@ -0,0 +1,9 @@
+class AddEventsForeignKey < ActiveRecord::Migration
+  def up
+    add_foreign_key "events", "activity_objects", :name => "events_on_activity_object_id"
+  end
+
+  def down
+    remove_foreign_key "events", :name => "events_on_activity_object_id"
+  end
+end

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.7.0".freeze
+    VERSION = "0.7.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.15.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.15.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.20.1".freeze
+  VERSION = "0.20.2".freeze
 end

data/presence/app/assets/javascripts/{chat_audio.js → chat_audio.js.erb}

@@ -3,6 +3,7 @@
 ////////////////////
 
 //Global audio variables
+var audio_path = '<%=image_path("chat")%>';
 var onMessageAudio;
 
 var html5_audiotypes=[
@@ -23,7 +24,7 @@ function initSound(sound){
   var html5audio=document.createElement('audio')
   
   if (html5audio.canPlayType){ 
-    path = '/assets/chat/' + sound;
+    path = audio_path + "/" + sound;
     window[sound] = new Audio();
 
     for(i=0; i<html5_audiotypes.length; i++){
@@ -47,7 +48,7 @@ function playSound(sound){
     window[sound].play();
   } else {
     //Fallback option: When browser doesn't support HTML5 audio
-    $('body').append('<embed src="/' + sound + '.mp3" autostart="true" hidden="true" loop="false">');
+    $('body').append('<embed src="' + audio_path + '/' + sound + '.mp3" autostart="true" hidden="true" loop="false">');
   }
 }
 

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

@@ -220,10 +220,11 @@ function showConnectionBoxFromSlug(slug){
 
 function setUserIconStatus(slug, status){
    if (status in statusIcons) {
-     iconName = statusIcons[status];
+     var iconName = statusIcons[status];
      var $img_status = $('img.presence_status');
+		 var path = '<%=image_path("status")%>';
      connectionBox = getConnectionBoxFromSlug(slug);
-     $(connectionBox).find($img_status).attr("src", "/assets/status/" + iconName + ".png")
+     $(connectionBox).find($img_status).attr("src", path + "/" + iconName + ".png")
    }
 }
 

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

@@ -211,7 +211,7 @@ function getVideoEmbedForSlug(slug){
 ///////////////////////////
 
 var mainChatBox;
-var chatSlugId="SocialStream_MainChat"
+var chatSlugId="SocialStream_MainChat";
 
 function createMainChatBox(){
 	if (mainChatBox==null){
@@ -258,7 +258,9 @@ function createMainChatBox(){
 
 
 function addContentToMainChatBox(content){
-	$(mainChatBox.parent()).find("#" + chatSlugId).html(content);
+	if (mainChatBox != null) {
+  	$(mainChatBox.parent()).find("#" + chatSlugId).html(content);
+  }
 }
 
 
@@ -274,5 +276,7 @@ function modifyChatPartialIfMainBox(chatPartial){
 }
 
 function changeMainChatBoxHeaderTitle(title){
-  $($(mainChatBox.parent().parent()).find(".ui-chatbox-titlebar").find("span")[0]).html(title);
+	if (mainChatBox != null) {
+  	$($(mainChatBox.parent().parent()).find(".ui-chatbox-titlebar").find("span")[0]).html(title);
+  }
 }

data/presence/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="<%=image_path("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="<%=image_path("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="<%=image_path("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="<%=image_path("status/offline.png")%>" alt=""/> <%=t('chat.status.offline')%> <span class="value">offline</span></a></li>
 			        </ul>
 			    </dd>
         </div>

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

@@ -32,8 +32,7 @@
       }
       
       initAudio();
-      initFocusListeners();
-			
+      initFocusListeners();			
   });
   
 </script>

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.6.1"
+    VERSION = "0.6.2"
   end
 end

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.15.1')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.10.1')
-  s.add_runtime_dependency('social_stream-events', '~> 0.7.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.15.2')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.10.2')
+  s.add_runtime_dependency('social_stream-events', '~> 0.7.1')
   s.add_runtime_dependency('social_stream-linkser', '~> 0.5.0')
-  s.add_runtime_dependency('social_stream-presence', '~> 0.6.1')
+  s.add_runtime_dependency('social_stream-presence', '~> 0.6.2')
  
   # Development Gem dependencies
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.20.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,44 +10,44 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-06 00:00:00.000000000Z
+date: 2012-02-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &82379940 !ruby/object:Gem::Requirement
+  requirement: &72438540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.15.2
   type: :runtime
   prerelease: false
-  version_requirements: *82379940
+  version_requirements: *72438540
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
-  requirement: &82379690 !ruby/object:Gem::Requirement
+  requirement: &72438180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.10.2
   type: :runtime
   prerelease: false
-  version_requirements: *82379690
+  version_requirements: *72438180
 - !ruby/object:Gem::Dependency
   name: social_stream-events
-  requirement: &82379420 !ruby/object:Gem::Requirement
+  requirement: &72437820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *82379420
+  version_requirements: *72437820
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
-  requirement: &82379060 !ruby/object:Gem::Requirement
+  requirement: &72437490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,21 +55,21 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *82379060
+  version_requirements: *72437490
 - !ruby/object:Gem::Dependency
   name: social_stream-presence
-  requirement: &82378730 !ruby/object:Gem::Requirement
+  requirement: &72437150 !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: *82378730
+  version_requirements: *72437150
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &82378380 !ruby/object:Gem::Requirement
+  requirement: &72436790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *82378380
+  version_requirements: *72436790
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &82356550 !ruby/object:Gem::Requirement
+  requirement: &72436500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82356550
+  version_requirements: *72436500
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &82356300 !ruby/object:Gem::Requirement
+  requirement: &72436120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82356300
+  version_requirements: *72436120
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &82356030 !ruby/object:Gem::Requirement
+  requirement: &72435750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *82356030
+  version_requirements: *72435750
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &82355770 !ruby/object:Gem::Requirement
+  requirement: &72435360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *82355770
+  version_requirements: *72435360
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &82355450 !ruby/object:Gem::Requirement
+  requirement: &72435030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *82355450
+  version_requirements: *72435030
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &82355150 !ruby/object:Gem::Requirement
+  requirement: &72434680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,7 +143,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *82355150
+  version_requirements: *72434680
 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: 
@@ -1021,6 +1021,7 @@ files:
 - events/db/migrate/20111120104349_create_rooms.rb
 - events/db/migrate/20111204155637_add_scheduler.rb
 - events/db/migrate/20111218203314_change_scheduler.rb
+- events/db/migrate/20120208144948_add_events_foreign_key.rb
 - events/lib/generators/social_stream/events/install_generator.rb
 - events/lib/social_stream-events.rb
 - events/lib/social_stream/events/ability.rb
@@ -1194,7 +1195,7 @@ files:
 - presence/app/assets/images/status/away.png
 - presence/app/assets/images/status/dnd.png
 - presence/app/assets/images/status/offline.png
-- presence/app/assets/javascripts/chat_audio.js
+- presence/app/assets/javascripts/chat_audio.js.erb
 - presence/app/assets/javascripts/chat_interface_manager.js.erb
 - presence/app/assets/javascripts/chat_parser.js
 - presence/app/assets/javascripts/chat_persistence.js