social_stream 0.11.1 → 0.11.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (65) hide show
  1. data/.gitignore +1 -0
  2. data/base/app/assets/images/tipsy.gif +0 -0
  3. data/base/app/assets/javascripts/activities.js.erb +23 -0
  4. data/base/app/assets/javascripts/invitations.js +7 -0
  5. data/base/app/assets/javascripts/profiles.js +4 -1
  6. data/base/app/assets/stylesheets/activities.css.scss +10 -5
  7. data/base/app/assets/stylesheets/base.css.scss +3 -2
  8. data/base/app/assets/stylesheets/frontpage.css.scss +2 -1
  9. data/base/app/assets/stylesheets/header.css.scss +5 -4
  10. data/base/app/controllers/groups_controller.rb +0 -6
  11. data/base/app/controllers/search_controller.rb +0 -4
  12. data/base/app/controllers/users_controller.rb +1 -6
  13. data/base/app/models/activity.rb +21 -7
  14. data/base/app/models/actor.rb +5 -3
  15. data/base/app/views/activities/_new.html.erb +13 -3
  16. data/base/app/views/activities/_options.html.erb +13 -4
  17. data/base/app/views/conversations/show.html.erb +1 -1
  18. data/base/app/views/conversations/show.js.erb +1 -1
  19. data/base/app/views/devise/registrations/edit.html.erb +1 -1
  20. data/base/app/views/devise/registrations/new.html.erb +1 -1
  21. data/base/app/views/devise/shared/_links.erb +6 -6
  22. data/base/app/views/frontpage/index.html.erb +3 -3
  23. data/base/app/views/groups/_new.html.erb +1 -1
  24. data/base/app/views/groups/show.html.erb +0 -5
  25. data/base/app/views/invitations/_new.html.erb +0 -5
  26. data/base/app/views/layouts/_header.erb +5 -44
  27. data/base/app/views/layouts/_header_signed_in.erb +44 -0
  28. data/base/app/views/layouts/_header_signed_out.erb +36 -0
  29. data/base/app/views/layouts/frontpage.html.erb +1 -1
  30. data/base/app/views/messages/_form.html.erb +3 -3
  31. data/base/app/views/messages/new.html.erb +2 -2
  32. data/base/app/views/messages/new.js.erb +1 -1
  33. data/base/app/views/posts/create.js.erb +2 -0
  34. data/base/app/views/profiles/edit.html.erb +6 -4
  35. data/base/app/views/search/index.html.erb +0 -4
  36. data/base/app/views/users/show.html.erb +0 -5
  37. data/base/config/locales/en.yml +33 -4
  38. data/base/config/locales/es.yml +33 -4
  39. data/base/lib/generators/social_stream/base/templates/initializer.rb +3 -0
  40. data/base/lib/social_stream-base.rb +4 -1
  41. data/base/lib/social_stream/base/version.rb +1 -1
  42. data/base/lib/social_stream/models/object.rb +2 -1
  43. data/base/social_stream-base.gemspec +3 -3
  44. data/base/spec/dummy/config/initializers/social_stream.rb +3 -0
  45. data/base/vendor/assets/javascripts/jquery.tipsy.js +104 -0
  46. data/base/vendor/assets/stylesheets/tipsy.css +7 -0
  47. data/events/app/views/frontpage/index.html.erb +3 -3
  48. data/events/config/locales/en.yml +1 -0
  49. data/events/lib/social_stream/events/version.rb +1 -1
  50. data/events/social_stream-events.gemspec +1 -1
  51. data/lib/social_stream/version.rb +1 -1
  52. data/social_stream.gemspec +2 -2
  53. metadata +15 -22
  54. data/base/app/assets/images/frontpage/join.gif +0 -0
  55. data/base/app/assets/stylesheets/ad_next.png +0 -0
  56. data/base/app/assets/stylesheets/ad_prev.png +0 -0
  57. data/base/app/assets/stylesheets/ad_scroll_back.png +0 -0
  58. data/base/app/assets/stylesheets/ad_scroll_forward.png +0 -0
  59. data/base/app/assets/stylesheets/jquery.ad-gallery.css +0 -171
  60. data/base/app/assets/stylesheets/loader.gif +0 -0
  61. data/base/app/views/frontpage/_header.html.erb +0 -30
  62. data/base/app/views/frontpage/_social_networks.html.erb +0 -5
  63. data/base/app/views/groups/_show_frontpage.html.erb +0 -11
  64. data/base/app/views/search/_index_frontpage.html.erb +0 -13
  65. data/base/app/views/users/_show_frontpage.html.erb +0 -11
data/base/app/views/search/_index_frontpage.html.erb DELETED
@@ -1,13 +0,0 @@
1
- <nav id="toolbar">
2
- <div id="toolbarContent" class="block">
3
- <div class="space_center"></div>
4
- </div>
5
- </nav>
6
- <div id= "center_body">
7
- <section id="content">
8
- <%= render :partial => 'index' %>
9
- </section>
10
- </div>
11
- <aside id="sidebar">
12
- <div id="sidebarContent"></div>
13
- </aside>
data/base/app/views/users/_show_frontpage.html.erb DELETED
@@ -1,11 +0,0 @@
1
- <nav id="toolbar">
2
- <div id="toolbarContent" class="block">
3
- <div class="space_center"></div>
4
- <%= yield :toolbar %>
5
- </div>
6
- </nav>
7
- <div id= "center_body" class="frontpage_view">
8
- <section id="content">
9
- <%= render :partial => 'show' %>
10
- </section>
11
- </div>