social_stream 0.20.2 → 0.21.0

data/base/app/assets/javascripts/activities.js.erb

@@ -1,106 +1,9 @@
 //= require jquery.livequery
 //= require jquery.tipsy
 //
+//= require social_stream.wall
+//
 //initial state
-var default_security_width = '100px';
-$(function() {
-  $('#wrapper_activities_header form').hide();
-  $('#new_<%= SocialStream.activity_forms.first %>').show();
-  $('#select_<%= SocialStream.activity_forms.first %>').addClass('selected');
-  chosen = $('#security').security_chosen();
-  $('#security').change(function() {    
-    $(this).children("option:selected").each(function(i,opt){
-      if(opt.value==relation_public){
-        if(public_selected==false){
-          public_selected = true;
-          for(id in relation_options){
-            if(id==relation_public_pos){
-              $("#securitychzn_o_" + relation_public_pos).click();
-            }else{
-              chosen.result_deselect(id); 
-            }                       
-          }
-          chosen.results_update_field();
-        }else{
-          if($('#security').children("option:selected").size()>1){
-            public_selected = false;          
-            chosen.result_deselect(relation_public_pos);
-            chosen.results_update_field();
-          }
-        }
-      }
-    });      
-    
-  $('#securities .search-choice a').click(function(){
-    if($('#security').children("option:selected").size()==0){
-      $('#securities input').css('width', default_security_width)
-    }
-  });      
-  });
-  $('#securities input').blur(function(){
-    if($('#security').children("option:selected").size()==0){
-      $('#securities input').css('width', default_security_width)
-    }
-  });
-  // Remove width calculation
-  $('#securities input.default').css('width', default_security_width);
-  setActivityPrivacyTooltips();
-});
-
-
-$(document).ready(function() {
-  activate_anti_rebounds();
-});
-
-activate_anti_rebounds = function(){
-  $('#wrapper_activities_header form').submit(function() {
-    $(this).find('input[type=text]').each(function() {
-      $(this).blur().attr('readonly', true);
-    });
-    $("#masterSubmitButton").val(I18n.t('activity.sending') + '...').attr("disabled", true); 
-    
-    // Add _relation_ids[] parameter from authorization selector
-    $('.liveAdded').remove();
-    
-    var currentForm = $(this);
-  
-    $('#security option:selected').each(function() {
-                currentForm.append(
-                $('<input/>')
-                  .addClass('liveAdded')
-                  .attr('type', 'hidden')
-                  .attr('name', currentForm
-                  .attr('id').split('_')[1]+'[_relation_ids][]')
-                  .val($(this).attr('value')));
-    });
-    return true;
-  });
-  
-  $('.new_comment').submit(function() {
-    $(this).find('input[type=text]').each(function() {
-      $(this).blur().attr('readonly', true); 
-    });
-    $(this).find(".submitActivity").each(function() {
-      $(this).val(I18n.t('activity.sending') + '...').attr("disabled", true);   
-    });
-    return true;    
-  });
-}
-
-
-unblock_all_forms = function() {  
-  //Sharing buttons
-  $(".submitActivity").val(I18n.t('share')).removeAttr("disabled");  
-  //Header activities form
-  $("#masterSubmitButton").val(I18n.t('share')).removeAttr("disabled");
-  $('#wrapper_activities_header form').find('input[type=text]').each(function() {
-    $(this).removeAttr("readonly").val("").blur();
-  });  
-  //New comments
-  $('.input_new_comments').each(function() {chosen.result_deselect(0)
-    $(this).removeAttr("readonly").val("");
-  }); 
-}
 
 $('#masterSubmitButton').live('click',function(){
   $('#wrapper_activities_header form:visible').submit();
@@ -229,22 +132,3 @@ $('#left_scroll img').livequery("click",function(){
 
 
 });
-
-setActivityPrivacyTooltips = function(activityId) {
-  var fullId = '.activity_audience';
-  var summaryId = '.activity_audience_summary';
-
-  if (activityId != undefined) {
-    fullId = '#' + activityId + ' ' + fullId;
-    summaryId = '#' + activityId + ' ' + summaryId;
-  }
-
-  $(fullId).hide();
-  $(summaryId).tipsy({
-    html: true,
-    title: function(){
-      return $(this).siblings('.activity_audience').html();
-    }
-  });
-};
-

data/base/app/assets/javascripts/social_stream-base.js

@@ -10,4 +10,7 @@
 //= require avatars_for_rails
 //= require social_cheesecake
 //
+//= require_self
 //= require_tree .
+
+var SocialStream = SocialStream || {};

data/base/app/assets/javascripts/social_stream.timeline.js

@@ -0,0 +1,42 @@
+SocialStream.Timeline = (function(SS, $, undefined){
+	var setupCallbacks = [];
+
+	var addSetupCallback = function(callback){
+		setupCallbacks.push(callback);
+	}
+
+	var setup = function(){
+		$.each(setupCallbacks, function(i, callback){ callback(); });
+	}
+
+	var setPrivacyTooltips = function(activityId) {
+		var fullId = '.activity_audience';
+		var summaryId = '.activity_audience_summary';
+
+		if (activityId != undefined) {
+			fullId = '#' + activityId + ' ' + fullId;
+			summaryId = '#' + activityId + ' ' + summaryId;
+		}
+
+		$(fullId).hide();
+		$(summaryId).tipsy({
+			html: true,
+			title: function(){
+				return $(this).siblings('.activity_audience').html();
+			}
+		});
+	};
+
+	var newActivity = function(activityId){
+		setPrivacyTooltips(activityId);
+		SS.Wall.unblockForms();
+	}
+
+	addSetupCallback(setPrivacyTooltips);
+
+	return {
+		addSetupCallback: addSetupCallback,
+		setup: setup,
+                newActivity: newActivity
+	};
+}) (SocialStream, jQuery);

data/base/app/assets/javascripts/social_stream.wall.js.erb

@@ -0,0 +1,125 @@
+//= require social_stream.timeline
+//
+SocialStream.Wall = (function(SS, $, undefined){
+	var setupCallbacks = [];
+
+	var addSetupCallback = function(callback){
+		setupCallbacks.push(callback);
+	}
+
+	var setup = function(){
+		$.each(setupCallbacks, function(i, callback){ callback(); });
+	}
+
+	var setupFirstForm = function(){
+		$('#wrapper_activities_header form').hide();
+		$('#new_<%= SocialStream.activity_forms.first %>').show();
+		$('#select_<%= SocialStream.activity_forms.first %>').addClass('selected');
+	}
+
+	var setupSecuritySelect = function(){
+		var default_security_width = '100px';
+
+		chosen = $('#security').security_chosen();
+
+		$('#security').change(function() {    
+			$(this).children("option:selected").each(function(i,opt){
+				if(opt.value==relation_public){
+					if(public_selected==false){
+						public_selected = true;
+						for(id in relation_options){
+							if(id==relation_public_pos){
+								$("#securitychzn_o_" + relation_public_pos).click();
+							}else{
+								chosen.result_deselect(id); 
+							}                       
+						}
+						chosen.results_update_field();
+					}else{
+						if($('#security').children("option:selected").size()>1){
+							public_selected = false;          
+							chosen.result_deselect(relation_public_pos);
+							chosen.results_update_field();
+						}
+					}
+			      }
+			});
+    
+			$('#securities .search-choice a').click(function(){
+				if($('#security').children("option:selected").size()==0){
+					$('#securities input').css('width', default_security_width)
+				}
+			});      
+		  });
+
+		  $('#securities input').blur(function(){
+			  if($('#security').children("option:selected").size()==0){
+				  $('#securities input').css('width', default_security_width)
+			  }
+		  });
+
+		  // Remove width calculation
+		  $('#securities input.default').css('width', default_security_width);
+
+	}
+
+        var activateAntiRebounds = function(){
+          $('#wrapper_activities_header form').submit(function() {
+            $(this).find('input[type=text]').each(function() {
+              $(this).blur().attr('readonly', true);
+            });
+            $("#masterSubmitButton").val(I18n.t('activity.sending') + '...').attr("disabled", true); 
+
+            // Add _relation_ids[] parameter from authorization selector
+            $('.liveAdded').remove();
+
+            var currentForm = $(this);
+
+            $('#security option:selected').each(function() {
+              currentForm.append(
+                $('<input/>')
+                .addClass('liveAdded')
+                .attr('type', 'hidden')
+                .attr('name', currentForm
+                  .attr('id').split('_')[1]+'[_relation_ids][]')
+                .val($(this).attr('value')));
+            });
+            return true;
+          });
+
+          $('.new_comment').submit(function() {
+            $(this).find('input[type=text]').each(function() {
+              $(this).blur().attr('readonly', true); 
+            });
+            $(this).find(".submitActivity").each(function() {
+              $(this).val(I18n.t('activity.sending') + '...').attr("disabled", true);   
+            });
+            return true;    
+          });
+        }
+
+        var unblockForms = function() {  
+          //Sharing buttons
+          $(".submitActivity").val(I18n.t('share')).removeAttr("disabled");  
+          //Header activities form
+          $("#masterSubmitButton").val(I18n.t('share')).removeAttr("disabled");
+          $('#wrapper_activities_header form').find('input[type=text]').each(function() {
+            $(this).removeAttr("readonly").val("").blur();
+          });  
+          //New comments
+          $('.input_new_comments').each(function() {chosen.result_deselect(0)
+            $(this).removeAttr("readonly").val("");
+          }); 
+        }
+
+	addSetupCallback(setupFirstForm);
+	addSetupCallback(setupSecuritySelect);
+	addSetupCallback(activateAntiRebounds);
+
+	return {
+		addSetupCallback: addSetupCallback,
+                setup: setup,
+                activateAntiRebounds: activateAntiRebounds,
+                unblockForms: unblockForms  
+	};
+}) (SocialStream, jQuery)

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

@@ -354,7 +354,15 @@
 .permissions_explanation_tipsy_menu.tipsy .tipsy-inner {
   max-width: 300px;
   text-align: left;
+  padding: 5px 8px 4px 2px;
 }
 .permissions_explanation_tipsy_menu.tipsy .tipsy-inner .permission {
-  padding-top: 3px;
+  padding: 4px 0px 4px 20px;
+  text-align: justify;
+}
+.permissions_explanation_tipsy_menu.tipsy .tipsy-inner .permission.positive {
+  background: url("btn/permission_positive.png") 0px no-repeat;
+}
+.permissions_explanation_tipsy_menu.tipsy .tipsy-inner .permission.negative {
+  background: url("btn/permission_negative.png") 0px no-repeat;
 }

data/base/app/helpers/notifications_helper.rb

@@ -4,8 +4,6 @@ module NotificationsHelper
   def title_of(act_obj)
     if act_obj.is_a? Comment
       'Re: ' + title_of(act_obj.parent_post)
-    elsif act_obj.is_a? Post and (not act_obj.text.nil?)
-      act_obj.text.truncate(30, :separator => ' ')
     elsif act_obj.respond_to? :title and (not act_obj.title.nil?)
       act_obj.title.truncate(30, :separator => ' ')
     elsif act_obj.respond_to? :url and (not act_obj.url.nil?)
@@ -16,9 +14,7 @@ module NotificationsHelper
 
   # An activity object description
   def description_of(act_obj)
-    if act_obj.respond_to? :text and (not act_obj.text.nil?)
-      sanitize(act_obj.text)
-    elsif act_obj.respond_to? :description and (not act_obj.description.nil?)
+    if act_obj.respond_to? :description and (not act_obj.description.nil?)
       sanitize(act_obj.description)
     else
       I18n.t('notification.watch_it')

data/base/app/models/activity.rb

@@ -209,15 +209,34 @@ class Activity < ActiveRecord::Base
   end
 
   def notify
-    return true if !notificable?
+    return true unless notificable?
     #Avaible verbs: follow, like, make-friend, post, update
 
-    if ['like','follow','make-friend','post','update'].include? verb and !channel.reflexive?
+    if direct_object.is_a? Comment
+      participants.each do |p|
+        p.notify(notification_subject, "Youre not supposed to see this", self) unless p == sender
+      end
+    elsif ['like','follow','make-friend','post','update'].include? verb and !channel.reflexive?
       receiver.notify(notification_subject, "Youre not supposed to see this", self)
     end
     true
   end
 
+  # A list of participants
+  def participants
+    parts=Set.new
+    same_thread.map{|a| a.activity_objects.first}.each do |ao|
+      parts << ao.author if ao.respond_to? :author and !ao.author.nil?
+    end
+    parts
+  end
+
+  # This and related activities
+  def same_thread
+    return [self] if ancestry.nil?
+    [Activity.find(ancestry)] + Activity.find_all_by_ancestry(ancestry)
+  end
+
   # Is subject allowed to perform action on this {Activity}?
   def allow?(subject, action)
     return false if channel.blank?

data/base/app/models/comment.rb

@@ -1,6 +1,7 @@
 class Comment < ActiveRecord::Base
   include SocialStream::Models::Object
 
+  alias_attribute :text, :description
   validates_presence_of :text
 
   def parent_post
@@ -11,4 +12,8 @@ class Comment < ActiveRecord::Base
     self._relation_ids = Activity.find(id).relation_ids
     @_activity_parent_id = id
   end
+
+  def title
+    description.truncate(30, :separator =>' ')
+  end
 end

data/base/app/models/permission.rb

@@ -46,7 +46,22 @@ class Permission < ActiveRecord::Base
   # An explanation of the permissions. Type can be brief or detailed.
   # If detailed, description includes more information about the relation
   def description(type, options = {})
-    I18n.t "permission.description.#{ type }.#{ action }.#{ object || "nil" }",
+    unless options[:subject].present?
+      raise "Now we need subject for permission description"
+    end
+
+    options[:name] = options[:subject].name
+
+    prefix = "permission.description"
+    suffix = "#{ type }.#{ action }.#{ object || "nil" }"
+
+    if options[:state]
+      suffix += ".#{ options[:state] }"
+    end
+
+    options[:default] = :"#{ prefix }.default.#{ suffix }"
+
+    I18n.t "#{ prefix }.#{ options[:subject].subject_type.underscore }.#{ suffix }",
            options
   end
 end

data/base/app/models/post.rb

@@ -1,6 +1,7 @@
 class Post < ActiveRecord::Base
   include SocialStream::Models::Object
 
+  alias_attribute :text, :description
   validates_presence_of :text
 
   define_index do
@@ -9,4 +10,8 @@ class Post < ActiveRecord::Base
     has created_at
   end
 
+  def title
+    description.truncate(30, :separator =>' ')
+  end
+
 end