social_stream-events 2.0.1 → 2.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/social_stream/calendar.js.erb +1 -1
  3. data/app/assets/stylesheets/social_stream/events/calendar/_calendar.css.sass +0 -5
  4. data/app/assets/stylesheets/social_stream/events/calendar/_calendar_modal.css.sass +11 -3
  5. data/app/views/events/_new.html.erb +7 -4
  6. data/lib/social_stream/events/version.rb +1 -1
  7. data/social_stream-events.gemspec +1 -1
  8. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b17c4eac62703483c29357600f331305608aeee9
4
- data.tar.gz: 110273eaa485c07751c66061f9889df67db75a0f
3
+ metadata.gz: 3ba94e4a544ffbadd953ba9f1c88c41844231afc
4
+ data.tar.gz: d8bbb505630d707c3d250f078013daf6d29bb575
5
5
  SHA512:
6
- metadata.gz: 81642c689c2080af7b32452f6316c171c9ee0b6471a72306b9ee3cbbc43ef08a1af9e69f85a120f51829eb982aaed3352d3768cd5d1cec006e06b524ee6f8e79
7
- data.tar.gz: dde6165877b04ed080ab4f33a7a7a3dfdaa11bbba4eea1386b28c9732af6bc4788a73027999c77c2624a246e419504cc082d09b8a5d7beb7c81f6ddca6324677
6
+ metadata.gz: e0bccf418b36c54d5cf6958705bae9195d8917cb999040d70eec157ea84edf5176de1e22be4c87da61c96fbc7ee297a461bd6d70567c1c37b6960d0c1476a24d
7
+ data.tar.gz: 6e3a3bf07d40322858e4da875edf396d91fe8fbf8951d56cf7dadd817ea45640d2438f5c1fe8c020363c2baa637b3b37062bdafda8de29f1cbb548ff8acc1943
data/app/assets/javascripts/social_stream/calendar.js.erb CHANGED
@@ -96,7 +96,7 @@ SocialStream.Calendar = (function(SS, $, undefined){
96
96
 
97
97
  modal.appendTo($('body'));
98
98
 
99
- modal.modal();
99
+ modal.modal({ dynamic: true });
100
100
 
101
101
  el.attr('data-loaded', true);
102
102
  };
data/app/assets/stylesheets/social_stream/events/calendar/_calendar.css.sass CHANGED
@@ -56,8 +56,3 @@
56
56
 
57
57
  .fc-event-skin
58
58
  background-color: $gray
59
-
60
-
61
- #calendar_form
62
- .modal-body
63
- background: whitesmoke
data/app/assets/stylesheets/social_stream/events/calendar/_calendar_modal.css.sass CHANGED
@@ -1,5 +1,7 @@
1
1
 
2
2
  #scheduler-options
3
+ display: block !important
4
+ min-height: 40px
3
5
  input
4
6
  padding: 0 9px 0 7px
5
7
  text-align: center
@@ -8,8 +10,14 @@
8
10
  .scheduler_form
9
11
  input
10
12
  &[type="submit"]
11
-
12
-
13
+ @include btn-primary
14
+ @include border-radius(5px)
15
+ .form-privacy
16
+ clear: left
13
17
 
14
18
  #scheduler-weekly-days
15
- background-color: $white
19
+ @include border-radius(4px)
20
+ background-color: rgba(245, 245, 245, 0.67)
21
+ text-align: right
22
+ margin-right: 12px
23
+ margin-bottom: 5px
data/app/views/events/_new.html.erb CHANGED
@@ -15,16 +15,19 @@
15
15
  </ul>
16
16
  </div>
17
17
  <% end %>
18
-
18
+ <section>
19
19
  <%= f.label :title %>
20
20
  <%= f.text_field :title %>
21
-
21
+ </section>
22
+ <section>
22
23
  <%= f.label :description %>
23
24
  <%= f.text_area :description %>
24
-
25
+ </section>
25
26
  <% if f.object.owner.rooms.any? %>
27
+ <section>
26
28
  <%= f.label :room %>
27
29
  <%= f.select :room_id, f.object.owner.rooms.map{ |r| [r.name, r.id] }, { include_blank: true } %>
30
+ </section>
28
31
  <% end %>
29
32
 
30
33
  <%= render :partial => 'scheduler/form',
@@ -33,5 +36,5 @@
33
36
  <%= render partial: 'objects/form_privacy',
34
37
  locals: { f: f } %>
35
38
 
36
- <%= f.submit nil, { class: "btn-blue" } %>
39
+ <%= f.submit nil %>
37
40
  <% end %>
data/lib/social_stream/events/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module SocialStream
2
2
  module Events
3
- VERSION = "2.0.1".freeze
3
+ VERSION = "2.0.2".freeze
4
4
  end
5
5
  end
data/social_stream-events.gemspec CHANGED
@@ -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', '~> 2.0.2')
15
+ s.add_runtime_dependency('social_stream-base', '~> 2.0.4')
16
16
  s.add_runtime_dependency('rails-scheduler', '~> 0.1.2')
17
17
 
18
18
  # Development Gem dependencies
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: 2.0.1
4
+ version: 2.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Antonio Tapiador
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-05-29 00:00:00.000000000 Z
12
+ date: 2013-06-18 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: social_stream-base
@@ -17,14 +17,14 @@ dependencies:
17
17
  requirements:
18
18
  - - ~>
19
19
  - !ruby/object:Gem::Version
20
- version: 2.0.2
20
+ version: 2.0.4
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
25
  - - ~>
26
26
  - !ruby/object:Gem::Version
27
- version: 2.0.2
27
+ version: 2.0.4
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: rails-scheduler
30
30
  requirement: !ruby/object:Gem::Requirement