social_stream-base 0.15.2 → 0.16.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (28) hide show
  1. data/app/assets/images/btn/permission_negative.png +0 -0
  2. data/app/assets/images/btn/permission_positive.png +0 -0
  3. data/app/assets/javascripts/activities.js.erb +2 -118
  4. data/app/assets/javascripts/social_stream-base.js +3 -0
  5. data/app/assets/javascripts/social_stream.timeline.js +42 -0
  6. data/app/assets/javascripts/social_stream.wall.js.erb +125 -0
  7. data/app/assets/stylesheets/cheesecake.css.scss +9 -1
  8. data/app/helpers/notifications_helper.rb +1 -5
  9. data/app/models/activity.rb +21 -2
  10. data/app/models/comment.rb +5 -0
  11. data/app/models/permission.rb +16 -1
  12. data/app/models/post.rb +5 -0
  13. data/app/views/activities/_new.html.erb +7 -6
  14. data/app/views/activities/_wall.html.erb +6 -0
  15. data/app/views/cheesecake/_index.html.erb +17 -0
  16. data/app/views/cheesecake/_sector_form.html.erb +15 -6
  17. data/app/views/comments/_new.html.erb +2 -2
  18. data/app/views/comments/create.js.erb +1 -3
  19. data/app/views/notifications/activities/_post.html.erb +0 -3
  20. data/app/views/permissions/_index.html.erb +2 -2
  21. data/app/views/posts/create.js.erb +1 -4
  22. data/config/locales/en.yml +33 -23
  23. data/config/locales/es.yml +53 -24
  24. data/db/migrate/20120208135718_group_title_and_description_in_activity_object.rb +52 -0
  25. data/lib/social_stream/base/version.rb +1 -1
  26. data/spec/factories/activity.rb +1 -1
  27. metadata +71 -67
  28. data/app/views/activities/_filter.html.erb +0 -83
data/app/views/activities/_filter.html.erb DELETED
@@ -1,83 +0,0 @@
1
- <% content_for :javascript do %>
2
- $(function() {
3
- /**
4
- * the element
5
- */
6
- var $ui = $('#form_filter');
7
- var $ui_really = $('#ul_filter');
8
- /**
9
- * on focus and on click display the dropdown,
10
- * and change the arrow image
11
- */
12
- /*$ui.find('.sb_down').bind('focus click',function()*/
13
- $ui.find('.sb_down').bind('mouseover',function()
14
- {
15
- $ui.find('.sb_down')
16
- .addClass('sb_up')
17
- .removeClass('sb_down')
18
- .andSelf()
19
- .find('.sb_dropdown')
20
- .show();
21
- /*$ui.find('.sb_up')
22
- .hide();*/
23
- });
24
-
25
- /**
26
- * on mouse leave hide the dropdown,
27
- * and change the arrow image
28
- */
29
-
30
- $ui_really.bind('mouseleave',function(){
31
-
32
- $ui.find('.sb_up')
33
- .addClass('sb_down')
34
- .removeClass('sb_up')
35
- .andSelf()
36
- .find('.sb_dropdown')
37
- .hide();
38
- /*$ui.find('.sb_down')
39
- .show();*/
40
- });
41
-
42
- /**
43
- * selecting all checkboxes
44
- */
45
- $ui.find('.sb_dropdown').find('label[for="all"]').prev().bind('click',function(){
46
- $(this).parent().siblings().find(':checkbox').attr('checked',this.checked).attr('disabled',this.checked);
47
- });
48
- });
49
- <% end %>
50
-
51
- <div id="filter_div">
52
- <%= form_tag "/activities/documents", :method => :post ,:id=> 'form_filter', :class => "tie_form",:remote=> true do %>
53
- <span class="sb_down">Filter</span>
54
- <ul class="sb_dropdown" style="display:none;" id="ul_filter">
55
-
56
- <li>
57
- <%= check_box_tag 'types', 'Documents', false, :class => 'accept_tos',:onchange=>'$(\'#form_filter\').submit();'%>
58
- <label for="<%=t('activity.view.documents')%>"><%=t('activity.view.documents')%></label>
59
- </li>
60
- <li>
61
- <%= check_box_tag 'types', 'Audio', false, :class => 'accept_tos',:onchange=>'$(\'#form_filter\').submit();'%>
62
- <label for="t('activity.view.audio')"><%=t('activity.view.audio')%></label>
63
- </li>
64
- <li>
65
- <%= check_box_tag 'types', 'Event', false, :class => 'accept_tos',:onchange=>'$(\'#form_filter\').submit();'%>
66
- <label for="<%=t('activity.view.event')%>"><%=t('activity.view.event')%></label>
67
- </li>
68
- <li>
69
- <%= check_box_tag 'types', 'Picture', false, :class => 'accept_tos',:onchange=>'$(\'#form_filter\').submit();'%>
70
- <label for="<%=t('activity.view.photos')%>"><%=t('activity.view.photos')%></label>
71
- </li>
72
- <li>
73
- <%= check_box_tag 'types', 'Post', false, :class => 'accept_tos',:onchange=>'$(\'#form_filter\').submit();'%>
74
- <label for="<%=t('activity.view.post')%>"><%=t('activity.view.post')%></label>
75
- </li>
76
- <li>
77
- <%= check_box_tag 'types', 'Video', false, :class => 'accept_tos',:onchange=>'$(\'#form_filter\').submit();'%>
78
- <label for="<%=t('activity.view.video')%>"><%=t('activity.view.video')%></label>
79
- </li>
80
- </ul>
81
- <% end %>
82
- </div>
83
-