social_stream 0.9.5 → 0.9.6

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

@@ -91,6 +91,7 @@ $(function() {
   //show only the text fields for new comment if there are any comment to the post
   $(".activity_new_comment").each(function(){
   	if ($.trim($(this).siblings(".activity_comments").text()) != ""){
+  	  $(this).addClass("comment_shown");
   	  $(this).show();
   	}
   });

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

@@ -57,20 +57,21 @@
 
 
 .activity_new_comment{  font-size: 11px;  padding-left: 5px;	background: #deeff8;
-	border: thin solid #D4E4E4; width:100%;  padding-top: 3px;  padding-bottom: 3px;display:none;}
+	border: thin solid #D4E4E4; padding-top: 3px;  padding-bottom: 3px;display:none;}
 .actor_logo_subactivity {	width: 40px;	padding: 5px 3px 5px 2px;	display: inline-block;
 	vertical-align: top;}
 .input_new_comments{	border:1px solid #BDC7D8;	width:98%;	padding: 2px; color:#2A3890;}
-.subactivity{  font-size: 11px;  padding: 0px 0px 0px 5px;  background: #deeff8;
-  border: thin solid #D4E4E4; width: 100%; }
+.subactivity{  font-size: 11px;  padding: 0px 5px 0px 5px;  background: #deeff8;
+  border: thin solid #D4E4E4; display:block; }
 .space_comments {	padding-top: 1px;	padding-bottom: 1px;}
 #input_activities {	border-color: #0656a4;	color: #2A3890;	padding: 5px 5px 5px 5px;
   border:1px solid #BDC7D8;}
 #activities_share_btn {	text-align: right;	padding: 5px 16px 0px 10px;	vertical-align: middle;}
-.activities_comment_btn{ text-align: right;    padding: 2px 5px 2px 10px;    vertical-align: middle;}
+.activities_comment_btn{ text-align: right; padding: 5px 5px 2px 10px; vertical-align: middle;}
 
 .hide_show_comments{font-size: 11px;  padding-left: 5px;	background: #deeff8;
 	border: thin solid #D4E4E4; width:100%;  padding-top: 3px;  padding-bottom: 3px;}
+.new_comment{ display: inline-block; padding-top: 19px; width: 410px;}
 /*********** DROP DOWN**********/
 #security_chzn .chzn-choices {
 	padding-left: 20px;

data/base/app/models/activity.rb

@@ -52,7 +52,7 @@ class Activity < ActiveRecord::Base
         or(contacts[:receiver_id].eq(Actor.normalize_id(args[:owner])))
 
     audience_conditions =
-      audiences[:relation_id].eq(args[:relations]).
+      audiences[:relation_id].in(args[:relation_ids]).
         or(relations[:type].eq('Relation::Public'))
 
     conds =

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

@@ -1,12 +1,16 @@
 <% if user_signed_in? && current_subject.can_comment?(activity) %>
   <div class="activity_new_comment">
- <%= form_for Comment.new(:text => t('comment.input'),
-                          :_contact_id =>
-                            current_subject.contact_to!(activity.receiver).id,
-                          :_activity_parent_id => activity.id
-              ),
-          :html => { :class => "new_comment", :id => "new_comment"+dom_id(activity)  },
-          :remote => true do |f| %>
+    <div class="actor_logo_subactivity">
+      <%= image_tag(current_subject.logo.url(:actor),
+                            :alt => current_subject.name)%>
+    </div>
+      <%= form_for Comment.new(:text => t('comment.input'),
+                              :_contact_id =>
+                                current_subject.contact_to!(activity.receiver).id,
+                              :_activity_parent_id => activity.id
+                  ),
+                :html => { :class => "new_comment", :id => "new_comment"+dom_id(activity)  },
+                :remote => true do |f| %>
 
    <%= f.hidden_field :_contact_id %>
    <%= f.hidden_field :_activity_parent_id %>
@@ -17,13 +21,17 @@
      <div class="activities_security"></div>
      <%= f.submit t('share'), :class =>"myButtonBlue submitActivity", :id => "comment_submit_"+dom_id(activity) %>
    </div>
- <% end %>
+   <% end %>
     </div>
 <% end %>
 
 <%= javascript_tag do %>
   $(document).ready(function() {
     $("#comment_text_<%= dom_id(activity) %>").Watermark("<%= I18n.t('comment.input') %>","#666");
-    activate_anti_rebounds();  
+    activate_anti_rebounds();
+    $(".input_new_comments").blur(function(){
+        $(".activity_new_comment").hide();
+        $(".comment_shown").show();
+      });  
   });
 <% end %>

data/base/app/views/groups/show.html.erb

@@ -27,4 +27,7 @@
 <div class="space_center">
 </div>
 
-<%= render :partial => 'activities/walls', :locals => { :owner => @group } %>
+<%= render :partial => "activities/index",
+           :locals  => { :activities => @group.wall(:profile, :for => current_subject).
+                                               page(params[:page]),
+                         :owner => @group } %>

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.9.8".freeze
+    VERSION = "0.9.9".freeze
   end
 end

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.9.5".freeze
+  VERSION = "0.9.6".freeze
 end

data/social_stream.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.9.8')
+  s.add_runtime_dependency('social_stream-base', '~> 0.9.9')
   s.add_runtime_dependency('social_stream-documents', '~> 0.2.8')
  
   # Development Gem dependencies

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-27 00:00:00 +02:00
+date: 2011-09-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 43
+        hash: 41
         segments: 
         - 0
         - 9
-        - 8
-        version: 0.9.8
+        - 9
+        version: 0.9.9
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -452,7 +452,6 @@ files:
 - base/app/views/activities/_options.html.erb
 - base/app/views/activities/_root.html.erb
 - base/app/views/activities/_wall.html.erb
-- base/app/views/activities/_walls.html.erb
 - base/app/views/activities/index.js.erb
 - base/app/views/activity_objects/_activity_object.html.erb
 - base/app/views/actors/_actor.html.erb

data/base/app/views/activities/_walls.html.erb

@@ -1,34 +0,0 @@
-<% content_for :javascript do %>
-  $("#tabs").tabs({ 
-    ajaxOptions: { 
-      dataType: "script",
-      success: function(data) { eval(data); }
-    }
-  });
-<% end %>
-
-<div id="tabs" class="block">
-  <ul class="activity_tabs">
-    <li><%= link_to "<span>#{ h truncate_name owner.name }</span>".html_safe, "#wall-profile" %></li>
-
-    <% owner.relation_customs.sort.each do |r| %>
-      <li><%= link_to "<span>#{ h r.name }</span>".html_safe,
-                      polymorphic_path([ owner, Activity.new ], :section => r.id, :wall => true),
-                      :title => "wall-#{ r.id }" %></li>
-    <% end %>
-  </ul>
-
-  <div id="wall-profile">
-    <%= render :partial => 'activities/index',
-               :locals => { :owner      => owner,
-                            :activities => owner.wall(:profile,
-                                                      :for => current_subject).
-                                                 page(params[:page]) } %>
-  </div>
-
-  <% owner.relation_customs.sort.each do |r| %>
-    <div id="wall-<%= r.id %>"></div>
-  <% end %>
-</div>
-
-