Download as
Browse Code »

Commit 89a073e546423d40736ef01c55984ba93e9a3f2b

Authored by Fernando Brito
1 parent f5278d22
Exists in master and in 2 other branches v2, wikilibras

Remove control os most videos

Showing 10 changed files with 42 additions and 24 deletions   Show diff stats
app/assets/stylesheets/components/video_player.css.scss
  Diff comments   View file @89a073e
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
10 .video-wizard { 10 .video-wizard {
11 max-width: 100%; 11 max-width: 100%;
12 margin-bottom: 20px; 12 margin-bottom: 20px;
  13 + background-color: inherit !important;
13 } 14 }
14 15
15 .video-vlibras { 16 .video-vlibras {
app/assets/stylesheets/v_libras/requests.css.scss
  Diff comments   View file @89a073e
@@ -38,4 +38,7 @@ @@ -38,4 +38,7 @@
38 opacity: 1; 38 opacity: 1;
39 } 39 }
40 40
  41 + label {
  42 + line-height: 32px;
  43 + }
41 } 44 }
42 \ No newline at end of file 45 \ No newline at end of file
app/helpers/application_helper.rb
  Diff comments   View file @89a073e
@@ -46,15 +46,11 @@ module ApplicationHelper @@ -46,15 +46,11 @@ module ApplicationHelper
46 :data => { 'toggle' => "tooltip" }, :title => request.response) 46 :data => { 'toggle' => "tooltip" }, :title => request.response)
47 end 47 end
48 48
49 - def custom_video_tag(video, classes = nil)  
50 - html5_video_tag(video.url_mp4, "video_#{video.id}", classes)  
51 - end  
52 -  
53 def html5_video_tag(url, id, classes = nil, *args) 49 def html5_video_tag(url, id, classes = nil, *args)
54 options = args.first || {} 50 options = args.first || {}
  51 +
55 options[:id] = id 52 options[:id] = id
56 options[:class] = "video-js vjs-default skin #{classes}" 53 options[:class] = "video-js vjs-default skin #{classes}"
57 - options[:controls] = 'controls'  
58 options[:preload] = 'auto' 54 options[:preload] = 'auto'
59 55
60 content_tag(:video, options) do 56 content_tag(:video, options) do
app/views/devise/registrations/new.html.haml
  Diff comments   View file @89a073e
@@ -3,7 +3,8 @@ @@ -3,7 +3,8 @@
3 3
4 .row-fluid 4 .row-fluid
5 .span5.well 5 .span5.well
6 - = html5_video_tag('/system/videos/cadastro.mp4', 'video-vlibras', 'video-instructions', :autoplay => 'autoplay') 6 + = html5_video_tag('/system/videos/cadastro.mp4', 'video-vlibras', 'video-instructions',
  7 + :autoplay => 'autoplay', :loop => 'loop')
7 8
8 .span7.well 9 .span7.well
9 %h2 Dados do Usuário 10 %h2 Dados do Usuário
app/views/devise/sessions/new.html.haml
  Diff comments   View file @89a073e
1 .row-fluid 1 .row-fluid
2 .span7 2 .span7
3 - = html5_video_tag('/system/videos/login.mp4', 'login', 'video-instructions', :autoplay => 'autoplay') 3 + = html5_video_tag('/system/videos/login.mp4', 'login', 'video-instructions',
  4 + :autoplay => 'autoplay', :loop => 'loop')
4 5
5 .span4.offset1.login 6 .span4.offset1.login
6 %h2 Entrar 7 %h2 Entrar
app/views/layouts/application.html.erb
  Diff comments   View file @89a073e
@@ -2,11 +2,12 @@ @@ -2,11 +2,12 @@
2 <html> 2 <html>
3 <head> 3 <head>
4 <title>GTAaaS</title> 4 <title>GTAaaS</title>
5 - <%= stylesheet_link_tag "application", :media => "all" %>  
6 <%= javascript_include_tag "application" %> 5 <%= javascript_include_tag "application" %>
7 -  
8 <%= yield :js %> 6 <%= yield :js %>
  7 +
9 <%= yield :css %> 8 <%= yield :css %>
  9 + <%= stylesheet_link_tag "application", :media => "all" %>
  10 +
10 11
11 <%= csrf_meta_tags %> 12 <%= csrf_meta_tags %>
12 <meta name="viewport" content="width=device-width, initial-scale=1.0"> 13 <meta name="viewport" content="width=device-width, initial-scale=1.0">
app/views/static/home.haml
  Diff comments   View file @89a073e
@@ -4,19 +4,21 @@ @@ -4,19 +4,21 @@
4 .hero-unit 4 .hero-unit
5 .row-fluid 5 .row-fluid
6 .span4 6 .span4
7 - = html5_video_tag('/system/videos/vlibras.mp4', 'video-vlibras', 'video-instructions', :autoplay => 'autoplay') 7 + = html5_video_tag('/system/videos/vlibras.mp4', 'video-vlibras', 'video-instructions',
  8 + :autoplay => 'autoplay', :loop => 'loop')
  9 +
8 %br/ 10 %br/
9 %h2= link_to "V-LIBRAS", new_v_libras_request_path 11 %h2= link_to "V-LIBRAS", new_v_libras_request_path
10 %p Coloque o seu vídeo e torne-o acessível. 12 %p Coloque o seu vídeo e torne-o acessível.
11 13
12 .span4.hidden 14 .span4.hidden
13 - = html5_video_tag('/system/videos/wikilibras.mp4', 'video-wikilibras', 'video-instructions') 15 + =# html5_video_tag('/system/videos/wikilibras.mp4', 'video-wikilibras', 'video-instructions')
14 %br/ 16 %br/
15 %h2= link_to "WIKILIBRAS", '#' 17 %h2= link_to "WIKILIBRAS", '#'
16 %p Contribua com sinais de LIBRAS para o nosso banco de dados. 18 %p Contribua com sinais de LIBRAS para o nosso banco de dados.
17 19
18 .span4.hidden 20 .span4.hidden
19 - = html5_video_tag('/system/videos/slibras.mp4', 'video-slibras', 'video-instructions') 21 + =# html5_video_tag('/system/videos/slibras.mp4', 'video-slibras', 'video-instructions')
20 %br/ 22 %br/
21 %h2= link_to "S-LIBRAS", '#' 23 %h2= link_to "S-LIBRAS", '#'
22 %p Edite a legenda dos vídeos já acessíveis 24 %p Edite a legenda dos vídeos já acessíveis
23 \ No newline at end of file 25 \ No newline at end of file
app/views/v_libras/requests/_service_step.haml
  Diff comments   View file @89a073e
@@ -6,10 +6,12 @@ @@ -6,10 +6,12 @@
6 %source{src: "/system/videos/workflow/sub_audio.webm"} 6 %source{src: "/system/videos/workflow/sub_audio.webm"}
7 Your browser does not support the video tag. 7 Your browser does not support the video tag.
8 8
9 - =# html5_video_tag("/system/videos/workflow/sub_audio.mp4", 'id', 'video-wizard', :autoplay => true) 9 + .row-fluid.hide
  10 + .span1.offset3
  11 + = label_tag :video, t('videos.subtitle'), :class => "bold"
10 12
11 - .span4.offset4.hide  
12 - = file_field_tag 'subtitle', :id => 'subtitle-upload' 13 + .span5
  14 + = file_field_tag 'subtitle', :id => 'subtitle-upload'
13 15
14 16
15 :javascript 17 :javascript
app/views/v_libras/requests/_video_step.haml
  Diff comments   View file @89a073e
1 -.wrapper 1 +#video-step.wrapper
2 .video_wrapper 2 .video_wrapper
3 3
4 - %video.video-wizard{'autoplay' => 'autoplay'}  
5 - %source{src: "/system/videos/workflow/tamanho.mp4"}  
6 - %source{src: "/system/videos/workflow/tamanho.webm"} 4 + %video.video-wizard{:autoplay => 'autoplay'}
  5 + %source{src: "/system/videos/workflow/sub_audio.mp4"}
  6 + %source{src: "/system/videos/workflow/sub_audio.webm"}
7 Your browser does not support the video tag. 7 Your browser does not support the video tag.
8 8
9 - .span6.offset3  
10 - .span2 9 + .row-fluid
  10 + .span1.offset3
11 = label_tag :video, t('videos.url'), :class => "bold" 11 = label_tag :video, t('videos.url'), :class => "bold"
12 - .span10  
13 - = file_field_tag 'video', :id => 'video-upload'  
14 \ No newline at end of file 12 \ No newline at end of file
  13 +
  14 + .span5
  15 + = file_field_tag 'video', :id => 'video-upload'
  16 +
  17 +
  18 +:javascript
  19 + var optionsVideo = {
  20 + video: { width: 940, height: 530 },
  21 + buttons: []
  22 + };
  23 +
  24 + var VLibrasVideo = new VLibrasLocalization();
  25 + VLibrasVideo.init("#video-step", optionsVideo);
15 \ No newline at end of file 26 \ No newline at end of file
app/views/v_libras/videos/show.haml
  Diff comments   View file @89a073e
@@ -3,4 +3,4 @@ @@ -3,4 +3,4 @@
3 3
4 .row-fluid 4 .row-fluid
5 .span12.text-center.well 5 .span12.text-center.well
6 - = html5_video_tag(@video.url_mp4, 'video-vlibras', 'video-vlibras', :autoplay => 'autoplay')  
7 \ No newline at end of file 6 \ No newline at end of file
  7 + = html5_video_tag(@video.url_mp4, 'video-vlibras', 'video-vlibras', :autoplay => 'autoplay', :controls => 'controls')
8 \ No newline at end of file 8 \ No newline at end of file