diff --git a/app/assets/javascripts/v_libras/requests/new.js b/app/assets/javascripts/v_libras/requests/new.js index bb09da3..44635d0 100644 --- a/app/assets/javascripts/v_libras/requests/new.js +++ b/app/assets/javascripts/v_libras/requests/new.js @@ -36,6 +36,8 @@ $(function () { function finished(event, currentIndex) { $("#vlibras-form").submit(); + $("#btn-next").text("Enviando..."); + deactivateNextButton(); } function stepValidation(event, currentIndex, newIndex) { @@ -62,17 +64,36 @@ $(function () { $("#btn-next").prop('disabled', true); } + $(".btn-window-position").click(function() { + $("#vlibras-form").addHidden('params[posicao]', $(this).data("value")); + $("#vlibras-form").addHidden('params[transparencia]', 'opaco'); + activateNextButton(); + + return false; + }); + + $(".btn-window-size").click(function() { + $("#vlibras-form").addHidden('params[tamanho]', $(this).data("value")); + activateNextButton(); + + return false; + }); + /* * Validates video and subtitle extension and activate the next button */ - $("#vlibras-wizard #subtitle-upload").change(function() { + $("#vlibras-form #subtitle-upload").change(function() { + $("#vlibras-form").addHidden('service', 'video-legenda'); + var acceptedFileTypes = ["srt"]; validateFileWizard($(this), acceptedFileTypes); }); - $("#vlibras-wizard #video-upload").change(function() { + $("#vlibras-form #video-upload").change(function() { + $("#vlibras-form").addHidden('service', 'video'); + var acceptedFileTypes = ["flv", "ts", "avi", "mp4", "mov", "webm", "wmv", "mkv"]; validateFileWizard($(this), acceptedFileTypes); }); diff --git a/app/assets/javascripts/v_libras/requests/shared.js b/app/assets/javascripts/v_libras/requests/shared.js index c923ae7..b0cae42 100644 --- a/app/assets/javascripts/v_libras/requests/shared.js +++ b/app/assets/javascripts/v_libras/requests/shared.js @@ -10,4 +10,13 @@ function checkType(file, acceptedFileTypes) { } return isValidFile; -} \ No newline at end of file +} + +// This must be applied to a form (or an object inside a form). +// http://stackoverflow.com/questions/2530635/jquery-add-additional-parameters-on-submit-not-ajax +jQuery.fn.addHidden = function (name, value) { + return this.each(function () { + var input = $("").attr("type", "hidden").attr("name", name).val(value); + $(this).append($(input)); + }); +}; \ No newline at end of file diff --git a/app/assets/stylesheets/components/ribbon.css.scss b/app/assets/stylesheets/components/ribbon.css.scss index df18a48..e38359f 100644 --- a/app/assets/stylesheets/components/ribbon.css.scss +++ b/app/assets/stylesheets/components/ribbon.css.scss @@ -1,6 +1,9 @@ +$ribbonUpperColor: #2A632B; +$ribbonBottomColor: #6D972D; + .ribbon-wrapper-green { margin: 10px auto; - width: 200px; + width: 205px; height: 165px; overflow: hidden; top: -3px; @@ -10,7 +13,7 @@ } .ribbon-content img { - border-radius: 3px; + border-radius: 30px; -webkit-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.3); -moz-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.3); box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.3); @@ -21,25 +24,25 @@ .ribbon-green { font: bold 15px Sans-Serif; - color: #333; + color: #fff; text-align: center; - text-shadow: rgba(255,255,255,0.5) 0px 1px 0px; + text-shadow: rgba(0, 0, 0, 1) 0px 1px 0px; -webkit-transform: rotate(45deg); -moz-transform: rotate(45deg); -ms-transform: rotate(45deg); -o-transform: rotate(45deg); position: relative; padding: 5px 0; - left: 118px; - bottom: 150px; + left: 122px; + bottom: 148px; width: 110px; + background-color: #BFDC7A; - background-image: -webkit-gradient(linear, left top, left bottom, from(#BFDC7A), to(#8EBF45)); - background-image: -webkit-linear-gradient(top, #BFDC7A, #8EBF45); - background-image: -moz-linear-gradient(top, #BFDC7A, #8EBF45); - background-image: -ms-linear-gradient(top, #BFDC7A, #8EBF45); - background-image: -o-linear-gradient(top, #BFDC7A, #8EBF45); - color: #6a6340; + background-image: -webkit-gradient(linear, left top, left bottom, from($ribbonUpperColor), to($ribbonBottomColor)); + background-image: -webkit-linear-gradient(top, $ribbonUpperColor, $ribbonBottomColor); + background-image: -moz-linear-gradient(top, $ribbonUpperColor, $ribbonBottomColor); + background-image: -ms-linear-gradient(top, $ribbonUpperColor, $ribbonBottomColor); + background-image: -o-linear-gradient(top, $ribbonUpperColor, $ribbonBottomColor); -webkit-box-shadow: 0px 0px 3px rgba(0,0,0,0.3); -moz-box-shadow: 0px 0px 3px rgba(0,0,0,0.3); box-shadow: 0px 0px 3px rgba(0,0,0,0.3); diff --git a/app/controllers/v_libras/requests_controller.rb b/app/controllers/v_libras/requests_controller.rb index dcea3f8..08230d4 100644 --- a/app/controllers/v_libras/requests_controller.rb +++ b/app/controllers/v_libras/requests_controller.rb @@ -1,8 +1,8 @@ class VLibras::RequestsController < ApplicationController - before_filter :check_vlibras_api_status, :only => [ :rapid, :create ] - protect_from_forgery with: :null_session, :only => [ :callback ] + before_filter :authenticate_user!, :except => [ :callback ] + before_filter :check_vlibras_api_status, :except => [ :callback ] def rapid @request = VLibras::Request.new @@ -25,6 +25,7 @@ class VLibras::RequestsController < ApplicationController flash[:error] = 'Algo deu errado com a sua requisição. Por favor verifique opções escolhidas.' flash[:warning] = @request.errors.full_messages.to_sentence.humanize + # Warning: this code is also present on #perform_request, if the request is successfully done @request.files.values.each { |f| f.file.delete } redirect_to :back diff --git a/app/models/v_libras/request.rb b/app/models/v_libras/request.rb index dd5cfdd..113ecd3 100644 --- a/app/models/v_libras/request.rb +++ b/app/models/v_libras/request.rb @@ -67,6 +67,7 @@ class VLibras::Request < ActiveRecord::Base ApiClient::Client.submit(self, files) + # Warning: this code is also present on the controller, if there is an error files.values.each { |f| f.file.delete } logger.debug '[VLibras::Request] Request done' diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index 4554414..6f82e6f 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -1,6 +1,6 @@ .row-fluid - .span5.offset1 - = html5_video_tag('/video.mp4', 'login', 'video-instructions', :autoplay => 'autoplay') + .span7 + = html5_video_tag('/system/videos/login.mp4', 'login', 'video-instructions', :autoplay => 'autoplay') .span4.offset1.login %h2 Entrar diff --git a/app/views/static/home.haml b/app/views/static/home.haml index e888ffc..f2f2231 100644 --- a/app/views/static/home.haml +++ b/app/views/static/home.haml @@ -1,2 +1,22 @@ .breadcrumb - %h1 Menu \ No newline at end of file + %h1 Menu + +.hero-unit + .row-fluid + .span4 + = html5_video_tag('/system/videos/vlibras.mp4', 'video-vlibras', 'video-instructions', :autoplay => 'autoplay') + %br/ + %h2= link_to "V-LIBRAS", new_v_libras_request_path + %p Coloque o seu vídeo e torne-o acessível. + + .span4.hidden + = html5_video_tag('/system/videos/wikilibras.mp4', 'video-wikilibras', 'video-instructions') + %br/ + %h2= link_to "WIKILIBRAS", '#' + %p Contribua com sinais de LIBRAS para o nosso banco de dados. + + .span4.hidden + = html5_video_tag('/system/videos/slibras.mp4', 'video-slibras', 'video-instructions') + %br/ + %h2= link_to "S-LIBRAS", '#' + %p Edite a legenda dos vídeos já acessíveis \ No newline at end of file diff --git a/app/views/v_libras/requests/new.haml b/app/views/v_libras/requests/new.haml index 4346b2a..786254e 100644 --- a/app/views/v_libras/requests/new.haml +++ b/app/views/v_libras/requests/new.haml @@ -32,15 +32,21 @@ .span4 = file_field_tag 'subtitle', :id => 'subtitle-upload' + %h2 Posição %section %p - asd + = button_tag 'Superior Esquerdo', :class => 'btn btn-large btn-window-position', :data => { :value => 'superior-esquerdo' } + = button_tag 'Superior Direito', :class => 'btn btn-large btn-window-position', :data => { :value => 'superior-direito' } + = button_tag 'Inferior Direito', :class => 'btn btn-large btn-window-position', :data => { :value => 'inferior-direito' } + = button_tag 'Inferior Esquerdo', :class => 'btn btn-large btn-window-position', :data => { :value => 'inferior-esquerdo' } %h2 Tamanho %section %p - botão de + = button_tag 'Pequeno', :class => 'btn btn-large btn-window-size', :data => { :value => 'pequeno' } + = button_tag 'Médio', :class => 'btn btn-large btn-window-size', :data => { :value => 'medio' } + = button_tag 'Grande', :class => 'btn btn-large btn-window-size', :data => { :value => 'grande' } #menu.center = button_tag 'Próximo', :class => "btn btn-large btn-success", :id => 'btn-next', :disabled => true -- libgit2 0.21.2