social_stream-documents 0.3.3 → 0.4.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (49) hide show
  1. data/Rakefile +3 -13
  2. data/app/assets/javascripts/documents.js.erb +21 -32
  3. data/app/assets/javascripts/social_stream-documents.js +2 -1
  4. data/app/assets/stylesheets/{documents.css → documents.css.scss} +32 -6
  5. data/app/assets/stylesheets/show.css.scss +75 -0
  6. data/app/assets/stylesheets/social_stream-documents.css +2 -1
  7. data/app/controllers/audios_controller.rb +0 -14
  8. data/app/controllers/common_documents_controller.rb +6 -3
  9. data/app/controllers/documents_controller.rb +9 -3
  10. data/app/controllers/pictures_controller.rb +0 -1
  11. data/app/controllers/videos_controller.rb +0 -15
  12. data/app/helpers/documents_helper.rb +11 -7
  13. data/app/models/audio.rb +1 -1
  14. data/app/models/document.rb +9 -5
  15. data/app/models/picture.rb +1 -1
  16. data/app/models/video.rb +8 -6
  17. data/app/views/audios/_audio.html.erb +2 -2
  18. data/app/views/audios/_audio_processed.html.erb +4 -4
  19. data/app/views/audios/_audio_show.html.erb +62 -0
  20. data/app/views/audios/index.html.erb +1 -1
  21. data/app/views/audios/show.html.erb +2 -2
  22. data/app/views/common_documents/_document_info.html.erb +34 -0
  23. data/app/views/common_documents/_index.html.erb +49 -0
  24. data/app/views/common_documents/_show.html.erb +36 -0
  25. data/app/views/documents/_document.html.erb +2 -6
  26. data/app/views/documents/_document_show.html.erb +7 -0
  27. data/app/views/documents/index.html.erb +1 -1
  28. data/app/views/documents/show.html.erb +2 -2
  29. data/app/views/pictures/_picture.html.erb +13 -12
  30. data/app/views/pictures/_picture_show.html.erb +26 -0
  31. data/app/views/pictures/index.html.erb +1 -1
  32. data/app/views/pictures/show.html.erb +2 -2
  33. data/app/views/videos/_video.html.erb +2 -2
  34. data/app/views/videos/_video_processed.html.erb +4 -3
  35. data/app/views/videos/_video_show.html.erb +64 -0
  36. data/app/views/videos/index.html.erb +1 -1
  37. data/app/views/videos/show.html.erb +2 -2
  38. data/config/locales/en.yml +19 -1
  39. data/config/locales/es.yml +18 -0
  40. data/lib/social_stream/documents/engine.rb +2 -0
  41. data/lib/social_stream/documents/version.rb +1 -1
  42. data/social_stream-documents.gemspec +1 -1
  43. data/spec/controllers/documents_controller_spec.rb +40 -2
  44. data/spec/controllers/pictures_controller_spec.rb +4 -4
  45. data/spec/dummy/config/environments/development.rb +0 -1
  46. data/spec/dummy/config/environments/test.rb +2 -0
  47. metadata +37 -31
  48. data/app/views/common-documents/_index.html.erb +0 -45
  49. data/app/views/toolbar/_uploads_menu.html.erb +0 -21
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: social_stream-documents
3
3
  version: !ruby/object:Gem::Version
4
- hash: 21
4
+ hash: 15
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
- - 3
9
- - 3
10
- version: 0.3.3
8
+ - 4
9
+ - 0
10
+ version: 0.4.0
11
11
  platform: ruby
12
12
  authors:
13
13
  - "V\xC3\xADctor S\xC3\xA1nchez Belmar"
@@ -16,28 +16,28 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2011-10-19 00:00:00 +02:00
19
+ date: 2011-10-28 00:00:00 +02:00
20
20
  default_executable:
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency
23
+ name: social_stream-base
23
24
  prerelease: false
24
- type: :runtime
25
25
  requirement: &id001 !ruby/object:Gem::Requirement
26
26
  none: false
27
27
  requirements:
28
28
  - - ~>
29
29
  - !ruby/object:Gem::Version
30
- hash: 23
30
+ hash: 21
31
31
  segments:
32
32
  - 0
33
33
  - 9
34
- - 22
35
- version: 0.9.22
36
- name: social_stream-base
34
+ - 23
35
+ version: 0.9.23
36
+ type: :runtime
37
37
  version_requirements: *id001
38
38
  - !ruby/object:Gem::Dependency
39
+ name: paperclip-ffmpeg
39
40
  prerelease: false
40
- type: :runtime
41
41
  requirement: &id002 !ruby/object:Gem::Requirement
42
42
  none: false
43
43
  requirements:
@@ -49,11 +49,11 @@ dependencies:
49
49
  - 7
50
50
  - 0
51
51
  version: 0.7.0
52
- name: paperclip-ffmpeg
52
+ type: :runtime
53
53
  version_requirements: *id002
54
54
  - !ruby/object:Gem::Dependency
55
+ name: paperclip
55
56
  prerelease: false
56
- type: :runtime
57
57
  requirement: &id003 !ruby/object:Gem::Requirement
58
58
  none: false
59
59
  requirements:
@@ -65,11 +65,11 @@ dependencies:
65
65
  - 3
66
66
  - 11
67
67
  version: 2.3.11
68
- name: paperclip
68
+ type: :runtime
69
69
  version_requirements: *id003
70
70
  - !ruby/object:Gem::Dependency
71
+ name: delayed_paperclip
71
72
  prerelease: false
72
- type: :runtime
73
73
  requirement: &id004 !ruby/object:Gem::Requirement
74
74
  none: false
75
75
  requirements:
@@ -81,11 +81,11 @@ dependencies:
81
81
  - 7
82
82
  - 2
83
83
  version: 0.7.2
84
- name: delayed_paperclip
84
+ type: :runtime
85
85
  version_requirements: *id004
86
86
  - !ruby/object:Gem::Dependency
87
+ name: sqlite3-ruby
87
88
  prerelease: false
88
- type: :development
89
89
  requirement: &id005 !ruby/object:Gem::Requirement
90
90
  none: false
91
91
  requirements:
@@ -95,11 +95,11 @@ dependencies:
95
95
  segments:
96
96
  - 0
97
97
  version: "0"
98
- name: sqlite3-ruby
98
+ type: :development
99
99
  version_requirements: *id005
100
100
  - !ruby/object:Gem::Dependency
101
+ name: ruby-debug
101
102
  prerelease: false
102
- type: :development
103
103
  requirement: &id006 !ruby/object:Gem::Requirement
104
104
  none: false
105
105
  requirements:
@@ -111,11 +111,11 @@ dependencies:
111
111
  - 10
112
112
  - 3
113
113
  version: 0.10.3
114
- name: ruby-debug
114
+ type: :development
115
115
  version_requirements: *id006
116
116
  - !ruby/object:Gem::Dependency
117
+ name: rspec-rails
117
118
  prerelease: false
118
- type: :development
119
119
  requirement: &id007 !ruby/object:Gem::Requirement
120
120
  none: false
121
121
  requirements:
@@ -127,11 +127,11 @@ dependencies:
127
127
  - 6
128
128
  - 0
129
129
  version: 2.6.0
130
- name: rspec-rails
130
+ type: :development
131
131
  version_requirements: *id007
132
132
  - !ruby/object:Gem::Dependency
133
+ name: factory_girl
133
134
  prerelease: false
134
- type: :development
135
135
  requirement: &id008 !ruby/object:Gem::Requirement
136
136
  none: false
137
137
  requirements:
@@ -143,11 +143,11 @@ dependencies:
143
143
  - 3
144
144
  - 2
145
145
  version: 1.3.2
146
- name: factory_girl
146
+ type: :development
147
147
  version_requirements: *id008
148
148
  - !ruby/object:Gem::Dependency
149
+ name: forgery
149
150
  prerelease: false
150
- type: :development
151
151
  requirement: &id009 !ruby/object:Gem::Requirement
152
152
  none: false
153
153
  requirements:
@@ -159,11 +159,11 @@ dependencies:
159
159
  - 3
160
160
  - 6
161
161
  version: 0.3.6
162
- name: forgery
162
+ type: :development
163
163
  version_requirements: *id009
164
164
  - !ruby/object:Gem::Dependency
165
+ name: capybara
165
166
  prerelease: false
166
- type: :development
167
167
  requirement: &id010 !ruby/object:Gem::Requirement
168
168
  none: false
169
169
  requirements:
@@ -175,7 +175,7 @@ dependencies:
175
175
  - 3
176
176
  - 9
177
177
  version: 0.3.9
178
- name: capybara
178
+ type: :development
179
179
  version_requirements: *id010
180
180
  description: |-
181
181
  Social Stream is a Ruby on Rails engine providing your application with social networking features and activity streams.
@@ -231,7 +231,8 @@ files:
231
231
  - app/assets/images/btn/document.png
232
232
  - app/assets/javascripts/documents.js.erb
233
233
  - app/assets/javascripts/social_stream-documents.js
234
- - app/assets/stylesheets/documents.css
234
+ - app/assets/stylesheets/documents.css.scss
235
+ - app/assets/stylesheets/show.css.scss
235
236
  - app/assets/stylesheets/social_stream-documents.css
236
237
  - app/controllers/audios_controller.rb
237
238
  - app/controllers/common_documents_controller.rb
@@ -248,6 +249,7 @@ files:
248
249
  - app/views/audios/_audio_global_search.html.erb
249
250
  - app/views/audios/_audio_processed.html.erb
250
251
  - app/views/audios/_audio_processing.html.erb
252
+ - app/views/audios/_audio_show.html.erb
251
253
  - app/views/audios/_audio_with_details.html.erb
252
254
  - app/views/audios/_mediapreviews.html.erb
253
255
  - app/views/audios/_new.html.erb
@@ -255,10 +257,13 @@ files:
255
257
  - app/views/audios/index.html.erb
256
258
  - app/views/audios/index.js.erb
257
259
  - app/views/audios/show.html.erb
258
- - app/views/common-documents/_index.html.erb
260
+ - app/views/common_documents/_document_info.html.erb
261
+ - app/views/common_documents/_index.html.erb
262
+ - app/views/common_documents/_show.html.erb
259
263
  - app/views/documents/_document.html.erb
260
264
  - app/views/documents/_document_focus_search.html.erb
261
265
  - app/views/documents/_document_global_search.html.erb
266
+ - app/views/documents/_document_show.html.erb
262
267
  - app/views/documents/_document_with_details.html.erb
263
268
  - app/views/documents/_header.html.erb
264
269
  - app/views/documents/_new_activity.html.erb
@@ -272,18 +277,19 @@ files:
272
277
  - app/views/pictures/_picture.html.erb
273
278
  - app/views/pictures/_picture_focus_search.html.erb
274
279
  - app/views/pictures/_picture_global_search.html.erb
280
+ - app/views/pictures/_picture_show.html.erb
275
281
  - app/views/pictures/_picture_with_details.html.erb
276
282
  - app/views/pictures/destroy.js.erb
277
283
  - app/views/pictures/index.html.erb
278
284
  - app/views/pictures/index.js.erb
279
285
  - app/views/pictures/show.html.erb
280
- - app/views/toolbar/_uploads_menu.html.erb
281
286
  - app/views/videos/_new.html.erb
282
287
  - app/views/videos/_video.html.erb
283
288
  - app/views/videos/_video_focus_search.html.erb
284
289
  - app/views/videos/_video_global_search.html.erb
285
290
  - app/views/videos/_video_processed.html.erb
286
291
  - app/views/videos/_video_processing.html.erb
292
+ - app/views/videos/_video_show.html.erb
287
293
  - app/views/videos/_video_with_details.html.erb
288
294
  - app/views/videos/destroy.js.erb
289
295
  - app/views/videos/index.html.erb
@@ -1,45 +0,0 @@
1
- <% content_for :title do %>
2
- <%= profile_subject.name %>
3
- <% end %>
4
-
5
- <% content_for :sidebar do %>
6
- <%= render :partial => 'home/sidebar' %>
7
- <% end %>
8
-
9
- <%if profile_subject_is_current?%>
10
- <%= location(
11
- link_to(t(controller.controller_name.singularize + '.title'), polymorphic_path(controller.controller_name),:remote => true)
12
- ) %>
13
- <% toolbar %>
14
- <%else%>
15
- <%= location(
16
- link_to(profile_subject.name, polymorphic_path(profile_subject),:remote => true),
17
- link_to(t(controller.controller_name.singularize + '.title'), polymorphic_path([profile_subject, controller.controller_name]),:remote => true)
18
- ) %>
19
- <% toolbar :profile => profile_subject %>
20
- <%end%>
21
-
22
-
23
- <div class="attachment_section_header">
24
- <h3><%= profile_subject_is_current? ? t(controller.controller_name.singularize + '.mine') : t(controller.controller_name.singularize + '.not_mine') %></h3>
25
- </div>
26
- <% @activities.each do |a| %>
27
- <% document = a.activity_objects.first.document %>
28
- <div class="attachment_tile">
29
- <div class="attachment_tile_thumb">
30
- <%= link_to thumb_for(document,48),
31
- {:controller => "documents", :action => "download", :id => document},
32
- :type => document.type,
33
- :title => document.file_file_name,
34
- :path => document_path(document) %>
35
- </div>
36
-
37
- <div class="attachment_tile_text">
38
- <%= link_to document.file_file_name,
39
- {:controller => "documents", :action => "download", :id => document},
40
- :alt => document.file_file_name,
41
- :type => document.type,
42
- :path => document_path(document) %>
43
- </div>
44
- </div>
45
- <% end %>
@@ -1,21 +0,0 @@
1
- <li>
2
- <%= link_to( image_tag("btn/btn_resource.png",:class =>"menu_icon")+t('resource.title'),"#") %>
3
- <ul>
4
- <li>
5
- <%= link_to( image_tag("btn/btn_document.png",
6
- :class => "menu_icon")+t('document.title'), documents_path) %>
7
- </li>
8
- <li>
9
- <%= link_to( image_tag("btn/btn_gallery.png",
10
- :class => "menu_icon")+t('picture.title'), pictures_path) %>
11
- </li>
12
- <li>
13
- <%= link_to( image_tag("btn/btn_video.png",
14
- :class => "menu_icon")+t('video.title'), videos_path) %>
15
- </li>
16
- <li>
17
- <%= link_to( image_tag("btn/btn_audio.png",
18
- :class => "menu_icon")+t('audio.title'), audios_path) %>
19
- </li>
20
- </ul>
21
- </li>