social_stream-events 0.3.1 → 0.3.2

Sign up to get free protection for your applications and to get access to all the features.
@@ -1 +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>
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"), polymorphic_path([profile_or_current_subject, Event.new], :date => date.to_time.to_i) %></div>
@@ -17,7 +17,7 @@
17
17
 
18
18
  <%= raw cycle(*(Array.wrap("<tr>") + 6.times.map{""}) + Array.wrap(:name => "tr_start")) %>
19
19
  <td class="<%= event_class(day.to_date) %>">
20
- <%= link_to day.day, polymorphic_path([profile_or_current_subject, Event.new], :at => day.to_i) %>
20
+ <%= link_to day.day, polymorphic_path([profile_or_current_subject, Event.new], :date => day.to_i, :view => "agendaDay") %>
21
21
  </td>
22
22
 
23
23
  <%= raw cycle(*(6.times.map{""} + Array.wrap('</tr>') + Array.wrap(:name => "tr_end"))) %>
@@ -1,7 +1,7 @@
1
1
  <% content_for :headers do %>
2
2
  <style type="text/css">
3
3
  #sidebar {width: 0px;}
4
- #center_body {width: 780px; max-width: 780px;}
4
+ #center_body {width: 780px; max-width: 780px; border-right: 0px;}
5
5
  </style>
6
6
  <% end %>
7
7
 
@@ -87,10 +87,13 @@
87
87
  }
88
88
  });
89
89
 
90
- <% if params[:at] %>
90
+ <% if params[:date] %>
91
91
  // TODO: optimize this to save one index call
92
- SocialStream.Events.current.calendar.fullCalendar('changeView', "agendaDay");
93
- SocialStream.Events.current.calendar.fullCalendar('gotoDate', new Date(<%= params[:at] %> * 1000));
92
+ SocialStream.Events.current.calendar.fullCalendar('gotoDate', new Date(<%= escape_javascript params[:date] %> * 1000));
93
+ <% end %>
94
+
95
+ <% if params[:view] %>
96
+ SocialStream.Events.current.calendar.fullCalendar('changeView', "<%= escape_javascript params[:view] %>");
94
97
  <% end %>
95
98
  });
96
99
  <% end %>
@@ -1,5 +1,5 @@
1
1
  module SocialStream
2
2
  module Events
3
- VERSION = "0.3.1".freeze
3
+ VERSION = "0.3.2".freeze
4
4
  end
5
5
  end
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
12
12
  s.files = `git ls-files`.split("\n")
13
13
 
14
14
  # Gem dependencies
15
- s.add_runtime_dependency('social_stream-base', '~> 0.11.1')
15
+ s.add_runtime_dependency('social_stream-base', '~> 0.11.2')
16
16
  s.add_runtime_dependency('rails-scheduler', '~> 0.0.4')
17
17
  s.add_runtime_dependency('coffee-rails', '> 3.1.0')
18
18
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: social_stream-events
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.1
4
+ version: 0.3.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,22 +10,22 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2011-12-22 00:00:00.000000000Z
13
+ date: 2011-12-23 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: social_stream-base
17
- requirement: &82754740 !ruby/object:Gem::Requirement
17
+ requirement: &70335200 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ~>
21
21
  - !ruby/object:Gem::Version
22
- version: 0.11.1
22
+ version: 0.11.2
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *82754740
25
+ version_requirements: *70335200
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: rails-scheduler
28
- requirement: &82754470 !ruby/object:Gem::Requirement
28
+ requirement: &70334950 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ~>
@@ -33,10 +33,10 @@ dependencies:
33
33
  version: 0.0.4
34
34
  type: :runtime
35
35
  prerelease: false
36
- version_requirements: *82754470
36
+ version_requirements: *70334950
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: coffee-rails
39
- requirement: &82754150 !ruby/object:Gem::Requirement
39
+ requirement: &70334710 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - ! '>'
@@ -44,10 +44,10 @@ dependencies:
44
44
  version: 3.1.0
45
45
  type: :runtime
46
46
  prerelease: false
47
- version_requirements: *82754150
47
+ version_requirements: *70334710
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: sqlite3-ruby
50
- requirement: &82753900 !ruby/object:Gem::Requirement
50
+ requirement: &70334500 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
55
55
  version: '0'
56
56
  type: :development
57
57
  prerelease: false
58
- version_requirements: *82753900
58
+ version_requirements: *70334500
59
59
  description: ! 'Social Stream is a Ruby on Rails engine providing your application
60
60
  with social networking features and activity streams.
61
61