social_stream-events 0.6.1 → 0.6.2

Sign up to get free protection for your applications and to get access to all the features.
@@ -3,7 +3,7 @@
3
3
  <div class="block">
4
4
  <div class="content">
5
5
 
6
- <% bow = (Time.now - 1.days).beginning_of_week %>
6
+ <% bow = (Time.now - 6.days).beginning_of_week %>
7
7
 
8
8
  <%= render :partial => 'events/calendar_month',
9
9
  :locals => {
@@ -17,8 +17,8 @@
17
17
  <% day = bow + i.days %>
18
18
 
19
19
  <%= raw cycle(*(Array.wrap("<tr>") + 6.times.map{""}) + Array.wrap(:name => "tr_start")) %>
20
- <td id="sidebar_day_<%= day.day %>_<%= day.month %>_<%= day.year %>" class="sidebar_day">
21
- <%= link_to day.day, polymorphic_path([profile_or_current_subject, Event.new], :date => day.to_i, :view => "agendaDay") %>
20
+ <td id="sidebar_day_<%= day.day %>_<%= day.month %>_<%= day.year %>">
21
+ <%= link_to day.day, polymorphic_path([profile_or_current_subject, Event.new], :date => day.to_i, :view => "agendaWeek") %>
22
22
  </td>
23
23
 
24
24
  <%= raw cycle(*(6.times.map{""} + Array.wrap('</tr>') + Array.wrap(:name => "tr_end"))) %>
@@ -29,12 +29,12 @@
29
29
  var now = new Date();
30
30
  $('#sidebar_day_' + now.getDate() + '_' + (now.getMonth()+1) + '_' + now.getFullYear()).addClass('today');
31
31
  var re = new RegExp('sidebar_day_(..?)_(..?)_(..?.?.?)');
32
- $('.sidebar_day').each(function(index, domEl){
32
+ $('#sidebar_calendar td').each(function(index, domEl){
33
33
  var m = re.exec(domEl.id);
34
34
  if(m == null) return;
35
35
  var d = new Date(m[3], (m[2]-1), m[1], 23, 59, 59);
36
36
  if(d < now) $(domEl).addClass('past');
37
- if(m[2] != (now.getMonth()+1)) $(domEl).addClass('next_month');
37
+ if(m[2] != (now.getMonth()+1) && d > now) $(domEl).addClass('next_month');
38
38
  });
39
39
  $.ajax({
40
40
  dataType: 'json',
@@ -1,5 +1,5 @@
1
1
  module SocialStream
2
2
  module Events
3
- VERSION = "0.6.1".freeze
3
+ VERSION = "0.6.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.14.1')
15
+ s.add_runtime_dependency('social_stream-base', '~> 0.14.3')
16
16
  s.add_runtime_dependency('rails-scheduler', '~> 0.0.6')
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.6.1
4
+ version: 0.6.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: 2012-02-01 00:00:00.000000000Z
13
+ date: 2012-02-03 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: social_stream-base
17
- requirement: &88978050 !ruby/object:Gem::Requirement
17
+ requirement: &83676840 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ~>
21
21
  - !ruby/object:Gem::Version
22
- version: 0.14.1
22
+ version: 0.14.3
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *88978050
25
+ version_requirements: *83676840
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: rails-scheduler
28
- requirement: &88977780 !ruby/object:Gem::Requirement
28
+ requirement: &83657480 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ~>
@@ -33,10 +33,10 @@ dependencies:
33
33
  version: 0.0.6
34
34
  type: :runtime
35
35
  prerelease: false
36
- version_requirements: *88977780
36
+ version_requirements: *83657480
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: coffee-rails
39
- requirement: &88977530 !ruby/object:Gem::Requirement
39
+ requirement: &83657250 !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: *88977530
47
+ version_requirements: *83657250
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: sqlite3-ruby
50
- requirement: &88977330 !ruby/object:Gem::Requirement
50
+ requirement: &83657060 !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: *88977330
58
+ version_requirements: *83657060
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