From 0b651ac73b9e32d67698c3f676ab9a7904784e5b Mon Sep 17 00:00:00 2001 From: Vandhuy Martins Date: Wed, 26 Mar 2014 13:26:07 -0700 Subject: [PATCH] D1.0 - Funcionalidade #1033 --- app/controllers/wikilibras/wikivideos_controller.rb | 7 ++++--- app/helpers/application_helper.rb | 9 +++++++-- app/views/wikilibras/wikivideos/_sinal.html.haml | 8 ++++---- app/views/wikilibras/wikivideos/dicionario.html.haml | 2 +- public/dictionary/.gitempty | 0 5 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 public/dictionary/.gitempty diff --git a/app/controllers/wikilibras/wikivideos_controller.rb b/app/controllers/wikilibras/wikivideos_controller.rb index c2f1550..0c8f6ad 100644 --- a/app/controllers/wikilibras/wikivideos_controller.rb +++ b/app/controllers/wikilibras/wikivideos_controller.rb @@ -9,9 +9,10 @@ class Wikilibras::WikivideosController < Wikilibras::BaseController def dicionario # @q = Wikivideo.search(params[:q]) # @wikivideos = @q.result(:distinct => true) - @wikivideo = Wikivideo.new - @wikivideos = Wikivideo.all - @wikivideos = Wikivideo.where("signal_name like ?","%#{params[:signal_name]}%") if params[:signal_name] +# @wikivideo = Wikivideo.new +# @wikivideos = Wikivideo.all +# @wikivideos = Wikivideo.where("signal_name like ?","%#{params[:signal_name]}%") if params[:signal_name] + @wikivideos = Dir.glob('public/dictionary/*.flv') end def search diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 7fe3ce2..98976f2 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -25,8 +25,13 @@ module ApplicationHelper end def format_signal_name(name) - final = name.split(/\s*(\d+)\s*/,-1) - return final[0] + final = name.split("/").last.split(".").first + return final + end + + def format_signal_path(name) + final = name.split("/")[1..-1].join("/") + return final end def show_month(month) diff --git a/app/views/wikilibras/wikivideos/_sinal.html.haml b/app/views/wikilibras/wikivideos/_sinal.html.haml index 272077b..3c5423f 100644 --- a/app/views/wikilibras/wikivideos/_sinal.html.haml +++ b/app/views/wikilibras/wikivideos/_sinal.html.haml @@ -1,19 +1,19 @@ / Author Igor Portela - www.igorportela.com :javascript $(function(){ - flowplayer("player#{wikivideo.id}", "/player/flowplayer-3.2.9.swf",{ + flowplayer("player_#{format_signal_name(wikivideo)}", "/player/flowplayer-3.2.9.swf",{ onFinish: function(){ this.getPlugin("play").hide(); }, canvas: { backgroundColor: "#FFFFFF" } }); }); -.modal.hide.fade{"aria-hidden" => "true", "aria-labelledby" => "myModalLabel", :id => "signal_#{wikivideo.id}", :role => "dialog", :tabindex => "-1"} +.modal.hide.fade{"aria-hidden" => "true", "aria-labelledby" => "myModalLabel", :id => "signal_#{format_signal_name(wikivideo)}", :role => "dialog", :tabindex => "-1"} .modal-header %button.close{"aria-hidden" => "true", "data-dismiss" => "modal", :type => "button"} × %h3#myModalLabel - Sinal: #{format_signal_name(wikivideo.signal_name)} + Sinal: #{format_signal_name(wikivideo)} .modal-body %div{:style => "height:350px"} - = link_to '', wikivideo.path_signal, id: "player#{wikivideo.id}" + = link_to '', "/" + format_signal_path(wikivideo), id: "player_#{format_signal_name(wikivideo)}" .modal-footer %button.btn.btn-primary{"aria-hidden" => "true", "data-dismiss" => "modal"} OK %button.btn.btn-danger Denunciar Erro \ No newline at end of file diff --git a/app/views/wikilibras/wikivideos/dicionario.html.haml b/app/views/wikilibras/wikivideos/dicionario.html.haml index 1b5c193..d9ce0ac 100644 --- a/app/views/wikilibras/wikivideos/dicionario.html.haml +++ b/app/views/wikilibras/wikivideos/dicionario.html.haml @@ -13,7 +13,7 @@ - @wikivideos.each do |wikivideo| %tbody %tr - %td= link_to format_signal_name(wikivideo.signal_name), "#signal_#{wikivideo.id}", "data-toggle" => "modal" + %td= link_to format_signal_name(wikivideo), "#signal_#{format_signal_name(wikivideo)}", "data-toggle" => "modal" = render "wikilibras/wikivideos/sinal", wikivideo: wikivideo - else .alert diff --git a/public/dictionary/.gitempty b/public/dictionary/.gitempty new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/public/dictionary/.gitempty -- libgit2 0.21.2