social_stream 0.11.0 → 0.11.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (96) hide show
  1. data/.travis.yml +6 -0
  2. data/Gemfile +9 -0
  3. data/base/app/assets/images/frontpage/right_conference.png +0 -0
  4. data/base/app/assets/images/loader.gif +0 -0
  5. data/base/app/assets/javascripts/jquery.ad-gallery.js +850 -0
  6. data/base/app/assets/javascripts/jquery.ad-gallery.pack.js +10 -0
  7. data/base/app/assets/stylesheets/_colors.scss +6 -3
  8. data/base/app/assets/stylesheets/ad_next.png +0 -0
  9. data/base/app/assets/stylesheets/ad_prev.png +0 -0
  10. data/base/app/assets/stylesheets/ad_scroll_back.png +0 -0
  11. data/base/app/assets/stylesheets/ad_scroll_forward.png +0 -0
  12. data/base/app/assets/stylesheets/contacts.css.scss +1 -0
  13. data/base/app/assets/stylesheets/frontpage.css.scss +10 -3
  14. data/base/app/assets/stylesheets/header.css.scss +5 -5
  15. data/base/app/assets/stylesheets/{home.css → home.css.scss} +12 -11
  16. data/base/app/assets/stylesheets/jquery.ad-gallery.css +171 -0
  17. data/base/app/assets/stylesheets/loader.gif +0 -0
  18. data/base/app/assets/stylesheets/{location.css → location.css.scss} +3 -1
  19. data/base/app/assets/stylesheets/menu.css.scss +19 -0
  20. data/base/app/assets/stylesheets/{messages.css → messages.css.scss} +17 -15
  21. data/base/app/assets/stylesheets/opa75.png +0 -0
  22. data/base/app/assets/stylesheets/{relation_customs.css → relation_customs.css.scss} +9 -27
  23. data/base/app/assets/stylesheets/{search.css → search.css.scss} +26 -23
  24. data/base/app/assets/stylesheets/{ties.css → ties.css.scss} +4 -2
  25. data/base/app/controllers/search_controller.rb +1 -1
  26. data/base/app/helpers/search_helper.rb +25 -5
  27. data/base/app/helpers/toolbar_helper.rb +1 -1
  28. data/base/app/models/post.rb +4 -4
  29. data/base/app/views/frontpage/_caracteristics.html.erb +7 -7
  30. data/base/app/views/frontpage/_header.html.erb +2 -4
  31. data/base/app/views/frontpage/_social_networks.html.erb +5 -0
  32. data/base/app/views/frontpage/index.html.erb +0 -3
  33. data/base/app/views/groups/_group_focus_search.html.erb +2 -0
  34. data/base/app/views/groups/_group_global_search.html.erb +2 -0
  35. data/base/app/views/groups/_show.html.erb +33 -0
  36. data/base/app/views/groups/_show_frontpage.html.erb +11 -0
  37. data/base/app/views/groups/show.html.erb +5 -32
  38. data/base/app/views/layouts/application.html.erb +2 -2
  39. data/base/app/views/posts/_post_focus_search.html.erb +3 -0
  40. data/base/app/views/posts/_post_global_search.html.erb +16 -0
  41. data/base/app/views/posts/_post_with_details.html.erb +3 -0
  42. data/base/app/views/search/_extended_search.html.erb +7 -2
  43. data/base/app/views/search/_header_search.html.erb +1 -1
  44. data/base/app/views/users/_show.html.erb +33 -0
  45. data/base/app/views/users/_show_frontpage.html.erb +11 -0
  46. data/base/app/views/users/_user_focus_search.html.erb +2 -0
  47. data/base/app/views/users/_user_global_search.html.erb +2 -0
  48. data/base/app/views/users/show.html.erb +5 -32
  49. data/base/config/locales/en.yml +5 -3
  50. data/base/config/locales/es.yml +2 -2
  51. data/base/lib/social_stream-base.rb +2 -2
  52. data/base/lib/social_stream/base/version.rb +1 -1
  53. data/documents/app/views/audios/_audio_focus_search.html.erb +3 -0
  54. data/documents/app/views/audios/_audio_global_search.html.erb +3 -0
  55. data/documents/app/views/documents/_document_focus_search.html.erb +2 -0
  56. data/documents/app/views/documents/_document_global_search.html.erb +2 -0
  57. data/documents/app/views/pictures/_picture_focus_search.html.erb +2 -0
  58. data/documents/app/views/pictures/_picture_global_search.html.erb +2 -0
  59. data/documents/app/views/videos/_video_focus_search.html.erb +2 -0
  60. data/documents/app/views/videos/_video_global_search.html.erb +2 -0
  61. data/documents/lib/social_stream-documents.rb +5 -0
  62. data/documents/lib/social_stream/documents/version.rb +1 -1
  63. data/documents/social_stream-documents.gemspec +1 -1
  64. data/events/app/assets/images/frontpage/thumbs/tvideo_1_happy.jpg +0 -0
  65. data/events/app/assets/images/frontpage/thumbs/tvideo_2_kostas.jpg +0 -0
  66. data/events/app/assets/images/frontpage/thumbs/tvideo_3_colin.jpg +0 -0
  67. data/events/app/assets/images/frontpage/thumbs/tvideo_4_romilla.jpg +0 -0
  68. data/events/app/assets/images/frontpage/video_1_happy.jpg +0 -0
  69. data/events/app/assets/images/frontpage/video_2_kostas.jpg +0 -0
  70. data/events/app/assets/images/frontpage/video_3_colin.jpg +0 -0
  71. data/events/app/assets/images/frontpage/video_4_romilla.jpg +0 -0
  72. data/events/app/assets/javascripts/jquery.ad-gallery.js +850 -0
  73. data/events/app/assets/javascripts/jquery.ad-gallery.pack.js +10 -0
  74. data/events/app/assets/stylesheets/ad_next.png +0 -0
  75. data/events/app/assets/stylesheets/ad_prev.png +0 -0
  76. data/events/app/assets/stylesheets/ad_scroll_back.png +0 -0
  77. data/events/app/assets/stylesheets/ad_scroll_forward.png +0 -0
  78. data/events/app/assets/stylesheets/jquery.ad-gallery.css +171 -0
  79. data/events/app/assets/stylesheets/loader.gif +0 -0
  80. data/events/app/views/events/_event_focus_search.html.erb +2 -0
  81. data/events/app/views/events/_event_global_search.html.erb +2 -0
  82. data/events/app/views/frontpage/_caracteristics.html.erb +73 -0
  83. data/events/app/views/frontpage/index.html.erb +72 -0
  84. data/events/config/locales/en.yml +14 -0
  85. data/events/config/locales/es.yml +103 -0
  86. data/events/lib/social_stream-events.rb +3 -0
  87. data/events/lib/social_stream/events/version.rb +1 -1
  88. data/events/social_stream-events.gemspec +1 -1
  89. data/lib/social_stream/version.rb +1 -1
  90. data/social_stream.gemspec +3 -3
  91. data/spec/dummy/config/database.yml +8 -5
  92. data/spec/spec_helper.rb +4 -0
  93. data/spec/support/components.rb +1 -1
  94. metadata +71 -21
  95. data/base/app/assets/stylesheets/menu.css +0 -26
  96. data/base/spec/support/thinking-sphinx.rb +0 -10
data/events/lib/social_stream-events.rb CHANGED
@@ -11,6 +11,9 @@ module SocialStream
11
11
  # by default
12
12
  # It can be configured by users at application's config/initializers/social_stream.rb
13
13
  SocialStream.subjects.push(:event) unless SocialStream.subjects.include?(:event)
14
+
15
+ SocialStream.quick_search_models.push(:event) unless SocialStream.quick_search_models.include?(:event)
16
+ SocialStream.extended_search_models.push(:event) unless SocialStream.extended_search_models.include?(:event)
14
17
 
15
18
  [ :agenda, :session ].each do |o|
16
19
  SocialStream.objects.push(o) unless SocialStream.objects.include?(o)
data/events/lib/social_stream/events/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module SocialStream
2
2
  module Events
3
- VERSION = "0.0.8".freeze
3
+ VERSION = "0.0.9".freeze
4
4
  end
5
5
  end
data/events/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', '~> 0.9.15')
15
+ s.add_runtime_dependency('social_stream-base', '~> 0.9.16')
16
16
  s.add_runtime_dependency('conference_manager-ruby', '~> 0.0.3')
17
17
 
18
18
  # Development Gem dependencies
data/lib/social_stream/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module SocialStream
2
- VERSION = "0.11.0".freeze
2
+ VERSION = "0.11.1".freeze
3
3
  end
data/social_stream.gemspec CHANGED
@@ -11,9 +11,9 @@ Gem::Specification.new do |s|
11
11
  s.files = `git ls-files`.split("\n")
12
12
 
13
13
  # Gem dependencies
14
- s.add_runtime_dependency('social_stream-base', '~> 0.9.15')
15
- s.add_runtime_dependency('social_stream-documents', '~> 0.3.0')
16
- s.add_runtime_dependency('social_stream-events', '~> 0.0.8')
14
+ s.add_runtime_dependency('social_stream-base', '~> 0.9.16')
15
+ s.add_runtime_dependency('social_stream-documents', '~> 0.3.1')
16
+ s.add_runtime_dependency('social_stream-events', '~> 0.0.9')
17
17
 
18
18
  # Development Gem dependencies
19
19
  #
data/spec/dummy/config/database.yml CHANGED
@@ -18,13 +18,16 @@ test:
18
18
  pool: 5
19
19
  timeout: 5000
20
20
 
21
- test_pg:
21
+ test_mysql:
22
+ adapter: mysql2
23
+ database: social_stream_test
24
+ username:
25
+ encoding: utf8
26
+
27
+ test_postgres:
22
28
  adapter: postgresql
23
- encoding: unicode
24
29
  database: social_stream_test
25
- pool: 5
26
- username: social_stream
27
- password:
30
+ username: postgres
28
31
 
29
32
  production:
30
33
  adapter: sqlite3
data/spec/spec_helper.rb CHANGED
@@ -4,6 +4,10 @@ ENV["RAILS_ENV"] ||= "test"
4
4
  require File.expand_path("../dummy/config/environment.rb", __FILE__)
5
5
  require "rspec/rails"
6
6
 
7
+ db_name = (ENV['DB'].present? ? "#{ ENV["RAILS_ENV"] }_#{ ENV['DB'] }" : "test")
8
+ ActiveRecord::Base.establish_connection(db_name)
9
+ ActiveRecord::Base.default_timezone = :utc
10
+
7
11
  ActionMailer::Base.delivery_method = :test
8
12
  ActionMailer::Base.perform_deliveries = true
9
13
  ActionMailer::Base.default_url_options[:host] = "test.com"
data/spec/support/components.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- :base => [ :cancan, :devise, :mock, 'thinking-sphinx' ]
2
+ :base => [ :cancan, :devise, :mock ]
3
3
  }.each_pair do |component, files|
4
4
  files.each do |file|
5
5
  require File.expand_path("../../../#{ component }/spec/support/#{ file }.rb", __FILE__)
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: social_stream
3
3
  version: !ruby/object:Gem::Version
4
- hash: 51
4
+ hash: 49
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 11
9
- - 0
10
- version: 0.11.0
9
+ - 1
10
+ version: 0.11.1
11
11
  platform: ruby
12
12
  authors:
13
13
  - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2011-10-06 00:00:00 +02:00
19
+ date: 2011-10-07 00:00:00 +02:00
20
20
  default_executable:
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency
@@ -27,12 +27,12 @@ dependencies:
27
27
  requirements:
28
28
  - - ~>
29
29
  - !ruby/object:Gem::Version
30
- hash: 37
30
+ hash: 27
31
31
  segments:
32
32
  - 0
33
33
  - 9
34
- - 15
35
- version: 0.9.15
34
+ - 16
35
+ version: 0.9.16
36
36
  type: :runtime
37
37
  version_requirements: *id001
38
38
  - !ruby/object:Gem::Dependency
@@ -43,12 +43,12 @@ dependencies:
43
43
  requirements:
44
44
  - - ~>
45
45
  - !ruby/object:Gem::Version
46
- hash: 19
46
+ hash: 17
47
47
  segments:
48
48
  - 0
49
49
  - 3
50
- - 0
51
- version: 0.3.0
50
+ - 1
51
+ version: 0.3.1
52
52
  type: :runtime
53
53
  version_requirements: *id002
54
54
  - !ruby/object:Gem::Dependency
@@ -59,12 +59,12 @@ dependencies:
59
59
  requirements:
60
60
  - - ~>
61
61
  - !ruby/object:Gem::Version
62
- hash: 15
62
+ hash: 13
63
63
  segments:
64
64
  - 0
65
65
  - 0
66
- - 8
67
- version: 0.0.8
66
+ - 9
67
+ version: 0.0.9
68
68
  type: :runtime
69
69
  version_requirements: *id003
70
70
  - !ruby/object:Gem::Dependency
@@ -316,6 +316,7 @@ files:
316
316
  - base/app/assets/images/frontpage/people.png
317
317
  - base/app/assets/images/frontpage/purple_sq.png
318
318
  - base/app/assets/images/frontpage/right_comments.gif
319
+ - base/app/assets/images/frontpage/right_conference.png
319
320
  - base/app/assets/images/frontpage/right_organizers.gif
320
321
  - base/app/assets/images/frontpage/right_people.gif
321
322
  - base/app/assets/images/frontpage/right_social.gif
@@ -352,6 +353,8 @@ files:
352
353
  - base/app/assets/javascripts/conversations.js
353
354
  - base/app/assets/javascripts/groups.js
354
355
  - base/app/assets/javascripts/invitations.js
356
+ - base/app/assets/javascripts/jquery.ad-gallery.js
357
+ - base/app/assets/javascripts/jquery.ad-gallery.pack.js
355
358
  - base/app/assets/javascripts/layouts.js
356
359
  - base/app/assets/javascripts/messages.js
357
360
  - base/app/assets/javascripts/posts.js
@@ -367,6 +370,10 @@ files:
367
370
  - base/app/assets/stylesheets/0_devise_sign.css
368
371
  - base/app/assets/stylesheets/_colors.scss
369
372
  - base/app/assets/stylesheets/activities.css.scss
373
+ - base/app/assets/stylesheets/ad_next.png
374
+ - base/app/assets/stylesheets/ad_prev.png
375
+ - base/app/assets/stylesheets/ad_scroll_back.png
376
+ - base/app/assets/stylesheets/ad_scroll_forward.png
370
377
  - base/app/assets/stylesheets/base.css.scss
371
378
  - base/app/assets/stylesheets/contacts.css.scss
372
379
  - base/app/assets/stylesheets/conversations.css
@@ -374,7 +381,7 @@ files:
374
381
  - base/app/assets/stylesheets/frontpage.css.scss
375
382
  - base/app/assets/stylesheets/groups.css
376
383
  - base/app/assets/stylesheets/header.css.scss
377
- - base/app/assets/stylesheets/home.css
384
+ - base/app/assets/stylesheets/home.css.scss
378
385
  - base/app/assets/stylesheets/images/add-policy.png
379
386
  - base/app/assets/stylesheets/images/fcbkcomplete/close.gif
380
387
  - base/app/assets/stylesheets/images/loading.gif
@@ -392,15 +399,18 @@ files:
392
399
  - base/app/assets/stylesheets/images/ui-icons_888888_256x240.png
393
400
  - base/app/assets/stylesheets/images/ui-icons_cd0a0a_256x240.png
394
401
  - base/app/assets/stylesheets/invitations.css
395
- - base/app/assets/stylesheets/location.css
396
- - base/app/assets/stylesheets/menu.css
397
- - base/app/assets/stylesheets/messages.css
402
+ - base/app/assets/stylesheets/jquery.ad-gallery.css
403
+ - base/app/assets/stylesheets/loader.gif
404
+ - base/app/assets/stylesheets/location.css.scss
405
+ - base/app/assets/stylesheets/menu.css.scss
406
+ - base/app/assets/stylesheets/messages.css.scss
407
+ - base/app/assets/stylesheets/opa75.png
398
408
  - base/app/assets/stylesheets/profiles.css
399
- - base/app/assets/stylesheets/relation_customs.css
400
- - base/app/assets/stylesheets/search.css
409
+ - base/app/assets/stylesheets/relation_customs.css.scss
410
+ - base/app/assets/stylesheets/search.css.scss
401
411
  - base/app/assets/stylesheets/settings.css
402
412
  - base/app/assets/stylesheets/social_stream-base.css
403
- - base/app/assets/stylesheets/ties.css
413
+ - base/app/assets/stylesheets/ties.css.scss
404
414
  - base/app/assets/stylesheets/toolbar.css
405
415
  - base/app/assets/stylesheets/users.css
406
416
  - base/app/controllers/activities_controller.rb
@@ -514,15 +524,20 @@ files:
514
524
  - base/app/views/devise/shared/_links.erb
515
525
  - base/app/views/frontpage/_caracteristics.html.erb
516
526
  - base/app/views/frontpage/_header.html.erb
527
+ - base/app/views/frontpage/_social_networks.html.erb
517
528
  - base/app/views/frontpage/_sponsor.html.erb
518
529
  - base/app/views/frontpage/host_meta.xml.builder
519
530
  - base/app/views/frontpage/index.html.erb
520
531
  - base/app/views/groups/_group.html.erb
532
+ - base/app/views/groups/_group_focus_search.html.erb
533
+ - base/app/views/groups/_group_global_search.html.erb
521
534
  - base/app/views/groups/_group_with_details.html.erb
522
535
  - base/app/views/groups/_index.html.erb
523
536
  - base/app/views/groups/_new.html.erb
524
537
  - base/app/views/groups/_new_activity.html.erb
525
538
  - base/app/views/groups/_new_activity_fields.html.erb
539
+ - base/app/views/groups/_show.html.erb
540
+ - base/app/views/groups/_show_frontpage.html.erb
526
541
  - base/app/views/groups/_sidebar_index.html.erb
527
542
  - base/app/views/groups/_sidebar_show.html.erb
528
543
  - base/app/views/groups/index.html.erb
@@ -587,6 +602,9 @@ files:
587
602
  - base/app/views/posts/_new_activity.html.erb
588
603
  - base/app/views/posts/_new_activity_fields.erb
589
604
  - base/app/views/posts/_post.html.erb
605
+ - base/app/views/posts/_post_focus_search.html.erb
606
+ - base/app/views/posts/_post_global_search.html.erb
607
+ - base/app/views/posts/_post_with_details.html.erb
590
608
  - base/app/views/posts/create.js.erb
591
609
  - base/app/views/posts/destroy.js.erb
592
610
  - base/app/views/posts/show.html.erb
@@ -629,8 +647,12 @@ files:
629
647
  - base/app/views/toolbar/_subject.html.erb
630
648
  - base/app/views/users/_groups.html.erb
631
649
  - base/app/views/users/_index.html.erb
650
+ - base/app/views/users/_show.html.erb
651
+ - base/app/views/users/_show_frontpage.html.erb
632
652
  - base/app/views/users/_sidebar_index.html.erb
633
653
  - base/app/views/users/_user.html.erb
654
+ - base/app/views/users/_user_focus_search.html.erb
655
+ - base/app/views/users/_user_global_search.html.erb
634
656
  - base/app/views/users/_user_with_details.html.erb
635
657
  - base/app/views/users/index.html.erb
636
658
  - base/app/views/users/index.js.erb
@@ -751,7 +773,6 @@ files:
751
773
  - base/spec/support/db.rb
752
774
  - base/spec/support/devise.rb
753
775
  - base/spec/support/mock.rb
754
- - base/spec/support/thinking-sphinx.rb
755
776
  - base/vendor/assets/javascripts/ajax.paginate.js
756
777
  - base/vendor/assets/javascripts/chosen.jquery.js
757
778
  - base/vendor/assets/javascripts/d3.geom.js
@@ -854,6 +875,8 @@ files:
854
875
  - documents/app/models/picture.rb
855
876
  - documents/app/models/video.rb
856
877
  - documents/app/views/audios/_audio.html.erb
878
+ - documents/app/views/audios/_audio_focus_search.html.erb
879
+ - documents/app/views/audios/_audio_global_search.html.erb
857
880
  - documents/app/views/audios/_audio_processed.html.erb
858
881
  - documents/app/views/audios/_audio_processing.html.erb
859
882
  - documents/app/views/audios/_audio_with_details.html.erb
@@ -865,6 +888,8 @@ files:
865
888
  - documents/app/views/audios/show.html.erb
866
889
  - documents/app/views/common-documents/_index.html.erb
867
890
  - documents/app/views/documents/_document.html.erb
891
+ - documents/app/views/documents/_document_focus_search.html.erb
892
+ - documents/app/views/documents/_document_global_search.html.erb
868
893
  - documents/app/views/documents/_document_with_details.html.erb
869
894
  - documents/app/views/documents/_header.html.erb
870
895
  - documents/app/views/documents/_new_activity.html.erb
@@ -876,6 +901,8 @@ files:
876
901
  - documents/app/views/pictures/_mediapreviews.html.erb
877
902
  - documents/app/views/pictures/_new.html.erb
878
903
  - documents/app/views/pictures/_picture.html.erb
904
+ - documents/app/views/pictures/_picture_focus_search.html.erb
905
+ - documents/app/views/pictures/_picture_global_search.html.erb
879
906
  - documents/app/views/pictures/_picture_with_details.html.erb
880
907
  - documents/app/views/pictures/destroy.js.erb
881
908
  - documents/app/views/pictures/index.html.erb
@@ -884,6 +911,8 @@ files:
884
911
  - documents/app/views/toolbar/_uploads_menu.html.erb
885
912
  - documents/app/views/videos/_new.html.erb
886
913
  - documents/app/views/videos/_video.html.erb
914
+ - documents/app/views/videos/_video_focus_search.html.erb
915
+ - documents/app/views/videos/_video_global_search.html.erb
887
916
  - documents/app/views/videos/_video_processed.html.erb
888
917
  - documents/app/views/videos/_video_processing.html.erb
889
918
  - documents/app/views/videos/_video_with_details.html.erb
@@ -981,6 +1010,14 @@ files:
981
1010
  - events/app/assets/images/btn/live.png
982
1011
  - events/app/assets/images/btn/time.png
983
1012
  - events/app/assets/images/btn/trash.png
1013
+ - events/app/assets/images/frontpage/thumbs/tvideo_1_happy.jpg
1014
+ - events/app/assets/images/frontpage/thumbs/tvideo_2_kostas.jpg
1015
+ - events/app/assets/images/frontpage/thumbs/tvideo_3_colin.jpg
1016
+ - events/app/assets/images/frontpage/thumbs/tvideo_4_romilla.jpg
1017
+ - events/app/assets/images/frontpage/video_1_happy.jpg
1018
+ - events/app/assets/images/frontpage/video_2_kostas.jpg
1019
+ - events/app/assets/images/frontpage/video_3_colin.jpg
1020
+ - events/app/assets/images/frontpage/video_4_romilla.jpg
984
1021
  - events/app/assets/images/icons/IconsByGlyphish.txt
985
1022
  - events/app/assets/images/icons/down.png
986
1023
  - events/app/assets/images/icons/search.png
@@ -991,10 +1028,18 @@ files:
991
1028
  - events/app/assets/images/logos/profile/event.png
992
1029
  - events/app/assets/images/logos/representation/event.png
993
1030
  - events/app/assets/images/tab_bottom.png
1031
+ - events/app/assets/javascripts/jquery.ad-gallery.js
1032
+ - events/app/assets/javascripts/jquery.ad-gallery.pack.js
994
1033
  - events/app/assets/javascripts/schedule.js
995
1034
  - events/app/assets/javascripts/social_stream-events.js
1035
+ - events/app/assets/stylesheets/ad_next.png
1036
+ - events/app/assets/stylesheets/ad_prev.png
1037
+ - events/app/assets/stylesheets/ad_scroll_back.png
1038
+ - events/app/assets/stylesheets/ad_scroll_forward.png
996
1039
  - events/app/assets/stylesheets/fullcalendar.css
997
1040
  - events/app/assets/stylesheets/fullcalendar.print.css
1041
+ - events/app/assets/stylesheets/jquery.ad-gallery.css
1042
+ - events/app/assets/stylesheets/loader.gif
998
1043
  - events/app/assets/stylesheets/social_stream-events.css
999
1044
  - events/app/controllers/agendas_controller.rb
1000
1045
  - events/app/controllers/events_controller.rb
@@ -1014,6 +1059,8 @@ files:
1014
1059
  - events/app/views/agendas/show.html.erb
1015
1060
  - events/app/views/documents/_mediawall.html.erb
1016
1061
  - events/app/views/events/_event.html.erb
1062
+ - events/app/views/events/_event_focus_search.html.erb
1063
+ - events/app/views/events/_event_global_search.html.erb
1017
1064
  - events/app/views/events/_event_with_details.html.erb
1018
1065
  - events/app/views/events/_form.html.erb
1019
1066
  - events/app/views/events/_manage.html.erb
@@ -1029,6 +1076,8 @@ files:
1029
1076
  - events/app/views/events/manage.html.erb
1030
1077
  - events/app/views/events/manage.js.erb
1031
1078
  - events/app/views/events/show.html.erb
1079
+ - events/app/views/frontpage/_caracteristics.html.erb
1080
+ - events/app/views/frontpage/index.html.erb
1032
1081
  - events/app/views/profiles/_outline.html.erb
1033
1082
  - events/app/views/sessions/_form.html.erb
1034
1083
  - events/app/views/sessions/_new.html.erb
@@ -1045,6 +1094,7 @@ files:
1045
1094
  - events/app/views/toolbar/_sponsor.html.erb
1046
1095
  - events/app/views/toolbar/_suscribed.html.erb
1047
1096
  - events/config/locales/en.yml
1097
+ - events/config/locales/es.yml
1048
1098
  - events/config/routes.rb
1049
1099
  - events/db/migrate/20110910161707_create_social_stream_events.rb
1050
1100
  - events/lib/generators/social_stream/events/install_generator.rb
data/base/app/assets/stylesheets/menu.css DELETED
@@ -1,26 +0,0 @@
1
- /**************MENU***********/
2
- .toolbar_menu {list-style-type:none; margin: 0; padding: 0; width: 15em; border-bottom: thin solid #D4E4EA; }
3
- .toolbar_menu ul {list-style-type:none; margin: 0; padding: 0; width: 15em; }
4
- .toolbar_menu a { display: block; text-decoration: none; }
5
- .toolbar_menu li { border-top: thin solid #D4E4EA; padding-left:0px; }
6
- .toolbar_menu li a, ul.menu ul.menu li a { background: #fff; color: #2A3890; padding: 0.3em; padding:5px 0px 5px 0px; }
7
- .toolbar_menu li a:hover, ul.menu ul.menu li a:hover { background: #DEEFF8; color: #2A3890; text-decoration:none; }
8
- .toolbar_menu li ul li a, ul.menu ul.menu li ul li a { background: #fff; border-left: 5px #2A3890 solid;
9
- color: #2A3890; padding-left: 10px;}
10
- .toolbar_menu li ul li a:hover { background: #DEEFF8; border-left: 5px #2A3890 solid; padding-left: 15px;}
11
- .toolbar_menu img { vertical-align: middle; padding-bottom: 3px; padding-right: 3px; padding-left: 3px; display: inline-block;}
12
- /*
13
- div.panel { border: 1px #2A3890 solid; padding: 5px; margin-top: 0px;}
14
- ul.menu li ul li a:hover, ul.menu ul.menu li ul li a:hover { background: #DEEFF8; border-left: 5px #2A3890 solid;
15
- text-decoration:none; }
16
- ul.menu ul.menu li a:hover { border-left: 0; padding-left: 0.5em;}
17
- ul.menu ul.menu { border-left: 5px #1F4A75 solid;}
18
- ul.menu a.active, ul.menu ul.menu li a.active, ul.menu a.active:hover, ul.menu ul.menu li a.active:hover {
19
- text-decoration: none; background: #DEEFF8; border: #2A3890 1px solid; color: #2A3890;}
20
-
21
- ul.menu div.panel a, ul.menu div.panel li a:hover { display :inline; color: #DEEFF8; background: none;
22
- margin: 0; padding: 0; border: none; font-weight: bold;}
23
- ul.menu div.panel a:hover { color: #2A3890; text-decoration: underline;}
24
- */
25
-
26
-
data/base/spec/support/thinking-sphinx.rb DELETED
@@ -1,10 +0,0 @@
1
- ThinkingSphinx::AbstractAdapter.class_eval do
2
- class << self
3
- def detect_with_rescue(*args)
4
- detect_without_rescue(*args)
5
- rescue
6
- end
7
-
8
- alias_method_chain :detect, :rescue
9
- end
10
- end