social_stream-documents 2.0.0.beta2 → 2.0.0.beta3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/social_stream/audio.js.erb +5 -5
- data/app/assets/javascripts/social_stream/documents.timeline.js +24 -6
- data/app/assets/javascripts/social_stream/documents.wall.js +37 -32
- data/app/assets/javascripts/social_stream/video.js +33 -0
- data/app/assets/stylesheets/social_stream/documents/create/layout/_new.css.sass +3 -0
- data/app/assets/stylesheets/social_stream/documents/documents/layout/_documents.css.sass +12 -7
- data/app/assets/stylesheets/social_stream/documents/responsive/_responsive-1200px-min.css.sass +8 -1
- data/app/assets/stylesheets/social_stream/documents/responsive/_responsive-767px-max.css.sass +27 -2
- data/app/assets/stylesheets/social_stream/documents/show/_show.css.sass +29 -0
- data/app/assets/stylesheets/social_stream/documents/show/layout/_show.css.sass +36 -0
- data/app/assets/stylesheets/social_stream/documents/timeline/_audios.css.sass +27 -12
- data/app/views/audios/_audio_processed.html.erb +5 -46
- data/app/views/audios/_audio_show.html.erb +16 -57
- data/app/views/audios/_player.html.erb +42 -0
- data/app/views/common_documents/_index.html.erb +3 -5
- data/app/views/videos/_player.html.erb +36 -0
- data/app/views/videos/_video_processed.html.erb +5 -43
- data/app/views/videos/_video_show.html.erb +10 -60
- data/config/locales/en.yml +67 -67
- data/config/locales/es.yml +67 -64
- data/config/locales/zh.yml +90 -0
- data/lib/generators/social_stream/documents/templates/initializer.rb +1 -1
- data/lib/social_stream-documents.rb +1 -1
- data/lib/social_stream/documents/version.rb +1 -1
- data/social_stream-documents.gemspec +1 -1
- metadata +8 -5
- data/app/assets/javascripts/social_stream/video.js.erb +0 -42
data/config/locales/es.yml
CHANGED
|
@@ -1,87 +1,90 @@
|
|
|
1
|
+
---
|
|
1
2
|
es:
|
|
2
3
|
activerecord:
|
|
3
4
|
attributes:
|
|
4
5
|
document:
|
|
5
|
-
title:
|
|
6
|
+
title: Título
|
|
6
7
|
models:
|
|
7
|
-
document:
|
|
8
|
+
document: Fichero
|
|
8
9
|
audio:
|
|
9
|
-
confirm_delete:
|
|
10
|
-
mine:
|
|
11
|
-
name:
|
|
12
|
-
not_mine:
|
|
13
|
-
one:
|
|
14
|
-
other:
|
|
15
|
-
processing:
|
|
10
|
+
confirm_delete: ¿Borrar audios?
|
|
11
|
+
mine: Mis audios
|
|
12
|
+
name: archivo de audio
|
|
13
|
+
not_mine: Audios
|
|
14
|
+
one: un archivo de audio
|
|
15
|
+
other: audios
|
|
16
|
+
processing: Procesando fichero de audio. Espere, por favor...
|
|
16
17
|
title:
|
|
17
|
-
one:
|
|
18
|
-
other:
|
|
18
|
+
one: Audio
|
|
19
|
+
other: Audios
|
|
19
20
|
details:
|
|
20
|
-
msg:
|
|
21
|
+
msg: Ver detalles...
|
|
21
22
|
document:
|
|
22
23
|
actions:
|
|
23
|
-
delete:
|
|
24
|
-
details:
|
|
25
|
-
download:
|
|
26
|
-
edit:
|
|
27
|
-
all:
|
|
28
|
-
by:
|
|
29
|
-
confirm_delete:
|
|
24
|
+
delete: Borrar
|
|
25
|
+
details: Detalles
|
|
26
|
+
download: Descargar
|
|
27
|
+
edit: Editar
|
|
28
|
+
all: Todos los ficheros
|
|
29
|
+
by: por %{author}
|
|
30
|
+
confirm_delete: ¿Borrar fichero?
|
|
30
31
|
description:
|
|
31
|
-
input:
|
|
32
|
-
filter:
|
|
32
|
+
input: Añade una descripción aquí
|
|
33
|
+
filter: filtrar
|
|
33
34
|
form:
|
|
34
|
-
title:
|
|
35
|
+
title: Fichero
|
|
35
36
|
info:
|
|
36
|
-
author:
|
|
37
|
+
author: Autor
|
|
37
38
|
date:
|
|
38
|
-
created_at:
|
|
39
|
-
updated_at:
|
|
40
|
-
description:
|
|
41
|
-
file:
|
|
42
|
-
title:
|
|
43
|
-
|
|
44
|
-
|
|
39
|
+
created_at: Creado
|
|
40
|
+
updated_at: Última modificación
|
|
41
|
+
description: Descripción
|
|
42
|
+
file: Fichero
|
|
43
|
+
title: Título
|
|
44
|
+
size: Size
|
|
45
|
+
tags: Tags
|
|
46
|
+
mine: Mis ficheros
|
|
47
|
+
name: fichero
|
|
45
48
|
new:
|
|
46
|
-
link:
|
|
47
|
-
title:
|
|
49
|
+
link: Añadir fichero
|
|
50
|
+
title: Nuevo fichero
|
|
48
51
|
new_activity:
|
|
49
|
-
attach:
|
|
50
|
-
not_mine:
|
|
51
|
-
one:
|
|
52
|
-
other:
|
|
52
|
+
attach: Adjuntar fichero
|
|
53
|
+
not_mine: Ficheros
|
|
54
|
+
one: un fichero
|
|
55
|
+
other: ficheros
|
|
53
56
|
scope:
|
|
54
|
-
network:
|
|
55
|
-
own:
|
|
56
|
-
simple_all:
|
|
57
|
+
network: Red
|
|
58
|
+
own: Propios
|
|
59
|
+
simple_all: Todos
|
|
57
60
|
title:
|
|
58
|
-
input:
|
|
59
|
-
one:
|
|
60
|
-
other:
|
|
61
|
+
input: Título del fichero
|
|
62
|
+
one: Fichero
|
|
63
|
+
other: Ficheros
|
|
61
64
|
picture:
|
|
62
|
-
confirm_delete:
|
|
63
|
-
mine:
|
|
64
|
-
name:
|
|
65
|
-
not_mine:
|
|
66
|
-
one:
|
|
67
|
-
other:
|
|
65
|
+
confirm_delete: ¿Borrar imagen?
|
|
66
|
+
mine: Mis imágenes
|
|
67
|
+
name: imagen
|
|
68
|
+
not_mine: Imágenes
|
|
69
|
+
one: una imagen
|
|
70
|
+
other: imagenes
|
|
68
71
|
title:
|
|
69
|
-
one:
|
|
70
|
-
other:
|
|
72
|
+
one: Imagen
|
|
73
|
+
other: Imágenes
|
|
71
74
|
resource:
|
|
72
|
-
all:
|
|
73
|
-
confirm_delete:
|
|
74
|
-
title:
|
|
75
|
-
mine:
|
|
76
|
-
not_mine:
|
|
75
|
+
all: Todos los recursos
|
|
76
|
+
confirm_delete: ¿Borrar recursos?
|
|
77
|
+
title: Recursos
|
|
78
|
+
mine: Mis recursos
|
|
79
|
+
not_mine: Recursos
|
|
77
80
|
video:
|
|
78
|
-
confirm_delete:
|
|
79
|
-
mine:
|
|
80
|
-
name:
|
|
81
|
-
not_mine:
|
|
82
|
-
one:
|
|
83
|
-
other:
|
|
84
|
-
processing:
|
|
81
|
+
confirm_delete: ¿Borrar vídeo?
|
|
82
|
+
mine: Mis vídeos
|
|
83
|
+
name: vídeo
|
|
84
|
+
not_mine: Vídeos
|
|
85
|
+
one: un vídeo
|
|
86
|
+
other: videos
|
|
87
|
+
processing: Procesando vídeo. Espere, por favor...
|
|
85
88
|
title:
|
|
86
|
-
one:
|
|
87
|
-
other:
|
|
89
|
+
one: Vídeo
|
|
90
|
+
other: Vídeos
|
|
@@ -0,0 +1,90 @@
|
|
|
1
|
+
---
|
|
2
|
+
zh:
|
|
3
|
+
activerecord:
|
|
4
|
+
attributes:
|
|
5
|
+
document:
|
|
6
|
+
title: Title
|
|
7
|
+
models:
|
|
8
|
+
document: File
|
|
9
|
+
audio:
|
|
10
|
+
confirm_delete: Delete audio?
|
|
11
|
+
title:
|
|
12
|
+
one: Audio
|
|
13
|
+
other: Audios
|
|
14
|
+
mine: My audios
|
|
15
|
+
name: audio
|
|
16
|
+
not_mine: Audios
|
|
17
|
+
one: an audio
|
|
18
|
+
other: audios
|
|
19
|
+
processing: Processing audio clip. Please wait...
|
|
20
|
+
details:
|
|
21
|
+
msg: See details...
|
|
22
|
+
document:
|
|
23
|
+
actions:
|
|
24
|
+
delete: Delete
|
|
25
|
+
details: Details
|
|
26
|
+
download: Download
|
|
27
|
+
edit: Edit
|
|
28
|
+
all: All files
|
|
29
|
+
by: by %{author}
|
|
30
|
+
confirm_delete: Delete file?
|
|
31
|
+
description:
|
|
32
|
+
input: Add a description here
|
|
33
|
+
filter: filter
|
|
34
|
+
form:
|
|
35
|
+
title: File
|
|
36
|
+
info:
|
|
37
|
+
author: Author
|
|
38
|
+
date:
|
|
39
|
+
created_at: Created at
|
|
40
|
+
updated_at: Updated at
|
|
41
|
+
description: Description
|
|
42
|
+
file: File
|
|
43
|
+
size: Size
|
|
44
|
+
tags: Tags
|
|
45
|
+
title: Title
|
|
46
|
+
mine: My files
|
|
47
|
+
name: file
|
|
48
|
+
new:
|
|
49
|
+
link: Add file
|
|
50
|
+
title: New file
|
|
51
|
+
new_activity:
|
|
52
|
+
attach: Attach file
|
|
53
|
+
not_mine: Files
|
|
54
|
+
one: a file
|
|
55
|
+
other: files
|
|
56
|
+
scope:
|
|
57
|
+
network: Network
|
|
58
|
+
own: Own
|
|
59
|
+
simple_all: All
|
|
60
|
+
title:
|
|
61
|
+
input: File title
|
|
62
|
+
one: File
|
|
63
|
+
other: Files
|
|
64
|
+
picture:
|
|
65
|
+
confirm_delete: Delete picture?
|
|
66
|
+
mine: My pictures
|
|
67
|
+
name: picture
|
|
68
|
+
not_mine: Pictures
|
|
69
|
+
one: a picture
|
|
70
|
+
other: pictures
|
|
71
|
+
title:
|
|
72
|
+
one: Picture
|
|
73
|
+
other: Pictures
|
|
74
|
+
resource:
|
|
75
|
+
all: All Resources
|
|
76
|
+
confirm_delete: Delete resource?
|
|
77
|
+
title: Resources
|
|
78
|
+
mine: My resources
|
|
79
|
+
not_mine: Resources
|
|
80
|
+
video:
|
|
81
|
+
confirm_delete: Delete video?
|
|
82
|
+
mine: My videos
|
|
83
|
+
name: video
|
|
84
|
+
not_mine: Videos
|
|
85
|
+
one: a video
|
|
86
|
+
other: videos
|
|
87
|
+
processing: Processing video. Please, wait...
|
|
88
|
+
title:
|
|
89
|
+
one: Video
|
|
90
|
+
other: Videos
|
|
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
|
|
|
12
12
|
s.files = `git ls-files`.split("\n")
|
|
13
13
|
|
|
14
14
|
# Gem dependencies
|
|
15
|
-
s.add_runtime_dependency('social_stream-base', '~> 2.0.0.
|
|
15
|
+
s.add_runtime_dependency('social_stream-base', '~> 2.0.0.beta3')
|
|
16
16
|
s.add_runtime_dependency('paperclip','~> 3.3.0')
|
|
17
17
|
s.add_runtime_dependency('paperclip-ffmpeg', '~> 0.9.0')
|
|
18
18
|
s.add_runtime_dependency('delayed_paperclip','>= 2.4.5.2')
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: social_stream-documents
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.0.0.
|
|
4
|
+
version: 2.0.0.beta3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Víctor Sánchez Belmar
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2013-04-
|
|
12
|
+
date: 2013-04-26 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: social_stream-base
|
|
@@ -17,14 +17,14 @@ dependencies:
|
|
|
17
17
|
requirements:
|
|
18
18
|
- - ~>
|
|
19
19
|
- !ruby/object:Gem::Version
|
|
20
|
-
version: 2.0.0.
|
|
20
|
+
version: 2.0.0.beta3
|
|
21
21
|
type: :runtime
|
|
22
22
|
prerelease: false
|
|
23
23
|
version_requirements: !ruby/object:Gem::Requirement
|
|
24
24
|
requirements:
|
|
25
25
|
- - ~>
|
|
26
26
|
- !ruby/object:Gem::Version
|
|
27
|
-
version: 2.0.0.
|
|
27
|
+
version: 2.0.0.beta3
|
|
28
28
|
- !ruby/object:Gem::Dependency
|
|
29
29
|
name: paperclip
|
|
30
30
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -173,7 +173,7 @@ files:
|
|
|
173
173
|
- app/assets/javascripts/social_stream/document.js
|
|
174
174
|
- app/assets/javascripts/social_stream/documents.timeline.js
|
|
175
175
|
- app/assets/javascripts/social_stream/documents.wall.js
|
|
176
|
-
- app/assets/javascripts/social_stream/video.js
|
|
176
|
+
- app/assets/javascripts/social_stream/video.js
|
|
177
177
|
- app/assets/stylesheets/social_stream-documents.css.sass
|
|
178
178
|
- app/assets/stylesheets/social_stream/documents/_toolbar.css.sass
|
|
179
179
|
- app/assets/stylesheets/social_stream/documents/aside/_documents.css.sass
|
|
@@ -210,6 +210,7 @@ files:
|
|
|
210
210
|
- app/views/audios/_audio_processing.html.erb
|
|
211
211
|
- app/views/audios/_audio_show.html.erb
|
|
212
212
|
- app/views/audios/_new.html.erb
|
|
213
|
+
- app/views/audios/_player.html.erb
|
|
213
214
|
- app/views/audios/_quick_search_result.html.erb
|
|
214
215
|
- app/views/audios/_search_result.html.erb
|
|
215
216
|
- app/views/audios/_timeline.html.erb
|
|
@@ -247,6 +248,7 @@ files:
|
|
|
247
248
|
- app/views/pictures/index.html.erb
|
|
248
249
|
- app/views/pictures/show.html.erb
|
|
249
250
|
- app/views/videos/_new.html.erb
|
|
251
|
+
- app/views/videos/_player.html.erb
|
|
250
252
|
- app/views/videos/_quick_search_result.html.erb
|
|
251
253
|
- app/views/videos/_search_result.html.erb
|
|
252
254
|
- app/views/videos/_timeline.html.erb
|
|
@@ -261,6 +263,7 @@ files:
|
|
|
261
263
|
- app/worker/videoencoder.rb
|
|
262
264
|
- config/locales/en.yml
|
|
263
265
|
- config/locales/es.yml
|
|
266
|
+
- config/locales/zh.yml
|
|
264
267
|
- config/routes.rb
|
|
265
268
|
- db/migrate/20120208143721_create_social_stream_documents.rb
|
|
266
269
|
- lib/delayed_paperclip/social_stream-documents.rb
|
|
@@ -1,42 +0,0 @@
|
|
|
1
|
-
//= require social_stream/callback
|
|
2
|
-
|
|
3
|
-
SocialStream.Video = (function(SS, $, undefined){
|
|
4
|
-
var callback = new SS.Callback();
|
|
5
|
-
|
|
6
|
-
var initJplayer = function(){
|
|
7
|
-
$(".jp-video .jp-jplayer").each(function() {
|
|
8
|
-
$(this).jPlayer({
|
|
9
|
-
ready: function () {
|
|
10
|
-
$(this).jPlayer("setMedia", {
|
|
11
|
-
webmv: $(this).closest(".video").find(".video-webm").attr("href"), // Defines the webm url
|
|
12
|
-
flv: $(this).closest(".video").find(".video-flv").attr("href"), // Defines the flv url
|
|
13
|
-
mp4: $(this).closest(".video").find(".video-mp4").attr("href") // Defines the mp4 url
|
|
14
|
-
});
|
|
15
|
-
},
|
|
16
|
-
solution:"flash, html",
|
|
17
|
-
preload: "none",
|
|
18
|
-
supplied: "webmv, flv, mp4",
|
|
19
|
-
swfPath: "<%= asset_path "" %>",
|
|
20
|
-
cssSelectorAncestor: "#" + $(this).closest(".video-full").attr("id")
|
|
21
|
-
})
|
|
22
|
-
});
|
|
23
|
-
|
|
24
|
-
$(".video .format-links").hide();
|
|
25
|
-
$(".video-full").hide();
|
|
26
|
-
|
|
27
|
-
$(".video .play_over").click(function(){
|
|
28
|
-
var video = $(this).closest(".video")
|
|
29
|
-
video.find(".thumb").hide();
|
|
30
|
-
video.find(".text").hide();
|
|
31
|
-
video.find(".jp-video-play").hide();
|
|
32
|
-
video.find(".video-full").show();
|
|
33
|
-
video.find(".jp-jplayer").jPlayer("play", 0);
|
|
34
|
-
});
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
callback.register('show', initJplayer);
|
|
38
|
-
|
|
39
|
-
return callback.extend({
|
|
40
|
-
});
|
|
41
|
-
|
|
42
|
-
})(SocialStream, jQuery);
|