social_stream 2.0.0.beta3 → 2.0.0

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 (54) hide show
  1. checksums.yaml +4 -4
  2. data/README.rdoc +3 -44
  3. data/base/app/assets/javascripts/social_stream/object.js +4 -4
  4. data/base/app/assets/javascripts/social_stream/tag.js +1 -2
  5. data/base/app/assets/javascripts/social_stream/wall.js +6 -2
  6. data/base/app/assets/stylesheets/social_stream/base/adjust/_adjust.css.sass +4 -1
  7. data/base/app/assets/stylesheets/social_stream/base/profile/_profile.css.sass +12 -13
  8. data/base/app/assets/stylesheets/social_stream/base/profile/layout/_profile.css.sass +48 -31
  9. data/base/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-1200px-min.css.sass +2 -2
  10. data/base/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-767px-max.css.sass +4 -11
  11. data/base/app/assets/stylesheets/social_stream/base/profile/responsive/_responsive-768px-979px.css.sass +4 -5
  12. data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-1200px-min.css.sass +1 -25
  13. data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-767px-max.css.sass +0 -18
  14. data/base/app/assets/stylesheets/social_stream/base/responsive/_responsive-768px-979px.css.sass +1 -15
  15. data/base/app/controllers/conversations_controller.rb +0 -12
  16. data/base/app/views/devise/sessions/new.html.erb +1 -0
  17. data/base/app/views/layouts/_header_signed_out.erb +0 -2
  18. data/base/app/views/permissions/_index.html.erb +1 -1
  19. data/base/app/views/profiles/_avatar.html.erb +10 -11
  20. data/base/app/views/profiles/_comunication-info.html.erb +36 -36
  21. data/base/app/views/profiles/_experience.html.erb +16 -16
  22. data/base/app/views/profiles/_personal.html.erb +9 -11
  23. data/base/app/views/profiles/_profile.html.erb +25 -33
  24. data/base/app/views/profiles/_tags.html.erb +9 -8
  25. data/base/config/locales/en.yml +3 -3
  26. data/base/config/locales/es.yml +38 -7
  27. data/base/lib/generators/social_stream/base/templates/initializer.rb +1 -5
  28. data/base/lib/social_stream/base/version.rb +1 -1
  29. data/base/lib/social_stream/controllers/objects.rb +5 -3
  30. data/base/lib/tasks/db/populate.rake +1 -0
  31. data/base/social_stream-base.gemspec +1 -1
  32. data/documents/app/assets/javascripts/social_stream/documents.wall.js +1 -3
  33. data/documents/app/controllers/documents_controller.rb +1 -1
  34. data/documents/app/helpers/documents_helper.rb +1 -5
  35. data/documents/app/views/audios/_audio_processed.html.erb +4 -0
  36. data/documents/app/views/documents/search.html.erb +1 -3
  37. data/documents/lib/social_stream/documents/version.rb +1 -1
  38. data/documents/social_stream-documents.gemspec +1 -1
  39. data/events/lib/social_stream/events/version.rb +1 -1
  40. data/events/social_stream-events.gemspec +2 -2
  41. data/lib/social_stream/version.rb +1 -1
  42. data/linkser/app/assets/javascripts/social_stream/linkser.wall.js +2 -4
  43. data/linkser/lib/social_stream/linkser/version.rb +1 -1
  44. data/linkser/social_stream-linkser.gemspec +1 -1
  45. data/oauth2_server/lib/social_stream/oauth2_server/version.rb +1 -1
  46. data/oauth2_server/social_stream-oauth2_server.gemspec +1 -1
  47. data/ostatus/app/assets/images/logos/medium/remote_subject.png +0 -0
  48. data/ostatus/app/assets/images/logos/small/remote_subject.png +0 -0
  49. data/ostatus/lib/social_stream/ostatus/version.rb +1 -1
  50. data/ostatus/social_stream-ostatus.gemspec +1 -1
  51. data/presence/lib/social_stream/presence/version.rb +1 -1
  52. data/presence/social_stream-presence.gemspec +1 -1
  53. data/social_stream.gemspec +7 -7
  54. metadata +18 -18
@@ -1,5 +1,6 @@
1
1
  <section id="new_session">
2
2
 
3
+ <%= render partial: 'layouts/explanation' %>
3
4
  <%= render partial: 'devise/sessions/form' %>
4
5
  <%= render partial: 'frontpage/presentation' %>
5
6
 
@@ -2,6 +2,4 @@
2
2
  <%= render partial: 'layouts/logo_out' %>
3
3
  <div class="brand">
4
4
  </div>
5
- <% unless params[:controller].eql? 'devise/sessions' and params[:action].eql? 'new' %>
6
- <% end %>
7
5
  </header>
@@ -10,7 +10,7 @@
10
10
  <% default_permissions.each do |p| %>
11
11
  <li>
12
12
  <%= check_box_tag 'relation_custom[permission_ids][]', p.id, @relation.permission_ids.include?(p.id), id: "checkbox_relation_#{ @relation.id }_permission_#{ p.id }" %>
13
- <%= label_tag "checkbox_relation_#{ @relation.id }_permission_#{ p.id }", p.description(:brief, subject: current_subject) %>
13
+ <%= label_tag "checkbox_relation_#{ @relation.id }_permission_#{ p.id }", p.description(:brief, subject: current_subject), title: p.description(:detailed, subject: current_subject, state: (@relation.permission_ids.include?(p.id) ? 'positive' : 'negative'), relation: @relation.name) %>
14
14
  </li>
15
15
  <% end %>
16
16
  </ul>
@@ -1,16 +1,15 @@
1
- <section class="accordion-group avatar">
2
- <div class="accordion-heading">
3
- <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion5" href="#collapseFive">
1
+ <section class="avatar">
2
+ <header>
3
+ <%= render partial: 'edit_icon' %>
4
+ <h4>
4
5
  <%= t('avatar.profile_change') %>
5
- </a>
6
- </div>
6
+ </h4>
7
+ </header>
7
8
  <% if can? :update, @profile %>
8
- <div id="collapseFive" class="accordion-body collapse">
9
- <div class="accordion-inner">
10
- <%= render partial: 'avatars/form',
11
- object: @profile.actor,
12
- as: :avatarable %>
9
+ <div class="update">
10
+ <%= render partial: 'avatars/form',
11
+ object: @profile.actor,
12
+ as: :avatarable %>
13
13
  </div>
14
14
  <% end %>
15
- </div>
16
15
  </section>
@@ -1,9 +1,11 @@
1
- <section class="accordion-group comunication-info">
2
- <div class="accordion-heading">
3
- <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseTree">
1
+ <section class="comunication-info">
2
+ <header>
3
+ <%= render partial: 'edit_icon' %>
4
+ <h4>
4
5
  <%= t('profile.contact') %>
5
- </a>
6
-
6
+ </h4>
7
+ </header>
8
+ <div class="briefing">
7
9
  <% if @profile.contact_present? %>
8
10
  <% if @profile.phone? %>
9
11
  <h5>
@@ -54,45 +56,43 @@
54
56
  <% end %>
55
57
  </div>
56
58
 
57
-
58
59
  <% if can? :update, @profile %>
59
- <div id="collapseTree" class="accordion-body collapse">
60
- <div class="accordion-inner">
61
- <%= form_for(@profile, :url => [current_subject, :profile]) do |f| %>
62
- <h6>
63
- <%= f.label :phone, t('profile.phone') %>
64
- </h6>
65
- <%= f.phone_field :phone %>
60
+ <div class="update">
66
61
 
67
- <h6>
68
- <%= f.label :mobile, t('profile.mobile') %>
69
- </h6>
70
- <%= f.phone_field :mobile %>
62
+ <%= form_for(@profile, :url => [current_subject, :profile]) do |f| %>
63
+ <h6>
64
+ <%= f.label :phone, t('profile.phone') %>
65
+ </h6>
66
+ <%= f.phone_field :phone %>
71
67
 
72
- <h6>
73
- <%= f.label :fax, t('profile.fax') %>
74
- </h6>
75
- <%= f.phone_field :fax %>
68
+ <h6>
69
+ <%= f.label :mobile, t('profile.mobile') %>
70
+ </h6>
71
+ <%= f.phone_field :mobile %>
76
72
 
77
- <h6>
78
- <%= f.label :address, t('profile.address') %>
79
- </h6>
80
- <%= f.text_field :address %>
73
+ <h6>
74
+ <%= f.label :fax, t('profile.fax') %>
75
+ </h6>
76
+ <%= f.phone_field :fax %>
81
77
 
82
- <h6>
83
- <%= f.label :email, t('profile.email') %>
84
- </h6>
78
+ <h6>
79
+ <%= f.label :address, t('profile.address') %>
80
+ </h6>
81
+ <%= f.text_field :address %>
85
82
 
86
- <%= f.email_field :email, :class => "email" %>
83
+ <h6>
84
+ <%= f.label :email, t('profile.email') %>
85
+ </h6>
87
86
 
88
- <h6>
89
- <%= f.label :website, t('profile.website') %>
90
- </h6>
91
- <%= f.text_field :website, :class => "url" %>
87
+ <%= f.email_field :email, :class => "email" %>
92
88
 
93
- <%= f.submit :class => "btn" %>
94
- <% end %>
95
- </div>
89
+ <h6>
90
+ <%= f.label :website, t('profile.website') %>
91
+ </h6>
92
+ <%= f.text_field :website, :class => "url" %>
93
+
94
+ <%= f.submit :class => "btn" %>
95
+ <% end %>
96
96
  <% end %>
97
97
  </div>
98
98
  </section>
@@ -1,27 +1,27 @@
1
- <section class="accordion-group experience">
2
- <div class="accordion-heading">
3
- <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion4" href="#collapseFour">
1
+ <section class="experience">
2
+ <header>
3
+ <%= render partial: 'edit_icon' %>
4
+ <h4>
4
5
  <%= t("profile.#{ @profile.subject.class.to_s.downcase }.experience") %>
5
- </a>
6
-
7
-
8
- <% if @profile.experience? %>
9
- <%= simple_format @profile.experience %>
10
- <% else %>
11
- <%= render partial: 'empty' %>
12
- <% end %>
6
+ </h4>
7
+ </header>
13
8
 
9
+ <div class="briefing">
10
+ <% if @profile.experience? %>
11
+ <%= simple_format @profile.experience %>
12
+ <% else %>
13
+ <%= render partial: 'empty' %>
14
+ <% end %>
14
15
  </div>
16
+
15
17
  <% if can? :update, @profile %>
16
- <div id="collapseFour" class="accordion-body collapse">
17
- <div class="accordion-inner">
18
+ <div class="update">
18
19
  <%= form_for(@profile, :url => [current_subject, :profile]) do |f| %>
19
-
20
20
  <%= f.text_area :experience, :maxlength => 246, :rows => 5 %>
21
21
 
22
22
  <%= f.submit :class => "btn" %>
23
23
  <% end %>
24
- <% end %>
25
24
  </div>
26
- </div>
25
+ <% end %>
26
+
27
27
  </section>
@@ -1,9 +1,11 @@
1
- <section class="accordion-group personal">
2
- <div class="accordion-heading">
3
- <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseTwo">
1
+ <section class="personal">
2
+ <header>
3
+ <%= render partial: 'edit_icon' %>
4
+ <h4>
4
5
  <%= t("profile.#{ @profile.subject.class.to_s.downcase }.info") %>
5
- </a>
6
-
6
+ </h4>
7
+ </header>
8
+ <div class="briefing">
7
9
  <% if @profile.personal_present? %>
8
10
  <% if @profile.organization? %>
9
11
  <h5>
@@ -61,15 +63,12 @@
61
63
  <% end %>
62
64
  </div>
63
65
 
64
- <div id="collapseTwo" class="accordion-body collapse">
65
- <div class="accordion-inner">
66
- <% if can? :update, @profile %>
67
-
66
+ <div class="update">
67
+ <% if can? :update, @profile %>
68
68
  <%= form_for(@profile, :url => [current_subject, :profile]) do |f| %>
69
69
  <h6>
70
70
  <span class="required">*</span>
71
71
  <%= f.label t('*actor.name') %>
72
-
73
72
  </h6>
74
73
 
75
74
  <%= f.text_field :name, :class => "required" %>
@@ -103,6 +102,5 @@
103
102
  <%= f.submit :class => "btn" %>
104
103
  <% end %>
105
104
  <% end %>
106
- </div>
107
105
  </div>
108
106
  </section>
@@ -2,39 +2,31 @@
2
2
  <h2 class="colorfont">
3
3
  <%= t('profile.one') %>
4
4
  </h2>
5
- <div class="accordion" id="accordion2">
6
- <div class="accordion-group">
7
- <% if can?(:update, @profile) || @profile.tags_present? %>
8
- <%= render partial: "tags" %>
9
- <% end %>
10
- </div>
11
- <div class="accordion-group">
12
- <% if can?(:update, @profile) || @profile.personal_present? %>
13
- <%= render partial: "personal" %>
14
- <% end %>
15
- </div>
16
- <div class="accordion-group">
17
- <% if can?(:update, @profile) || @profile.contact_present? %>
18
- <%= render :partial => "comunication-info" %>
19
- <% end %>
20
- </div>
21
- <div class="accordion-group">
22
- <% if can?(:update, @profile) || @profile.experience? %>
23
- <%= render :partial => "experience" %>
24
- <% end %>
25
- </div>
26
- <div class="accordion-group">
27
- <% if can?(:update, @profile) || @profile.personal_present? %>
28
- <%= render :partial => "avatar" %>
29
- <% end %>
30
- </div>
5
+ <% if can?(:update, @profile) || @profile.tags_present? %>
6
+ <%= render partial: "tags" %>
7
+ <% end %>
31
8
 
32
- <%= javascript_tag do %>
33
- $(function() {
34
- SocialStream.Profile.show({
35
- section: "<%= params[:section ] %>"
36
- });
9
+ <% if can?(:update, @profile) || @profile.personal_present? %>
10
+ <%= render partial: "personal" %>
11
+ <% end %>
12
+
13
+ <% if can?(:update, @profile) || @profile.contact_present? %>
14
+ <%= render :partial => "comunication-info" %>
15
+ <% end %>
16
+
17
+ <% if can?(:update, @profile) || @profile.experience? %>
18
+ <%= render :partial => "experience" %>
19
+ <% end %>
20
+
21
+ <% if can?(:update, @profile) || @profile.personal_present? %>
22
+ <%= render :partial => "avatar" %>
23
+ <% end %>
24
+
25
+ <%= javascript_tag do %>
26
+ $(function() {
27
+ SocialStream.Profile.show({
28
+ section: "<%= params[:section ] %>"
37
29
  });
38
- <% end %>
39
- </div>
30
+ });
31
+ <% end %>
40
32
  </div>
@@ -1,22 +1,23 @@
1
- <section class="tags accordion-group">
2
- <div class="accordion-heading">
3
- <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseOne">
1
+ <section class="tags">
2
+ <header>
3
+ <%= render partial: 'edit_icon' %>
4
+ <h4>
4
5
  <%= t('profile.tags.other') %>
5
- </a>
6
+ </h4>
7
+ </header>
8
+ <div class="briefing">
6
9
  <% if @profile.subject.tag_list.count > 0 %>
7
10
  <%= tag_list @profile.subject %>
8
11
  <% else %>
9
12
  <%= render partial: 'empty' %>
10
13
  <% end %>
11
- <% if can?(:update, @profile) %>
12
14
  </div>
13
- <div id="collapseOne" class="update accordion-body collapse">
14
- <div class="accordion-inner">
15
+ <% if can?(:update, @profile) %>
16
+ <div class="update">
15
17
  <%= form_for(@profile, :url => [ @profile.subject, :profile ]) do |f| %>
16
18
  <%= f.text_field :tag_list, "data-path" => tags_path(format: :json) %>
17
19
  <%= f.submit :class => "btn" %>
18
20
  <% end %>
19
21
  </div>
20
22
  <% end %>
21
- </div>
22
23
  </section>
@@ -518,8 +518,8 @@ en:
518
518
  marked as public
519
519
  represent:
520
520
  nil:
521
- positive: They WILL BE ABLE to change session and act as %{subject}
522
- negative: They WILL NOT BE ABLE to change session and act as %{subject}
521
+ positive: They WILL BE ABLE to change session and act as %{name}
522
+ negative: They WILL NOT BE ABLE to change session and act as %{name}
523
523
  notify:
524
524
  nil:
525
525
  positive: Activities WILL BE notified to contacts at %{name}
@@ -605,7 +605,7 @@ en:
605
605
  one: Settings
606
606
  password_change:
607
607
  briefing: Change your password
608
- success: Your settings where correctly changed
608
+ success: Your settings were correctly changed
609
609
  share: Share
610
610
  sign_in: Sign in
611
611
  sign_out: Sign out
@@ -504,8 +504,8 @@ es:
504
504
  detailed:
505
505
  create:
506
506
  activity:
507
- positive: PODRÁN publicar actividades en vuestro muro
508
- negative: NO PODRÁN publicar actividades en vuestro muro
507
+ positive: Los contactos en %{relation} PODRÁN publicar actividades en vuestro muro
508
+ negative: Los contactos en %{relation} NO PODRÁN publicar actividades en vuestro muro
509
509
  follow:
510
510
  nil:
511
511
  positive: Las actividades de los contactos en %{relation} APARECERÁN
@@ -514,18 +514,49 @@ es:
514
514
  en vuestra página de inicio
515
515
  read:
516
516
  activity:
517
- positive: PODRÁN leer las publicaciones que aparezcan en vuestro muro,
518
- salvo las que compartas solo ciertas personas
519
- negative: NO PODRÁN leer las publicaciones que aparezcan en vuestro
517
+ positive: Los contactos en %{relation} PODRÁN leer las publicaciones que aparezcan en vuestro muro,
518
+ salvo las que compartáis solo con otros roles
519
+ negative: Los contactos en %{relation} NO PODRÁN leer las publicaciones que aparezcan en vuestro
520
520
  muro, salvo las que marques como públicas
521
521
  represent:
522
522
  nil:
523
- positive: PODRÁN cambiar sesión para actuar en nombre de %{name}
524
- negative: NO PODRÁN cambiar sesión para actuar en nombre de %{name}
523
+ positive: Los contactos en %{relation} PODRÁN cambiar sesión para actuar en nombre de %{name}
524
+ negative: Los contactos en %{relation} NO PODRÁN cambiar sesión para actuar en nombre de %{name}
525
525
  notify:
526
526
  nil:
527
527
  positive: Las actividades SE NOTIFICARÁN a los contactos en %{relation}
528
528
  negative: Las actividades NO SE NOTIFICARÁN a los contactos en %{relation}
529
+ user:
530
+ brief:
531
+ create:
532
+ activity: Publicar en tu muro
533
+ read:
534
+ activity: Leer tu muro
535
+ represent:
536
+ nil: Administrarte
537
+ notify:
538
+ nil: Notificarles
539
+ detailed:
540
+ create:
541
+ activity:
542
+ positive: Los contactos en %{relation} PODRÁN publicar actividades en tu muro
543
+ negative: Los contactos en %{relation} NO PODRÁN publicar actividades en tu muro
544
+ follow:
545
+ nil:
546
+ positive: Las actividades de los contactos en %{relation} APARECERÁN
547
+ en tu página de inicio
548
+ negative: Las actividades de los contactos en %{relation} NO APARECERÁN
549
+ en tu página de inicio
550
+ read:
551
+ activity:
552
+ positive: Los contactos en %{relation} PODRÁN leer las publicaciones que aparezcan en tu muro,
553
+ salvo las que compartáis solo con otros roles
554
+ negative: Los contactos en %{relation} NO PODRÁN leer las publicaciones que aparezcan en tu
555
+ muro, salvo las que marques como públicas
556
+ represent:
557
+ nil:
558
+ positive: Los contactos en %{relation} PODRÁN cambiar sesión para actuar en tu nombre
559
+ negative: Los contactos en %{relation} NO PODRÁN cambiar sesión para actuar en tu nombre
529
560
  of_relation:
530
561
  choose: Permisos para <strong>%{name}</strong>
531
562
  postit: Gestiona los permisos de tus contactos y crea nuevos roles
@@ -13,9 +13,8 @@ SocialStream.setup do |config|
13
13
 
14
14
  # Type of activities managed by actors
15
15
  # Remember you must add an "activity_object_id" foreign key column to your migration!
16
- # Be sure to add the other modules of Social Stream you might be using (e.g. :document, :event, :link ).
17
16
  #
18
- # config.objects = [ :post, :comment ]
17
+ # config.objects += [ :foo, :bar ]
19
18
 
20
19
  # Form for activity objects to be loaded
21
20
  # You can write your own activity objects
@@ -50,6 +49,3 @@ SocialStream.setup do |config|
50
49
  # Cleditor controls. It is used in new message editor, for example
51
50
  # config.cleditor_controls = "bold italic underline strikethrough subscript superscript | size style | bullets | image link unlink"
52
51
  end
53
-
54
- # You can customize toolbar, sidebar and location bar from here
55
- # See https://github.com/ging/social_stream/wiki/How-to-customize-the-toolbar,-sidebar-and-location
@@ -1,5 +1,5 @@
1
1
  module SocialStream
2
2
  module Base
3
- VERSION = "2.0.0.beta3".freeze
3
+ VERSION = "2.0.0".freeze
4
4
  end
5
5
  end
@@ -57,15 +57,17 @@ module SocialStream
57
57
 
58
58
  private
59
59
 
60
+ # Memoize pattern to retrieve objects collection
60
61
  def collection
61
62
  collection_variable_get ||
62
63
  collection_variable_set(build_collection)
63
64
  end
64
65
 
66
+ # Uses the {ActivityObject#collection} method to retrieve the objects collection
65
67
  def build_collection
66
- self.class.model_class. # @posts = Post
67
- collection(profile_subject, current_subject).
68
- page(params[:page])
68
+ self.class.model_class. # @posts = Post.
69
+ collection(profile_subject, current_subject). # collection(profile_subject, current_subject).
70
+ page(params[:page]) # page(params[:page])
69
71
  end
70
72
  end
71
73