social_stream-base 0.11.1 → 0.11.2

data/app/views/groups/_new.html.erb

@@ -9,7 +9,7 @@
 		newel: false,
 		height: 6
   });
-  $("#group_actor_tag_list").fcbkcomplete({
+  $("#group_tag_list").fcbkcomplete({
 		json_url: "<%= tags_path(:format => :json) %>",
 		cache: false,
 		filter_case: true,
@@ -65,9 +65,7 @@
 				<%= f.label t('group.tags')%>
 			</div>
 			<div class="form_field">
-				<%= f.fields_for :actor do |actor_form| %>
-					<%= actor_form.select :tag_list, [], :class => "form_tag" %>
-				<%end%>
+        			<%= f.select :tag_list, [], :class => "form_tag" %>
 			</div>
 		</div>
 		<div class="form_row form_label">

data/app/views/layouts/_header_dropdown_menu_sessions.html.erb

@@ -5,7 +5,8 @@
   <ul>
     <% representations.each do |representation| %>
     <li>
-      <%= link_to truncate_name(representation.name, :length => 15) + (content_tag(:span, representation.pending_contacts_count.to_s, :class => "switch_pending_count") if representation.pending_contacts_count > 0), { :s => representation.slug }, { :style => "background: transparent url('#{ image_path representation.logo.url(:representation)}') no-repeat left center;margin-left:2px;" } %>
+      <%  pending_total = representation.mailbox.notifications.not_trashed.unread.count %>
+      <%= link_to truncate_name(representation.name, :length => 15) + (content_tag(:span, pending_total.to_s, :class => "switch_pending_count") if pending_total > 0), { :s => representation.slug }, { :style => "background: transparent url('#{ image_path representation.logo.url(:representation)}') no-repeat left center;margin-left:2px;" } %>
     </li>
     <% end %>
   </ul>

data/config/locales/es.yml

@@ -9,6 +9,8 @@ es:
     edit: "Editar cuenta"
     email: 
       change: "Cambiar dirección de correo"
+    lang: 
+      change: "Cambiar idioma"
     one: "Cuenta"
     password:
       change: "Cambiar contraseña"

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.11.1".freeze
+    VERSION = "0.11.2".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-22 00:00:00.000000000Z
+date: 2011-12-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &76108970 !ruby/object:Gem::Requirement
+  requirement: &73089080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *76108970
+  version_requirements: *73089080
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &76108600 !ruby/object:Gem::Requirement
+  requirement: &73088720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *76108600
+  version_requirements: *73088720
 - !ruby/object:Gem::Dependency
   name: foreigner
-  requirement: &76108340 !ruby/object:Gem::Requirement
+  requirement: &73088410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *76108340
+  version_requirements: *73088410
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &76108100 !ruby/object:Gem::Requirement
+  requirement: &73088110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *76108100
+  version_requirements: *73088110
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &76107850 !ruby/object:Gem::Requirement
+  requirement: &73087810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *76107850
+  version_requirements: *73087810
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &76107520 !ruby/object:Gem::Requirement
+  requirement: &73087510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *76107520
+  version_requirements: *73087510
 - !ruby/object:Gem::Dependency
   name: avatars_for_rails
-  requirement: &76107220 !ruby/object:Gem::Requirement
+  requirement: &73087200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *76107220
+  version_requirements: *73087200
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &76106840 !ruby/object:Gem::Requirement
+  requirement: &73086890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *76106840
+  version_requirements: *73086890
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &76106560 !ruby/object:Gem::Requirement
+  requirement: &73086590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *76106560
+  version_requirements: *73086590
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &76106310 !ruby/object:Gem::Requirement
+  requirement: &73086310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 0.12.4
   type: :runtime
   prerelease: false
-  version_requirements: *76106310
+  version_requirements: *73086310
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &76105880 !ruby/object:Gem::Requirement
+  requirement: &73086040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 0.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *76105880
+  version_requirements: *73086040
 - !ruby/object:Gem::Dependency
   name: mailboxer
-  requirement: &76105460 !ruby/object:Gem::Requirement
+  requirement: &72439240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,10 +143,10 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *76105460
+  version_requirements: *72439240
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: &76104760 !ruby/object:Gem::Requirement
+  requirement: &72437820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -154,10 +154,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *76104760
+  version_requirements: *72437820
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &76104440 !ruby/object:Gem::Requirement
+  requirement: &72436390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,10 +165,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *76104440
+  version_requirements: *72436390
 - !ruby/object:Gem::Dependency
   name: simple-navigation
-  requirement: &76104210 !ruby/object:Gem::Requirement
+  requirement: &72435360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -176,10 +176,10 @@ dependencies:
         version: 3.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *76104210
+  version_requirements: *72435360
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &76103830 !ruby/object:Gem::Requirement
+  requirement: &72434780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -187,10 +187,10 @@ dependencies:
         version: 1.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *76103830
+  version_requirements: *72434780
 - !ruby/object:Gem::Dependency
   name: modernizr-rails
-  requirement: &76103500 !ruby/object:Gem::Requirement
+  requirement: &72434070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -198,10 +198,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *76103500
+  version_requirements: *72434070
 - !ruby/object:Gem::Dependency
   name: thinking-sphinx
-  requirement: &76103200 !ruby/object:Gem::Requirement
+  requirement: &72432350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -209,10 +209,10 @@ dependencies:
         version: 2.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *76103200
+  version_requirements: *72432350
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &76090370 !ruby/object:Gem::Requirement
+  requirement: &72428620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -220,10 +220,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *76090370
+  version_requirements: *72428620
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &76090020 !ruby/object:Gem::Requirement
+  requirement: &72427840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -231,10 +231,10 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *76090020
+  version_requirements: *72427840
 - !ruby/object:Gem::Dependency
   name: social_cheesecake
-  requirement: &76089730 !ruby/object:Gem::Requirement
+  requirement: &72427300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -242,10 +242,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *76089730
+  version_requirements: *72427300
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &76089330 !ruby/object:Gem::Requirement
+  requirement: &72426400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -253,10 +253,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *76089330
+  version_requirements: *72426400
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &76088960 !ruby/object:Gem::Requirement
+  requirement: &72424940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -264,10 +264,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76088960
+  version_requirements: *72424940
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &76088570 !ruby/object:Gem::Requirement
+  requirement: &72423390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -275,10 +275,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76088570
+  version_requirements: *72423390
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &76088190 !ruby/object:Gem::Requirement
+  requirement: &72422260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -286,10 +286,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *76088190
+  version_requirements: *72422260
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &76087790 !ruby/object:Gem::Requirement
+  requirement: &72420910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -297,10 +297,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *76087790
+  version_requirements: *72420910
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &76087520 !ruby/object:Gem::Requirement
+  requirement: &72414720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -308,10 +308,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *76087520
+  version_requirements: *72414720
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &76087290 !ruby/object:Gem::Requirement
+  requirement: &72413490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -319,10 +319,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *76087290
+  version_requirements: *72413490
 - !ruby/object:Gem::Dependency
   name: nifty-generators
-  requirement: &76087050 !ruby/object:Gem::Requirement
+  requirement: &72412310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -330,7 +330,7 @@ dependencies:
         version: 0.4.5
   type: :development
   prerelease: false
-  version_requirements: *76087050
+  version_requirements: *72412310
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.
 
@@ -630,6 +630,7 @@ files:
 - app/views/activities/_options.html.erb
 - app/views/activities/_root.html.erb
 - app/views/activities/_wall.html.erb
+- app/views/activities/index.html.erb
 - app/views/activities/index.js.erb
 - app/views/activity_objects/_activity_object.html.erb
 - app/views/actors/_actor.html.erb