social_stream-base 0.9.15 → 0.9.16

Sign up to get free protection for your applications and to get access to all the features.
Files changed (53) hide show
  1. data/app/assets/images/frontpage/right_conference.png +0 -0
  2. data/app/assets/images/loader.gif +0 -0
  3. data/app/assets/javascripts/jquery.ad-gallery.js +850 -0
  4. data/app/assets/javascripts/jquery.ad-gallery.pack.js +10 -0
  5. data/app/assets/stylesheets/_colors.scss +6 -3
  6. data/app/assets/stylesheets/ad_next.png +0 -0
  7. data/app/assets/stylesheets/ad_prev.png +0 -0
  8. data/app/assets/stylesheets/ad_scroll_back.png +0 -0
  9. data/app/assets/stylesheets/ad_scroll_forward.png +0 -0
  10. data/app/assets/stylesheets/contacts.css.scss +1 -0
  11. data/app/assets/stylesheets/frontpage.css.scss +10 -3
  12. data/app/assets/stylesheets/header.css.scss +5 -5
  13. data/app/assets/stylesheets/{home.css → home.css.scss} +12 -11
  14. data/app/assets/stylesheets/jquery.ad-gallery.css +171 -0
  15. data/app/assets/stylesheets/loader.gif +0 -0
  16. data/app/assets/stylesheets/{location.css → location.css.scss} +3 -1
  17. data/app/assets/stylesheets/menu.css.scss +19 -0
  18. data/app/assets/stylesheets/{messages.css → messages.css.scss} +17 -15
  19. data/app/assets/stylesheets/opa75.png +0 -0
  20. data/app/assets/stylesheets/{relation_customs.css → relation_customs.css.scss} +9 -27
  21. data/app/assets/stylesheets/{search.css → search.css.scss} +26 -23
  22. data/app/assets/stylesheets/{ties.css → ties.css.scss} +4 -2
  23. data/app/controllers/search_controller.rb +1 -1
  24. data/app/helpers/search_helper.rb +25 -5
  25. data/app/helpers/toolbar_helper.rb +1 -1
  26. data/app/models/post.rb +4 -4
  27. data/app/views/frontpage/_caracteristics.html.erb +7 -7
  28. data/app/views/frontpage/_header.html.erb +2 -4
  29. data/app/views/frontpage/_social_networks.html.erb +5 -0
  30. data/app/views/frontpage/index.html.erb +0 -3
  31. data/app/views/groups/_group_focus_search.html.erb +2 -0
  32. data/app/views/groups/_group_global_search.html.erb +2 -0
  33. data/app/views/groups/_show.html.erb +33 -0
  34. data/app/views/groups/_show_frontpage.html.erb +11 -0
  35. data/app/views/groups/show.html.erb +5 -32
  36. data/app/views/layouts/application.html.erb +2 -2
  37. data/app/views/posts/_post_focus_search.html.erb +3 -0
  38. data/app/views/posts/_post_global_search.html.erb +16 -0
  39. data/app/views/posts/_post_with_details.html.erb +3 -0
  40. data/app/views/search/_extended_search.html.erb +7 -2
  41. data/app/views/search/_header_search.html.erb +1 -1
  42. data/app/views/users/_show.html.erb +33 -0
  43. data/app/views/users/_show_frontpage.html.erb +11 -0
  44. data/app/views/users/_user_focus_search.html.erb +2 -0
  45. data/app/views/users/_user_global_search.html.erb +2 -0
  46. data/app/views/users/show.html.erb +5 -32
  47. data/config/locales/en.yml +5 -3
  48. data/config/locales/es.yml +2 -2
  49. data/lib/social_stream/base/version.rb +1 -1
  50. data/lib/social_stream-base.rb +2 -2
  51. metadata +33 -12
  52. data/app/assets/stylesheets/menu.css +0 -26
  53. data/spec/support/thinking-sphinx.rb +0 -10
data/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/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