diff --git a/app/assets/stylesheets/bootstrap.css.less b/app/assets/stylesheets/bootstrap.css.less index 5ad120c..19fb5cc 100644 --- a/app/assets/stylesheets/bootstrap.css.less +++ b/app/assets/stylesheets/bootstrap.css.less @@ -13,11 +13,6 @@ @linkColor: #888; @linkColorHover: darken(@linkColor, 15%); - -body{ - margin-top:80px; -} - footer { background-color: #d6d6d6; text-align:center; diff --git a/app/assets/stylesheets/bootstrap_overrides.css.scss b/app/assets/stylesheets/bootstrap_overrides.css.scss index 2ac8507..4c520b3 100644 --- a/app/assets/stylesheets/bootstrap_overrides.css.scss +++ b/app/assets/stylesheets/bootstrap_overrides.css.scss @@ -48,4 +48,5 @@ .login { padding: 3% 5%; margin: 10px 35% 30px; + text-align: center; } \ No newline at end of file diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 839e8dc..5807f8e 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -7,7 +7,7 @@ protected def check_vlibras_api_status unless ApiClient.check_status flash[:error] = t('error.api.offline') - redirect_to home_path + # redirect_to home_path end end diff --git a/app/controllers/v_libras/videos_controller.rb b/app/controllers/v_libras/videos_controller.rb index c8acb54..9f24eff 100644 --- a/app/controllers/v_libras/videos_controller.rb +++ b/app/controllers/v_libras/videos_controller.rb @@ -1,7 +1,7 @@ class VLibras::VideosController < InheritedResources::Base - actions :destroy + actions :show, :destroy - before_filter :check_vlibras_api_status, :only => [ :index ] + before_filter :check_vlibras_api_status, :only => [ :index, :show ] before_filter :authenticate_user! def index diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 1781fef..3925d13 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -46,4 +46,11 @@ module ApplicationHelper :data => { 'toggle' => "tooltip" }, :title => request.response) end + def custom_video_tag(video) + content_tag(:video, :id => "video_#{video.id}", :class => 'video-js vjs-default skin', + :controls => 'controls', :preload => 'auto', :width => '100%') do + content_tag(:source, '', :src => '/video.mp4', :type => 'video/mp4') + end + end + end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 6692471..db080cb 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -6,6 +6,11 @@ <%= javascript_include_tag "application" %> <%= yield :js %> <%= csrf_meta_tags %> + + +
@@ -72,14 +77,13 @@
-
+
<% if content_for?(:menu) %>
<%= yield :menu %>
<% end %> - <% flash.each do |type, message| %>
@@ -93,5 +97,9 @@

GTAaaS - <%= t('shared.project') %> LAVID | © <%= Time.now.year %>. <%= t('shared.copyright') %>.

+ + + + diff --git a/app/views/v_libras/requests/rapid.haml b/app/views/v_libras/requests/rapid.haml index 7c23536..0bcc990 100644 --- a/app/views/v_libras/requests/rapid.haml +++ b/app/views/v_libras/requests/rapid.haml @@ -1,49 +1,50 @@ - content_for :js do = javascript_include_tag "v_libras/requests/rapid" -.login - %h2 - = t('videos.new') +.row-fluid + .span4.offset4.login + %h2 + = t('videos.new') - = form_tag v_libras_requests_path, method: :post, :multipart => true do |f| - - if @request.errors.any? - #error_explanation - %p/ - %h4 - = pluralize(@request.errors.count, "erro") - impede o vídeo de ser salvo: - %ul - - @request.errors.full_messages.each do |msg| - %li.error= msg + = form_tag v_libras_requests_path, method: :post, :multipart => true do |f| + - if @request.errors.any? + #error_explanation + %p/ + %h4 + = pluralize(@request.errors.count, "erro") + impede o vídeo de ser salvo: + %ul + - @request.errors.full_messages.each do |msg| + %li.error= msg - .field - = label_tag :service, t('videos.video_type'), :class => 'bold' + .field + = label_tag :service, t('videos.video_type'), :class => 'bold' - %label.radio - = radio_button_tag :service, 'video', false, :id => 'service-video' - Voz - %label.radio - = radio_button_tag :service, 'video-legenda', false, :id => 'service-video-subtitle' - Legenda (.SRT) + %label.radio + = radio_button_tag :service, 'video', false, :id => 'service-video' + Voz + %label.radio + = radio_button_tag :service, 'video-legenda', false, :id => 'service-video-subtitle' + Legenda (.SRT) - #url.hide - = label_tag :video, t('videos.url'), :class => "bold" - = file_field_tag :video, :onchange => "return check_video(this)" - #legend.hide - = label_tag :subtitle, t('videos.subtitle'), :class => "bold" - = file_field_tag :subtitle, :prompt => "LEGENDA", :onchange => "return check_subtitle(this)" - .field - = label_tag 'params[tamanho]', t('videos.window_size'), :class => "bold" - = select_tag 'params[tamanho]', options_for_select([['Pequena', 'pequeno'], ['Média', 'medio'], ['Grande', 'grande']]) - .field - %p - %b - = label_tag 'params[posicao]', t('videos.window_position'), :class => "bold" - = select_tag 'params[posicao]', options_for_select([[t('videos.top_left'), - 'superior-esquerdo'], [t('videos.top_right'), 'superior-direito'], - [t('videos.bottom_right'),'inferior-direito'], [t('videos.bottom_left'), 'inferior-esquerdo']]) - .field - = label_tag 'params[transparencia]', t('videos.transparency'), :class => "bold" - = select_tag 'params[transparencia]', options_for_select([['Opaco', 'opaco'], ['Transparente', 'transparente']]) - = submit_tag "Confirmar", :class => "btn btn-primary actions" + #url.hide + = label_tag :video, t('videos.url'), :class => "bold" + = file_field_tag :video, :onchange => "return check_video(this)" + #legend.hide + = label_tag :subtitle, t('videos.subtitle'), :class => "bold" + = file_field_tag :subtitle, :prompt => "LEGENDA", :onchange => "return check_subtitle(this)" + .field + = label_tag 'params[tamanho]', t('videos.window_size'), :class => "bold" + = select_tag 'params[tamanho]', options_for_select([['Pequena', 'pequeno'], ['Média', 'medio'], ['Grande', 'grande']]) + .field + %p + %b + = label_tag 'params[posicao]', t('videos.window_position'), :class => "bold" + = select_tag 'params[posicao]', options_for_select([[t('videos.top_left'), + 'superior-esquerdo'], [t('videos.top_right'), 'superior-direito'], + [t('videos.bottom_right'),'inferior-direito'], [t('videos.bottom_left'), 'inferior-esquerdo']]) + .field + = label_tag 'params[transparencia]', t('videos.transparency'), :class => "bold" + = select_tag 'params[transparencia]', options_for_select([['Opaco', 'opaco'], ['Transparente', 'transparente']]) + = submit_tag "Confirmar", :class => "btn btn-primary actions" diff --git a/app/views/v_libras/videos/index.haml b/app/views/v_libras/videos/index.haml index 33a56c0..f28d611 100644 --- a/app/views/v_libras/videos/index.haml +++ b/app/views/v_libras/videos/index.haml @@ -4,21 +4,23 @@ .breadcrumb %h3= t('videos.list') -.row.text-center - - @videos.each do |video| - .span4 - .ribbon-wrapper-green - .ribbon-content - = link_to image_tag("avatar.png"), video.url - .ribbon-green Novo - - %p - = link_to video_path(video), class: "btn btn-success" do - = content_tag(:span, '', :class => 'icon-download icon-white') - Baixar - - = link_to content_tag(:span, '', :class => 'icon-trash icon-white'), v_libras_video_path(video), method: :delete, - class: "btn btn-danger", data: { confirm: t('shared.confirm_delete') } + +- @videos.in_groups_of(3, false) do |group| + .row-fluid.text-center + - for video in group + .span4 + .ribbon-wrapper-green + .ribbon-content + = link_to image_tag("avatar.png"), video + .ribbon-green Novo + + %p + = link_to video_path(video), class: "btn btn-success" do + = content_tag(:span, '', :class => 'icon-download icon-white') + Baixar + + = link_to content_tag(:span, '', :class => 'icon-trash icon-white'), v_libras_video_path(video), method: :delete, + class: "btn btn-danger", data: { confirm: t('shared.confirm_delete') } .breadcrumb.requests %h4= t('requests.list') diff --git a/config/routes.rb b/config/routes.rb index 622e1e8..bf13744 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -17,7 +17,7 @@ Rails.application.routes.draw do post 'callback', on: :collection end - resources :videos, :only => [ :index, :destroy ] + resources :videos, :only => [ :index, :show, :destroy ] end -- libgit2 0.21.2