social_stream 0.16.1 → 0.16.2

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

@@ -29,6 +29,7 @@
                       background: transparent url('btn/header_notifications.png') no-repeat center center;}
 #header_inbox_count a{ color: white; background-color: $header-notification-color; padding: 2px 7px 2px 7px;}
 #representation {  display: inline;  padding-left:3px;  padding-right:3px;}
+.switch_pending_count { color: white; background-color: $header-notification-color; padding: 2px 7px 2px 7px !important; margin-left: 5px !important; float: right; }
 .txt_config {color: $text-over-main;	vertical-align: top;	display: inline;	padding-top: 2px;	
               border-right: thin solid; padding-right: 3px;}
 .txt_config2 {color: $text-over-main;	vertical-align: top;	display: inline;	padding-top: 2px;	padding-right: 3px;}
@@ -48,8 +49,9 @@
 #header_dropdown_menu ul li a{padding: .40em 1em .70em 2.5em;}
 #header_dropdown_menu ul li a:hover{color:$main-color;}
 #header_dropdown_menu ul li ul li a{padding: .40em 1em .70em 1em;}
+#header_dropdown_menu ul li ul li ul li {width: 160px;}
 #header_dropdown_menu ul li ul li ul li a{padding: .40em 1em .70em 2.5em;}
-#header_dropdown_menu ul li ul li ul{position: absolute; left: -120px;}
+#header_dropdown_menu ul li ul li ul{position: absolute; left: -160px;}
 #header_dropdown_menu a.session_change{background: transparent url('btn/arrow_session_change.png') no-repeat 3px 6px;}
 
 #menu_home ul li.pipe,#menu_account ul li.pipe{padding:0; margin:0;font-size: 20px;font-weight: bold;}

data/base/app/helpers/sidebar_helper.rb

@@ -0,0 +1,10 @@
+module SidebarHelper
+  include SocialStream::Views::Sidebar
+
+  def sidebar type = nil
+    content_for :sidebar,
+                sidebar_items(type).inject(ActiveSupport::SafeBuffer.new){ |result, item|
+      result + item[:html]
+    }
+  end
+end

data/base/app/views/avatars/index.html.erb

@@ -3,9 +3,8 @@
 <% content_for :title do%>
   <%= current_subject.name %>
 <% end%>
-<% content_for :sidebar do %>
-  <%= render :partial => 'home/sidebar' %>
-<% end %>
+
+<% sidebar %>
 
 <%= location(
  	link_to(t('menu.information'), [current_subject,:profile]),	

data/base/app/views/contacts/_suggestions.html.erb

@@ -8,7 +8,7 @@
     </div>
     <div class="content">
       <div class="suggestions">
-        <%= render sgs %>
+        <%= render :partial => "contacts/contact", :collection => sgs %>
       </div>
     </div>
   </div>

data/base/app/views/contacts/index.html.erb

@@ -2,9 +2,7 @@
   <%= t('contact.other')%>
 <%end%>
 
-<% content_for :sidebar do %>
-  <%= render :partial => 'home/sidebar' %>
-<% end %>
+<% sidebar %>
 
 <% toolbar :option => :contacts %>
 

data/base/app/views/conversations/index.html.erb

@@ -2,9 +2,7 @@
   <%=t('message.other')%>
 <% end %>
 
-<% content_for :sidebar do %>
-  <%= render :partial => 'home/sidebar' %>
-<% end %>
+<% sidebar %>
 
 <% content_for :javascript do %>
   $('.pagination a').attr('data-remote', 'true');

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

@@ -2,9 +2,7 @@
   <%=t('message.other')%>
 <% end %>
 
-<% content_for :sidebar do %>
-  <%= render :partial => 'home/sidebar' %>
-<% end %>
+<% sidebar %>
 
 <% toolbar :option => :messages %>
 

data/base/app/views/devise/registrations/edit.html.erb

@@ -1,7 +1,7 @@
 <% toolbar :profile => current_subject %>
-<% content_for :sidebar do %>
-  <%= render :partial => 'home/sidebar' %>
-<% end %>
+
+<% sidebar %>
+
 <%= location(t('account.one'), 
   link_to(t('settings.main'), settings_path)
 ) %>
@@ -17,6 +17,4 @@
 <% if current_subject.respond_to? :authentication_token%>
 <%= render :partial => "settings/api_key" %>
 <% end %>
-<%= render :partial => "settings/contacts" %>
 <%= render :partial => "delete_account"%>
-

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

@@ -13,9 +13,8 @@
 <% content_for :keywords do %>
   <%= @group.profile.subject.tag_list%>
 <% end %>
-<% content_for :sidebar do %>
-  <%= render :partial => 'sidebar_show' %>
-<% end %>
+
+<% sidebar %>
 
 <%= location(link_to(t('group.one')+": "+truncate_name(sanitize @group.name)))%>
                       

data/base/app/views/groups/{_sidebar_index.html.erb → _tag_cloud.html.erb}

@@ -10,8 +10,6 @@
   <div id="wordcloud" class="content"></div>
 </div>
 
-<%= render :partial => 'contacts/suggestions_and_pendings' %>
-
 <% tags = ActivityObject.tag_counts %>
 
 <script type="text/javascript">

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

@@ -4,9 +4,8 @@
 
 <% toolbar if user_signed_in? %>
 
-<% content_for :sidebar do %>
-	<%= render :partial => "groups/sidebar_index" %>
-<% end %>
+<% sidebar :group_index %>
+
 <%= location(t('browse') +": "+ 
              link_to(t('user.by'), users_path) + ", "+ 
              content_tag(:b,content_tag(:span, t('group.all'), :id=>'name_group')))%>

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

@@ -4,8 +4,6 @@
 
 <% toolbar :option => 'groups' %>
 
-<% content_for :sidebar do %>
-  <%= render :partial => "sidebar_index" %>
-<% end %>
+<% sidebar :group_index %>
 
 <%= render :partial => 'new' %>

data/base/app/views/home/index.html.erb

@@ -1,6 +1,4 @@
-<% content_for :sidebar do %>
-  <% render :partial => 'sidebar' %>
-<% end %>
+<% sidebar %>
 
 <%= location(link_to(t('home')+": "+ truncate_name(sanitize current_subject.name)))%>
                       

data/base/app/views/invitations/new.html.erb

@@ -1,8 +1,6 @@
 <% toolbar  %>
 
-<% content_for :sidebar do %>
-  <%= render :partial => "home/sidebar" %>
-<% end %>
+<% sidebar %>
 
 <%= location(
   link_to(t('invitation.other'), new_invitation_path)

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

@@ -5,7 +5,7 @@
   <ul>
     <% representations.each do |representation| %>
     <li>
-      <%= link_to truncate_name(representation.name, :length => 15), { :s => representation.slug }, { :style => "background: transparent url('#{ image_path representation.logo.url(:representation)}') no-repeat left center;margin-left:2px;" } %>
+      <%= 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;" } %>
     </li>
     <% end %>
   </ul>

data/base/app/views/messages/new.html.erb

@@ -1,9 +1,8 @@
 <% content_for :title do %>
   <%=t('message.other')%>
 <% end %>
-<% content_for :sidebar do %>
-  <%= render :partial => 'home/sidebar' %>
-<% end %>
+
+<% sidebar %>
 
 <% toolbar :option => :messages %>
 

data/base/app/views/notifications/index.html.erb

@@ -2,9 +2,7 @@
   <%= current_subject.name %>
 <% end %>
 
-<% content_for :sidebar do %>
-  <%= render :partial => 'home/sidebar' %>
-<% end %>
+<% sidebar %>
 
 <%= location(
     link_to(t('notification.other'), notifications_path,:remote => true) +' ('+@mailbox.notifications.not_trashed.unread.count.to_s+')'

data/base/app/views/profiles/edit.html.erb

@@ -1,8 +1,6 @@
 <% toolbar :profile => current_subject %>
 
-<% content_for :sidebar do %>
-  <%= render :partial => "#{ current_subject.class.to_s.tableize }/sidebar_index" %>
-<% end %>
+<% sidebar %>
 
 <%if params[:section].present? 
   case params[:section]

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

@@ -11,9 +11,7 @@
   <%= @profile.subject.tag_list%>
 <% end %>
 
-<% content_for :sidebar do %>
-  <%= render :partial => 'users/sidebar_index' %>
-<% end %>
+<% sidebar %>
 
 <% toolbar :profile => @profile.subject %>
 
@@ -21,4 +19,4 @@
 <%= location(link_to(t('menu.information'), [@profile.subject, :profile])) %>
 
 
-<%= render :partial => "profile" %>
+<%= render :partial => "profile" %>

data/base/app/views/search/index.html.erb

@@ -2,9 +2,7 @@
 <%= t('search.name')%> <%= params[:search_query].present? ? ": #{params[:search_query]}" : ""%>
 <% end %>
 
-<% content_for :sidebar do %>
-<%= render :partial => 'home/sidebar' %>
-<% end %>
+<% sidebar %>
 
 <% toolbar if user_signed_in? %>
 

data/base/app/views/settings/index.html.erb

@@ -2,9 +2,7 @@
   <%=t('settings.one')%>
 <% end %>
 
-<% content_for :sidebar do %>
-  <%= render :partial => 'home/sidebar' %>
-<% end %>
+<% sidebar %>
 
 <% toolbar :profile => current_subject %>
 

data/base/app/views/users/_show.html.erb

@@ -15,9 +15,7 @@
   <%= @user.profile.subject.tag_list%>
 <% end %>
 
-<% content_for :sidebar do %>
-  <%= render :partial => 'sidebar_index' %>
-<% end %>
+<% sidebar %>
 
 <%= location(link_to(t('profile.one')+": "+truncate_name(sanitize @user.name)))%>
               

data/base/app/views/users/index.html.erb

@@ -4,9 +4,7 @@
 
 <% toolbar if user_signed_in? %>
 
-<% content_for :sidebar do %>
-	<%= render :partial => "users/sidebar_index" %>
-<% end %>
+<% sidebar %>
 
 <%= location(t('browse') +": "+
              content_tag(:b ,content_tag(:span, t('user.other'), :id=>'name_group')) + ", "+ 

data/base/lib/social_stream/base/dependencies.rb

@@ -0,0 +1,47 @@
+# Database foreign keys
+require 'foreigner'
+# jQuery
+require 'jquery-rails'
+# Permalinks:
+require 'stringex'
+# Hierarchical relationships in Activity and Relation:
+require 'ancestry'
+# Messages
+require 'mailboxer'
+# User authentication
+require 'devise'
+# Authorization
+require 'cancan'
+# REST controllers
+require 'inherited_resources'
+# Scopes in controllers
+require 'has_scope'
+# Logo attachments
+require 'paperclip'
+require 'paperclip/social_stream'
+require 'avatars_for_rails'
+# Pagination
+require 'kaminari'
+# Oauth
+require 'omniauth/oauth'
+#Tags
+require 'acts-as-taggable-on'
+require 'acts_as_taggable_on/social_stream'
+# HTML forms
+require 'formtastic'
+#Background tasks
+require 'resque/server'
+#Simple Navigation for menu
+require 'simple-navigation'
+# Modernizr.js library
+require 'modernizr-rails'
+# Sphinx search engine
+require 'thinking-sphinx'
+# Syntactically Awesome Stylesheets
+require 'sass-rails'
+# Autolink text blocks
+require 'rails_autolink'
+# SocialCheesecake
+require 'social_cheesecake'
+
+

data/base/lib/social_stream/base/engine.rb

@@ -37,6 +37,12 @@ module SocialStream
         end
       end
 
+      initializer "social_stream-base.views.sidebar" do
+        SocialStream::Views::Sidebar.module_eval do
+          include SocialStream::Views::Sidebar::Base
+        end
+      end
+
       initializer "social_stream-base.avatars_for_rails" do
         AvatarsForRails.setup do |config|
           config.avatarable_model = :actor

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

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

data/base/lib/social_stream/controllers/helpers.rb

@@ -7,6 +7,7 @@ module SocialStream
       included do
         helper_method :current_subject,
                       :profile_subject,
+                      :profile_or_current_subject,
                       :profile_subject_is_current?
       end
 
@@ -80,6 +81,16 @@ module SocialStream
           @profile_subject ||= association_chain[-1] || warden.authenticate!
         end
 
+        # Profile subject is suitable for paths like:
+        #   /users/demo/posts
+        #
+        # This method tries {#profile_subject} first and then {#current_subject}
+        def profile_or_current_subject
+          profile_subject || current_subject
+        rescue
+          current_subject
+        end
+
         # A {User} must be logged in and is equal to {#profile_subject}
         def profile_subject_is_current?
           user_signed_in? && profile_subject == current_subject

data/base/lib/social_stream/views/list.rb

@@ -0,0 +1,17 @@
+module SocialStream
+  module Views
+    class List < Array
+      def insert_before key, obj
+        position = index{ |i| i[:key] == key }
+
+        insert position, obj
+      end
+
+      def insert_after key, obj
+        position = index{ |i| i[:key] == key } + 1
+
+        insert position, obj
+      end
+    end
+  end
+end

data/base/lib/social_stream/views/settings/base.rb

@@ -3,7 +3,7 @@ module SocialStream
     module Settings
       module Base
         def settings_items
-          SocialStream::Views::Settings::ItemList.new.tap do |items|
+          SocialStream::Views::List.new.tap do |items|
             if current_subject  == current_user
               items << {
                 :key  => 'user.edit',

data/base/lib/social_stream/views/sidebar/base.rb

@@ -0,0 +1,27 @@
+module SocialStream
+  module Views
+    module Sidebar
+      module Base
+        def sidebar_items type
+          SocialStream::Views::List.new.tap do |items|
+            if type == :group_index
+              items << {
+                :key => 'group.cloud',
+                :html => render(:partial => 'groups/tag_cloud')
+              }
+
+            end
+
+            if user_signed_in?
+              items << {
+                :key => 'suggestions_and_pendings',
+                :html => render(:partial => 'contacts/suggestions_and_pendings')
+              }
+            end
+          end
+        end
+      end
+    end
+  end
+end
+

data/base/lib/social_stream-base.rb

@@ -1,48 +1,5 @@
-# Database foreign keys
-require 'foreigner'
-# jQuery
-require 'jquery-rails'
-# Permalinks:
-require 'stringex'
-# Hierarchical relationships in Activity and Relation:
-require 'ancestry'
-# Messages
-require 'mailboxer'
-# User authentication
-require 'devise'
-# Authorization
-require 'cancan'
-# REST controllers
-require 'inherited_resources'
-# Scopes in controllers
-require 'has_scope'
-# Logo attachments
-require 'paperclip'
-require 'paperclip/social_stream'
-require 'avatars_for_rails'
-# Pagination
-require 'kaminari'
-# Oauth
-require 'omniauth/oauth'
-#Tags
-require 'acts-as-taggable-on'
-require 'acts_as_taggable_on/social_stream'
-# HTML forms
-require 'formtastic'
-#Background tasks
-require 'resque/server'
-#Simple Navigation for menu
-require 'simple-navigation'
-# Modernizr.js library
-require 'modernizr-rails'
-# Sphinx search engine
-require 'thinking-sphinx'
-# Syntactically Awesome Stylesheets
-require 'sass-rails'
-# Autolink text blocks
-require 'rails_autolink'
-# SocialCheesecake
-require 'social_cheesecake'
+# Gem's dependencies
+require 'social_stream/base/dependencies'
 
 # Provides your Rails application with social network and activity stream support
 module SocialStream
@@ -65,9 +22,14 @@ module SocialStream
   end
 
   module Views
+    autoload :List, 'social_stream/views/list'
+
     module Settings
-      autoload :Base,     'social_stream/views/settings/base'
-      autoload :ItemList, 'social_stream/views/settings/item_list'
+      autoload :Base, 'social_stream/views/settings/base'
+    end
+
+    module Sidebar
+      autoload :Base, 'social_stream/views/sidebar/base'
     end
   end
 

data/base/lib/tasks/db/populate.rake

@@ -13,15 +13,15 @@ namespace :db do
       LOGOS_PATH = File.join(Rails.root, 'lib', 'logos')
       USERS = (ENV["USERS"] || 9).to_i
       GROUPS = (ENV["GROUPS"] || 10).to_i
-      CHEESECAKE_TESTING = (ENV["CHEESECAKE_TESTING"].present? || false)
-      if CHEESECAKE_TESTING
+      CHEESECAKE = (ENV["CHEESECAKE"].present? || false)
+      if CHEESECAKE
         puts "Cheesecake Testing mode: ON"
       end
       if ENV["HARDCORE"].present?
         USERS = 999
         GROUPS = 1000    
         puts "Hardcore mode: ON (May the Force be with you brave Padawan)"
-        if CHEESECAKE_TESTING
+        if CHEESECAKE
           puts "WARNING: Hardcore and Cheesecake Modes activated. This situation is really slow. Please, avoid it."
         end        
       end
@@ -121,13 +121,15 @@ namespace :db do
         relations = a.relation_customs + Array.wrap(a.relation_reject)
         break if actors.size==0
         Forgery::Basic.number(:at_most => actors.size).times do
-          actor = actors.delete_at((rand * actors.size).to_i)
-          a.contact_to!(actor).relation_ids = Array(Forgery::Extensions::Array.new(relations).random.id)
+          actor = actors.delete_at((rand * actors.size).to_i)          
+          a.contact_to!(actor).relation_ids = Array(Forgery::Extensions::Array.new(relations).random.id) unless a==actor
         end
-        if CHEESECAKE_TESTING     
+        if CHEESECAKE     
           actor = Actor.first
-          puts a.name + " connecting with " + actor.name
-          a.contact_to!(actor).relation_ids = Array(Forgery::Extensions::Array.new(relations).random.id)
+          unless a==actor
+            puts a.name + " connecting with " + actor.name
+            a.contact_to!(actor).relation_ids = Array(Forgery::Extensions::Array.new(relations).random.id)
+          end
         end
       end
 
@@ -136,7 +138,7 @@ namespace :db do
 
       # = Posts
       puts 'Post population'
-      unless CHEESECAKE_TESTING
+      unless CHEESECAKE
         posts_start = Time.now
   
         SocialStream::Populate.power_law(Tie.all) do |t|
@@ -167,7 +169,7 @@ namespace :db do
 
       # = Mailboxer      
       puts 'Mailboxer population'
-      unless CHEESECAKE_TESTING
+      unless CHEESECAKE
         mailboxer_start = Time.now
         available_actors = Actor.all
   

data/base/social_stream-base.gemspec

@@ -13,6 +13,8 @@ Gem::Specification.new do |s|
 
   # Runtime gem dependencies
   #
+  # Do not forget to require the file at lib/social_stream/base/dependencies !
+  #
   # Rails
   s.add_runtime_dependency('rails', '>= 3.1.0')
   # Activity and Relation hierarchies
@@ -26,7 +28,7 @@ Gem::Specification.new do |s|
   # Slug generation
   s.add_runtime_dependency('stringex', '~> 1.3.0')
   # Avatar attachments
-  s.add_runtime_dependency('avatars_for_rails', '~> 0.2.0')
+  s.add_runtime_dependency('avatars_for_rails', '~> 0.2.2')
   # jQuery
   s.add_runtime_dependency('jquery-rails', '~> 1.0.9')
   # Authorization
@@ -54,7 +56,7 @@ Gem::Specification.new do |s|
   # Autolink text blocks
   s.add_runtime_dependency('rails_autolink', '~> 1.0.4')
   # SocialCheesecake
-  s.add_runtime_dependency('social_cheesecake','~> 0.0.4')
+  s.add_runtime_dependency('social_cheesecake','~> 0.1.0')
 
   # Development gem dependencies
   #

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

@@ -2,9 +2,7 @@
 <%= profile_subject.name + ": " + t('repository.title') %>
 <% end %>
 
-<% content_for :sidebar do %>
-<%= render :partial => 'home/sidebar' %>
-<% end %>
+<% sidebar %>
 
 <%if profile_subject_is_current?%>
 <%= location(
@@ -71,4 +69,4 @@ $(document).ready(function() {
     return false;
   });  
 })
-<% end %>
+<% end %>

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

@@ -4,9 +4,7 @@
 <%= profile_subject.name + ": " + t('repository.title') %>
 <% end %>
 
-<% content_for :sidebar do %>
-<%= render :partial => 'home/sidebar' %>
-<% end %>
+<% sidebar %>
 
 <%if profile_subject_is_current?%>
 <%= location(

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Documents
-    VERSION = "0.6.0".freeze
+    VERSION = "0.6.1".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.11.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.11.1')
   s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.7.0')
   # Waiting for version > 2.4.5, which fixes:
   # https://github.com/thoughtbot/paperclip/issues/293

data/events/app/assets/stylesheets/events.css.scss

@@ -5,6 +5,8 @@
 //= require fullcalendar
 //= require boxy
 
+@import "colors";
+
 #calendar {
 	margin-top: 20px;
 }
@@ -17,6 +19,8 @@
 	width: 100%;
 	text-align: center;
 	padding-top: 5px;
+	border-top: thin solid $separation-color;
+	border-bottom: thin solid $separation-color;
 }
 
 #sidebar_calendar a {
@@ -25,7 +29,32 @@
 
 #sidebar_calendar td {
   height: 25px;
-  border: 1px solid #CCCCCC;
+}
+
+#sidebar_calendar td.past {
+  opacity: 0.2;
+}
+
+#sidebar_calendar td.today {
+  border: 1px solid $sentence-color;
+}
+
+#sidebar_calendar td.next_month {
+  opacity: 0.8;
+  background-color: #F2F2F2;
+}
+
+.sidebar_calendar_month {
+  text-align: center;
+  padding: 5px;
+}
+
+.sidebar_calendar_month a {
+  color: $sentence-color;
+}
+
+.sidebar_calendar_month.not_current a {
+  color: $details-color;
 }
 
 #new_event div.form_row {

data/events/app/helpers/events_helper.rb

@@ -0,0 +1,16 @@
+module EventsHelper
+  def event_class(day)
+    [].tap { |css|
+      css <<
+        if day < Date.today
+          "past"
+        elsif day == Date.today
+          "today"
+        elsif day.month != Date.today.month
+          "next_month"
+        end
+
+      #TODO: event ocurrence
+    }.join(" ")
+  end
+end

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

@@ -0,0 +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>

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

@@ -1,12 +1,13 @@
 <div class="space_center"></div>
 
 <div class="block">
-  <div class="header">
-    <div class="header_text"><%= t 'event.title' %></div>
-  </div>
-
   <div class="content">
-    <span id="sidebar_calendar_date"><%= l Date.today, :format => :long %></span>
+
+    <%= render :partial => 'events/calendar_month',
+               :locals  => {
+                 :position => :top,
+                 :date => Date.today.beginning_of_week 
+                } %>
 
   <table id="sidebar_calendar">
     <% bow = Time.now.beginning_of_week %>
@@ -14,13 +15,20 @@
     <% 28.times do |i| %>
       <% day = bow + i.days %>
 
-      <%= raw cycle("<tr>", *6.times.map{""}, :name => "tr_start") %>
-      <td<%= " class=\"fc-state-highlight\"".html_safe if day.today? %>>
-        <%= link_to day.day, polymorphic_path([subject, Event.new], :at => day.to_i) %>
+      <%= 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) %>
       </td>
 
-      <%= raw cycle(*6.times.map{""}, '</tr>', :name => "tr_end") %>
+      <%= raw cycle(*(6.times.map{""} + Array.wrap('</tr>') + Array.wrap(:name => "tr_end"))) %>
     <% end %>
   </table>
+
+    <%= render :partial => 'events/calendar_month',
+               :locals  => {
+                 :position => :bottom,
+                 :date => Date.today.beginning_of_week + 28
+                } %>
+
   </div>
 </div>

data/events/lib/social_stream/events/engine.rb

@@ -18,6 +18,12 @@ module SocialStream
           include SocialStream::Views::Settings::Events
         end
       end
+
+      initializer "social_stream-events.views.sidebar" do
+        SocialStream::Views::Sidebar.module_eval do
+          include SocialStream::Views::Sidebar::Events
+        end
+      end
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.3.0".freeze
+    VERSION = "0.3.1".freeze
   end
 end

data/events/lib/social_stream/views/sidebar/events.rb

@@ -0,0 +1,15 @@
+module SocialStream
+  module Views
+    module Sidebar
+      module Events
+        def sidebar_items type
+          super.tap do |items|
+            items.unshift :key => 'calendar',
+                          :html => render(:partial => 'events/sidebar_calendar')
+          end
+        end
+      end
+    end
+  end
+end
+

data/events/lib/social_stream-events.rb

@@ -7,6 +7,10 @@ module SocialStream
     module Settings
       autoload :Events, 'social_stream/views/settings/events'
     end
+
+    module Sidebar
+      autoload :Events, 'social_stream/views/sidebar/events'
+    end
   end
 
   module Events

data/events/social_stream-events.gemspec

@@ -12,8 +12,9 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.11.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.11.1')
   s.add_runtime_dependency('rails-scheduler', '~> 0.0.4')
+  s.add_runtime_dependency('coffee-rails', '> 3.1.0')
 
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')

data/lib/social_stream/version.rb

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

data/linkser/lib/social_stream/linkser/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Linkser
-    VERSION = "0.1.0".freeze
+    VERSION = "0.1.1".freeze
   end
 end

data/linkser/social_stream-linkser.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.11.0')
-  s.add_runtime_dependency('linkser', '~> 0.0.8')
+  s.add_runtime_dependency('social_stream-base', '~> 0.11.1')
+  s.add_runtime_dependency('linkser', '~> 0.0.9')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')
   if RUBY_VERSION < '1.9'

data/presence/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module Socialstream
   module Presence
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/presence/social_stream-presence.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base','~> 0.10.0')
+  s.add_runtime_dependency('social_stream-base','~> 0.11.0')
   
   s.add_runtime_dependency "xmpp4r"
 

data/social_stream.gemspec

@@ -11,10 +11,10 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.11.0')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.6.0')
-  s.add_runtime_dependency('social_stream-events', '~> 0.3.0')
-  s.add_runtime_dependency('social_stream-linkser', '~> 0.1.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.11.1')
+  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-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.1
+  version: 0.16.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,55 +10,55 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-21 00:00:00.000000000Z
+date: 2011-12-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &81048520 !ruby/object:Gem::Requirement
+  requirement: &83134570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.1
   type: :runtime
   prerelease: false
-  version_requirements: *81048520
+  version_requirements: *83134570
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
-  requirement: &81048140 !ruby/object:Gem::Requirement
+  requirement: &83134160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *81048140
+  version_requirements: *83134160
 - !ruby/object:Gem::Dependency
   name: social_stream-events
-  requirement: &81047780 !ruby/object:Gem::Requirement
+  requirement: &83133860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *81047780
+  version_requirements: *83133860
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
-  requirement: &81047300 !ruby/object:Gem::Requirement
+  requirement: &83121040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *81047300
+  version_requirements: *83121040
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &81046550 !ruby/object:Gem::Requirement
+  requirement: &83120690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *81046550
+  version_requirements: *83120690
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &81046250 !ruby/object:Gem::Requirement
+  requirement: &83120430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81046250
+  version_requirements: *83120430
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &81045830 !ruby/object:Gem::Requirement
+  requirement: &83119970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *81045830
+  version_requirements: *83119970
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &81045520 !ruby/object:Gem::Requirement
+  requirement: &83119500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *81045520
+  version_requirements: *83119500
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &80949110 !ruby/object:Gem::Requirement
+  requirement: &83119090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 0.3.6
   type: :development
   prerelease: false
-  version_requirements: *80949110
+  version_requirements: *83119090
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &80948750 !ruby/object:Gem::Requirement
+  requirement: &83118760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,7 +121,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *80948750
+  version_requirements: *83118760
 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: 
@@ -388,6 +388,7 @@ files:
 - base/app/helpers/profiles_helper.rb
 - base/app/helpers/search_helper.rb
 - base/app/helpers/settings_helper.rb
+- base/app/helpers/sidebar_helper.rb
 - base/app/helpers/subjects_helper.rb
 - base/app/helpers/toolbar_helper.rb
 - base/app/helpers/users_helper.rb
@@ -481,15 +482,13 @@ files:
 - base/app/views/groups/_index.html.erb
 - base/app/views/groups/_new.html.erb
 - base/app/views/groups/_show.html.erb
-- base/app/views/groups/_sidebar_index.html.erb
-- base/app/views/groups/_sidebar_show.html.erb
+- base/app/views/groups/_tag_cloud.html.erb
 - base/app/views/groups/index.html.erb
 - base/app/views/groups/index.js.erb
 - base/app/views/groups/new.html.erb
 - base/app/views/groups/show.html.erb
 - base/app/views/groups/show.js.erb
 - base/app/views/home/_groups.html.erb
-- base/app/views/home/_sidebar.html.erb
 - base/app/views/home/index.html.erb
 - base/app/views/home/index.js.erb
 - base/app/views/invitation_mailer/send_invitation.html.erb
@@ -592,7 +591,6 @@ files:
 - base/app/views/users/_groups.html.erb
 - base/app/views/users/_index.html.erb
 - base/app/views/users/_show.html.erb
-- base/app/views/users/_sidebar_index.html.erb
 - base/app/views/users/_user.html.erb
 - base/app/views/users/_user_focus_search.html.erb
 - base/app/views/users/_user_global_search.html.erb
@@ -624,6 +622,7 @@ files:
 - base/lib/social_stream-base.rb
 - base/lib/social_stream/ability.rb
 - base/lib/social_stream/ability/base.rb
+- base/lib/social_stream/base/dependencies.rb
 - base/lib/social_stream/base/engine.rb
 - base/lib/social_stream/base/version.rb
 - base/lib/social_stream/controllers/cancan_devise_integration.rb
@@ -639,8 +638,9 @@ files:
 - base/lib/social_stream/test_helpers.rb
 - base/lib/social_stream/test_helpers/controllers.rb
 - base/lib/social_stream/toolbar_config/base.rb
+- base/lib/social_stream/views/list.rb
 - base/lib/social_stream/views/settings/base.rb
-- base/lib/social_stream/views/settings/item_list.rb
+- base/lib/social_stream/views/sidebar/base.rb
 - base/lib/tasks/db/populate.rake
 - base/lib/tasks/workers.rake
 - base/social_stream-base.gemspec
@@ -950,8 +950,10 @@ files:
 - events/app/assets/stylesheets/social_stream-events.css
 - events/app/controllers/events_controller.rb
 - events/app/controllers/rooms_controller.rb
+- events/app/helpers/events_helper.rb
 - events/app/models/event.rb
 - events/app/models/room.rb
+- events/app/views/events/_calendar_month.erb
 - events/app/views/events/_event.html.erb
 - events/app/views/events/_new.html.erb
 - events/app/views/events/_sidebar_calendar.html.erb
@@ -979,6 +981,7 @@ files:
 - events/lib/social_stream/migrations/events.rb
 - events/lib/social_stream/toolbar_config/events.rb
 - events/lib/social_stream/views/settings/events.rb
+- events/lib/social_stream/views/sidebar/events.rb
 - events/social_stream-events.gemspec
 - events/vendor/assets/images/boxy-ne.png
 - events/vendor/assets/images/boxy-nw.png
@@ -1329,8 +1332,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: A core for building social network websites
 test_files: []
+has_rdoc: 

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

@@ -1,3 +0,0 @@
-<div class="space_center"></div>
-
-<%= render :partial => 'contacts/suggestions_and_pendings' %>

data/base/app/views/home/_sidebar.html.erb

@@ -1,2 +0,0 @@
-<%= render :partial => 'contacts/suggestions_and_pendings' %>
-

data/base/app/views/users/_sidebar_index.html.erb

@@ -1 +0,0 @@
-<%= render :partial => 'contacts/suggestions_and_pendings' %>

data/base/lib/social_stream/views/settings/item_list.rb

@@ -1,13 +0,0 @@
-module SocialStream
-  module Views
-    module Settings
-      class ItemList < Array
-        def insert_before key, obj
-          position = index{ |i| i[:key] == 'notifications' } + 1
-
-          insert position, obj
-        end
-      end
-    end
-  end
-end