social_stream 0.4.1 → 0.4.2

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 (145) hide show
  1. data/Rakefile +0 -12
  2. data/app/controllers/activities_controller.rb +17 -1
  3. data/app/controllers/api_controller.rb +2 -2
  4. data/app/controllers/avatars_controller.rb +44 -0
  5. data/app/controllers/contacts_controller.rb +13 -21
  6. data/app/controllers/conversations_controller.rb +107 -0
  7. data/app/controllers/groups_controller.rb +7 -11
  8. data/app/controllers/messages_controller.rb +21 -88
  9. data/app/controllers/profiles_controller.rb +3 -1
  10. data/app/controllers/pshb_controller.rb +37 -1
  11. data/app/controllers/ties_controller.rb +7 -8
  12. data/app/controllers/users_controller.rb +19 -43
  13. data/app/helpers/location_helper.rb +34 -0
  14. data/app/helpers/subjects_helper.rb +18 -1
  15. data/app/models/activity.rb +67 -27
  16. data/app/models/activity_verb.rb +1 -1
  17. data/app/models/actor.rb +85 -37
  18. data/app/models/avatar.rb +90 -0
  19. data/app/models/group.rb +2 -2
  20. data/app/models/profile.rb +8 -0
  21. data/app/models/tie.rb +20 -22
  22. data/app/models/user.rb +2 -8
  23. data/app/views/activities/_index.html.erb +22 -0
  24. data/app/views/activities/_options.html.erb +3 -1
  25. data/app/views/activities/_root.html.erb +4 -2
  26. data/app/views/activities/_walls.html.erb +34 -0
  27. data/app/views/activities/index.js.erb +1 -0
  28. data/app/views/avatars/_form.html.erb +23 -0
  29. data/app/views/{logos → avatars}/_precrop.html.erb +23 -15
  30. data/app/views/avatars/edit.html.erb +6 -0
  31. data/app/views/avatars/index.html.erb +42 -0
  32. data/app/views/{logos → avatars}/new.html.erb +7 -11
  33. data/app/views/avatars/show.html.erb +5 -0
  34. data/app/views/contacts/_index.html.erb +33 -0
  35. data/app/views/contacts/index.html.erb +35 -2
  36. data/app/views/contacts/index.js.erb +1 -0
  37. data/app/views/conversations/_conversation.html.erb +37 -0
  38. data/app/views/conversations/_conversation_full.html.erb +52 -0
  39. data/app/views/{messages → conversations}/_conversations.html.erb +2 -1
  40. data/app/views/conversations/_index.html.erb +23 -0
  41. data/app/views/{messages → conversations}/_menu_options.html.erb +2 -2
  42. data/app/views/conversations/_show.html.erb +21 -0
  43. data/app/views/{messages → conversations}/edit.html.erb +0 -0
  44. data/app/views/{messages → conversations}/index.html.erb +1 -3
  45. data/app/views/conversations/index.js.erb +7 -0
  46. data/app/views/conversations/show.html.erb +47 -0
  47. data/app/views/conversations/show.js.erb +39 -0
  48. data/app/views/frontpage/_header.html.erb +5 -1
  49. data/app/views/groups/_new.html.erb +50 -48
  50. data/app/views/groups/_sidebar_show.html.erb +1 -1
  51. data/app/views/groups/index.html.erb +1 -1
  52. data/app/views/groups/new.html.erb +6 -1
  53. data/app/views/groups/show.html.erb +1 -3
  54. data/app/views/home/_menu.html.erb +46 -0
  55. data/app/views/home/_sidebar.html.erb +12 -0
  56. data/app/views/home/index.html.erb +3 -3
  57. data/app/views/layouts/application.html.erb +1 -1
  58. data/app/views/layouts/test.html +58 -41
  59. data/app/views/location/_location.html.erb +3 -0
  60. data/app/views/messages/_form.html.erb +5 -52
  61. data/app/views/messages/_message.html.erb +31 -0
  62. data/app/views/messages/_new.html.erb +10 -16
  63. data/app/views/messages/new.html.erb +48 -3
  64. data/app/views/messages/new.js.erb +38 -1
  65. data/app/views/profiles/_profile.html.erb +194 -0
  66. data/app/views/profiles/edit.html.erb +168 -0
  67. data/app/views/profiles/show.html.erb +2 -175
  68. data/app/views/{users → profiles}/update.js.erb +12 -15
  69. data/app/views/subjects/_contacts.html.erb +2 -3
  70. data/app/views/subjects/_toolbar_home.html.erb +1 -1
  71. data/app/views/subjects/_toolbar_home_menu.html.erb +4 -1
  72. data/app/views/subjects/_toolbar_home_menu_options.html.erb +4 -7
  73. data/app/views/subjects/_toolbar_home_menu_options_subjects.html.erb +0 -3
  74. data/app/views/subjects/_toolbar_logo.html.erb +1 -1
  75. data/app/views/subjects/_toolbar_message_menu.html.erb +17 -0
  76. data/app/views/subjects/_toolbar_profile.html.erb +4 -12
  77. data/app/views/subjects/_toolbar_profile_menu.html.erb +9 -10
  78. data/app/views/subjects/_toolbar_profile_menu_basic_options.html.erb +6 -5
  79. data/app/views/subjects/_toolbar_profile_menu_tie_options.html.erb +13 -13
  80. data/app/views/ties/_new.html.erb +30 -25
  81. data/app/views/ties/_suggestions.html.erb +1 -0
  82. data/app/views/ties/new.js.erb +2 -0
  83. data/app/views/users/_index.html.erb +1 -1
  84. data/app/views/users/index.html.erb +1 -3
  85. data/app/views/users/show.html.erb +4 -3
  86. data/config/locales/en.yml +79 -24
  87. data/config/routes.rb +8 -2
  88. data/lib/generators/social_stream/install_generator.rb +1 -1
  89. data/lib/generators/social_stream/templates/migration.rb +17 -11
  90. data/lib/generators/social_stream/templates/public/images/btn/message_conversation.png +0 -0
  91. data/lib/generators/social_stream/templates/public/images/btn/message_inbox.png +0 -0
  92. data/lib/generators/social_stream/templates/public/images/btn/message_new.png +0 -0
  93. data/lib/generators/social_stream/templates/public/images/btn/message_sentbox.png +0 -0
  94. data/lib/generators/social_stream/templates/public/images/btn/message_trash.png +0 -0
  95. data/lib/generators/social_stream/templates/public/javascripts/ajax.paginate.js +1 -1
  96. data/lib/generators/social_stream/templates/public/javascripts/menu.js +9 -99
  97. data/lib/generators/social_stream/templates/public/stylesheets/default/base.css +14 -5
  98. data/lib/generators/social_stream/templates/public/stylesheets/default/home.css +1 -0
  99. data/lib/generators/social_stream/templates/public/stylesheets/default/jquery-ui.css +13 -10
  100. data/lib/generators/social_stream/templates/public/stylesheets/default/menu.css +5 -11
  101. data/lib/generators/social_stream/templates/public/stylesheets/default/messages.css +96 -20
  102. data/lib/generators/social_stream/templates/relations.yml +1 -0
  103. data/lib/paperclip/social_stream.rb +1 -1
  104. data/lib/social_stream/ability.rb +1 -0
  105. data/lib/social_stream/controllers/helpers.rb +20 -0
  106. data/lib/social_stream/models/subject.rb +13 -12
  107. data/lib/social_stream/rails.rb +4 -1
  108. data/lib/social_stream/version.rb +1 -1
  109. data/lib/tasks/db/populate.rake +14 -4
  110. data/social_stream.gemspec +31 -5
  111. data/spec/controllers/contacts_controller_spec.rb +6 -0
  112. data/spec/controllers/profiles_controller_spec.rb +3 -4
  113. data/spec/dummy/config/initializers/devise.rb +4 -1
  114. data/spec/dummy/config/relations.yml +1 -0
  115. data/spec/models/activity_spec.rb +24 -0
  116. metadata +91 -89
  117. data/app/controllers/logos_controller.rb +0 -37
  118. data/app/models/logo.rb +0 -88
  119. data/app/views/activities/_activities.html.erb +0 -46
  120. data/app/views/groups/_profile.html.erb +0 -142
  121. data/app/views/groups/edit.html.erb +0 -135
  122. data/app/views/groups/update.js.erb +0 -39
  123. data/app/views/logos/_form.html.erb +0 -33
  124. data/app/views/logos/edit.html.erb +0 -6
  125. data/app/views/logos/index.html.erb +0 -27
  126. data/app/views/logos/show.html.erb +0 -5
  127. data/app/views/menu/_group.html.erb +0 -15
  128. data/app/views/menu/_home_user.html.erb +0 -0
  129. data/app/views/menu/_optionsGroups.html.erb +0 -11
  130. data/app/views/menu/_optionsUser.html.erb +0 -11
  131. data/app/views/menu/_services.html.erb +0 -11
  132. data/app/views/menu/_tiesGroup.html.erb +0 -14
  133. data/app/views/menu/_tiesUser.html.erb +0 -11
  134. data/app/views/menu/_user.html.erb +0 -15
  135. data/app/views/messages/_conversation.html.erb +0 -34
  136. data/app/views/messages/_conversation_full.html.erb +0 -65
  137. data/app/views/messages/_index.html.erb +0 -19
  138. data/app/views/messages/_location.html.erb +0 -3
  139. data/app/views/messages/_show.html.erb +0 -22
  140. data/app/views/messages/index.js.erb +0 -1
  141. data/app/views/messages/show.html.erb +0 -10
  142. data/app/views/messages/show.js.erb +0 -1
  143. data/app/views/users/_profile.html.erb +0 -171
  144. data/app/views/users/_sidebar_show.html.erb +0 -1
  145. data/app/views/users/edit.html.erb +0 -194
data/app/views/users/_sidebar_show.html.erb DELETED
@@ -1 +0,0 @@
1
-
data/app/views/users/edit.html.erb DELETED
@@ -1,194 +0,0 @@
1
- <% toolbar :profile => @user %>
2
-
3
- <% content_for :sidebar do %>
4
- <%= render :partial => 'sidebar_show' %>
5
- <% end %>
6
-
7
- <% content_for :headers do %>
8
- <%= stylesheet_link_tag "jquery-ui", :media => "screen, projection" %>
9
- <%= javascript_include_tag 'jquery.validate' %>
10
-
11
- <% end %>
12
-
13
- <%= form_for(@user, :remote => true) do |f| %>
14
- <% if @user.errors.any? %>
15
- <div id="error_explanation">
16
- <h2><%= pluralize(@user.errors.count, "error") %> prohibited this user from being saved:</h2>
17
- <ul>
18
- <% @user.errors.full_messages.each do |msg| %>
19
- <li>
20
- <%= msg %>
21
- </li>
22
- <% end %>
23
- </ul>
24
- </div>
25
- <% end %>
26
-
27
- <% content_for :javascript do %>
28
- $(function() {
29
- $(".edit_user").validate();
30
- });
31
- <% end %>
32
-
33
- <div class="block">
34
- <% if !params[:section].present? or params[:section].eql?("about_me") %>
35
- <div class="row">
36
- <div class="form_row">
37
- <h2><%=t('edit.personal_info')%></h2>
38
- </div>
39
- <div class="form_row">
40
- <div class="form_label">
41
- <%= f.label :name %>
42
- </div>
43
- <div class="form_field">
44
- <%= f.text_field :name, :class => "form_tag" %>
45
- </div>
46
- </div>
47
- </div>
48
-
49
- <% content_for :javascript do %>
50
- $(function () {
51
- $( "#user_profile_attributes_birthday" ).datepicker({ yearRange: '1900:<%= Time.now.utc.to_date.year%>',
52
- changeYear: true, maxDate: '+0d', defaultDate: '-30y'});
53
- $("#personal_info").addClass('section_highlight');
54
-
55
- });
56
- <% end %>
57
-
58
- <%= f.fields_for :profile do |profile_form| %>
59
-
60
- <div class="form_row">
61
- <div class="form_label">
62
- <%= profile_form.label :organization %>
63
- </div>
64
- <div class="form_field">
65
- <%= profile_form.text_field :organization , :class => "form_tag" %>
66
- </div>
67
- </div>
68
-
69
- <div class="form_row">
70
- <div class="form_label">
71
- <%= profile_form.label :birthday %>
72
- </div>
73
- <div class="form_field">
74
- <%= profile_form.text_field( :birthday , :class => "date form_tag") %>
75
- </div>
76
- </div>
77
-
78
- <div class="form_row">
79
- <div class="form_label">
80
- <%= profile_form.label :city %>
81
- </div>
82
- <div class="form_field">
83
- <%= profile_form.text_field :city, :class => "form_tag" %>
84
- </div>
85
- </div>
86
-
87
- <div class="form_row">
88
- <div class="form_label">
89
- <%= profile_form.label :country %>
90
- </div>
91
- <div class="form_field">
92
- <%= profile_form.text_field :country, :class => "form_tag" %>
93
- </div>
94
- </div>
95
-
96
- <div class="form_row form_label">
97
- <%= profile_form.label t('edit.aboutme') %>
98
- </div>
99
- <div class="form_row">
100
- <%= profile_form.text_area :description, :maxlength => 200, :rows => 10, :class => "form_tag_long" %>
101
- </div>
102
-
103
- <% end %>
104
- <% end %>
105
- <% if !params[:section].present? or params[:section].eql?("contact_info") %>
106
-
107
- <% content_for :javascript do %>
108
-
109
- $(function() {
110
- $("#contact_info").addClass('section_highlight');
111
- });
112
-
113
- <% end %>
114
-
115
- <div class="form_row">
116
- <h2><%=t('edit.contact')%></h2>
117
- </div>
118
- <%= f.fields_for :profile do |profile_form| %>
119
- <div class="form_row">
120
- <div class="form_label">
121
- <%= profile_form.label :phone %>
122
- </div>
123
- <div class="form_field">
124
- <%= profile_form.text_field :phone, :class => "form_tag" %>
125
- </div>
126
- </div>
127
- <div class="form_row">
128
- <div class="form_label">
129
- <%= profile_form.label :mobile %>
130
- </div>
131
- <div class="form_field">
132
- <%= profile_form.text_field :mobile, :class => "form_tag" %>
133
- </div>
134
- </div>
135
- <div class="form_row">
136
- <div class="form_label">
137
- <%= profile_form.label :fax %>
138
- </div>
139
- <div class="form_field">
140
- <%= profile_form.text_field :fax, :class => "form_tag" %>
141
- </div>
142
- </div>
143
- <div class="form_row">
144
- <div class="form_label">
145
- <%= profile_form.label :address %>
146
- </div>
147
- <div class="form_field">
148
- <%= profile_form.text_field :address, :class => "form_tag" %>
149
- </div>
150
- </div>
151
- <div class="form_row">
152
- <div class="form_label">
153
- <%= profile_form.label :website %>
154
- </div>
155
- <div class="form_field">
156
- <%= profile_form.text_field :website, :class => "form_tag" %>
157
- </div>
158
- </div>
159
-
160
- <% end %>
161
- <% end %>
162
- <% if !params[:section].present? or params[:section].eql?("my_experience") %>
163
-
164
- <% content_for :javascript do %>
165
-
166
- $(function() {
167
- $("#experience_info").addClass('section_highlight');
168
- });
169
-
170
- <% end %>
171
-
172
- <div class="form_row">
173
- <h2><%=t('edit.experience')%></h2>
174
- </div>
175
- <div class="row center">
176
- <%= f.fields_for :profile do |profile_form| %>
177
- <%= profile_form.text_area :experience, :maxlength => 500, :rows => 10, :class => "form_tag_long" %>
178
- </div>
179
- <% end %>
180
- <% end %>
181
-
182
- <% if params[:section].present? %>
183
- <%= hidden_field_tag("section", params[:section]) %>
184
- <% end %>
185
- <div class="form_row space_center">
186
- <%= f.submit "Update", :class => "button" %>&nbsp;
187
- <button class="button" onclick="window.location.href='<%= user_url(@user) %>';">Cancel</button>
188
- </div>
189
-
190
- <% end %>
191
-
192
-
193
- </div>
194
-