social_stream 0.16.2 → 0.16.3

data/base/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/base/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/base/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/base/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

data/events/app/views/events/_calendar_month.erb

@@ -1 +1 @@
-<div id="sidebar_calendar_month_<%= position %>" class="sidebar_calendar_month<%= " not_current" if date.month != Date.today.month  %>"><%= link_to l(date, :format => "%B %Y"), '#' %></div>
+<div id="sidebar_calendar_month_<%= position %>" class="sidebar_calendar_month<%= " not_current" if date.month != Date.today.month  %>"><%= link_to l(date, :format => "%B %Y"), polymorphic_path([profile_or_current_subject, Event.new], :date => date.to_time.to_i) %></div>

data/events/app/views/events/_sidebar_calendar.html.erb

@@ -17,7 +17,7 @@
 
       <%= raw cycle(*(Array.wrap("<tr>") + 6.times.map{""}) + Array.wrap(:name => "tr_start")) %>
       <td class="<%= event_class(day.to_date) %>">
-        <%= link_to day.day, polymorphic_path([profile_or_current_subject, Event.new], :at => day.to_i) %>
+        <%= link_to day.day, polymorphic_path([profile_or_current_subject, Event.new], :date => day.to_i, :view => "agendaDay") %>
       </td>
 
       <%= raw cycle(*(6.times.map{""} + Array.wrap('</tr>') + Array.wrap(:name => "tr_end"))) %>

data/events/app/views/events/index.html.erb

@@ -1,7 +1,7 @@
 <% content_for :headers do %>
   <style type="text/css">
     #sidebar {width: 0px;}
-    #center_body {width: 780px; max-width: 780px;}
+    #center_body {width: 780px; max-width: 780px; border-right: 0px;}
   </style>
 <% end %>
 
@@ -87,10 +87,13 @@
       }
     });
 
-    <% if params[:at] %>
+    <% if params[:date] %>
       // TODO: optimize this to save one index call
-      SocialStream.Events.current.calendar.fullCalendar('changeView', "agendaDay");
-      SocialStream.Events.current.calendar.fullCalendar('gotoDate', new Date(<%= params[:at] %> * 1000));
+      SocialStream.Events.current.calendar.fullCalendar('gotoDate', new Date(<%= escape_javascript params[:date] %> * 1000));
+    <% end %>
+
+    <% if params[:view] %>
+      SocialStream.Events.current.calendar.fullCalendar('changeView', "<%= escape_javascript params[:view] %>");
     <% end %>
   });
 <% end %>

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.3.1".freeze
+    VERSION = "0.3.2".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.11.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.11.2')
   s.add_runtime_dependency('rails-scheduler', '~> 0.0.4')
   s.add_runtime_dependency('coffee-rails', '> 3.1.0')
 

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.16.2".freeze
+  VERSION = "0.16.3".freeze
 end

data/social_stream.gemspec

@@ -11,9 +11,9 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.11.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.11.2')
   s.add_runtime_dependency('social_stream-documents', '~> 0.6.1')
-  s.add_runtime_dependency('social_stream-events', '~> 0.3.1')
+  s.add_runtime_dependency('social_stream-events', '~> 0.3.2')
   s.add_runtime_dependency('social_stream-linkser', '~> 0.1.1')
  
   # Development Gem dependencies

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.16.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ 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: social_stream-base
-  requirement: &83134570 !ruby/object:Gem::Requirement
+  requirement: &78705980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.2
   type: :runtime
   prerelease: false
-  version_requirements: *83134570
+  version_requirements: *78705980
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
-  requirement: &83134160 !ruby/object:Gem::Requirement
+  requirement: &78705280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,21 +33,21 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *83134160
+  version_requirements: *78705280
 - !ruby/object:Gem::Dependency
   name: social_stream-events
-  requirement: &83133860 !ruby/object:Gem::Requirement
+  requirement: &78704450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *83133860
+  version_requirements: *78704450
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
-  requirement: &83121040 !ruby/object:Gem::Requirement
+  requirement: &78703180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *83121040
+  version_requirements: *78703180
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &83120690 !ruby/object:Gem::Requirement
+  requirement: &78698930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *83120690
+  version_requirements: *78698930
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &83120430 !ruby/object:Gem::Requirement
+  requirement: &78698390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83120430
+  version_requirements: *78698390
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &83119970 !ruby/object:Gem::Requirement
+  requirement: &78696920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *83119970
+  version_requirements: *78696920
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &83119500 !ruby/object:Gem::Requirement
+  requirement: &78695390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *83119500
+  version_requirements: *78695390
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &83119090 !ruby/object:Gem::Requirement
+  requirement: &78694610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 0.3.6
   type: :development
   prerelease: false
-  version_requirements: *83119090
+  version_requirements: *78694610
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &83118760 !ruby/object:Gem::Requirement
+  requirement: &78693480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,7 +121,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *83118760
+  version_requirements: *78693480
 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: 
@@ -425,6 +425,7 @@ 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/index.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