social_stream-events 0.3.0 → 0.3.1

data/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/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/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/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/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/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/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/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/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')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-events
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ 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: &77019770 !ruby/object:Gem::Requirement
+  requirement: &82754740 !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: *77019770
+  version_requirements: *82754740
 - !ruby/object:Gem::Dependency
   name: rails-scheduler
-  requirement: &77019500 !ruby/object:Gem::Requirement
+  requirement: &82754470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,21 @@ dependencies:
         version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *77019500
+  version_requirements: *82754470
+- !ruby/object:Gem::Dependency
+  name: coffee-rails
+  requirement: &82754150 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *82754150
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &77019200 !ruby/object:Gem::Requirement
+  requirement: &82753900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77019200
+  version_requirements: *82753900
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.
 
@@ -67,8 +78,10 @@ files:
 - app/assets/stylesheets/social_stream-events.css
 - app/controllers/events_controller.rb
 - app/controllers/rooms_controller.rb
+- app/helpers/events_helper.rb
 - app/models/event.rb
 - app/models/room.rb
+- app/views/events/_calendar_month.erb
 - app/views/events/_event.html.erb
 - app/views/events/_new.html.erb
 - app/views/events/_sidebar_calendar.html.erb
@@ -96,6 +109,7 @@ files:
 - lib/social_stream/migrations/events.rb
 - lib/social_stream/toolbar_config/events.rb
 - lib/social_stream/views/settings/events.rb
+- lib/social_stream/views/sidebar/events.rb
 - social_stream-events.gemspec
 - vendor/assets/images/boxy-ne.png
 - vendor/assets/images/boxy-nw.png
@@ -128,9 +142,10 @@ 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: Scheduled events support for Social Stream, the core for building social
   network websites
 test_files: []
+has_rdoc: