Commit 0b651ac73b9e32d67698c3f676ab9a7904784e5b
1 parent
41754752
Exists in
master
and in
1 other branch
D1.0 - Funcionalidade #1033
Showing
5 changed files
with
16 additions
and
10 deletions
Show diff stats
app/controllers/wikilibras/wikivideos_controller.rb
| @@ -9,9 +9,10 @@ class Wikilibras::WikivideosController < Wikilibras::BaseController | @@ -9,9 +9,10 @@ class Wikilibras::WikivideosController < Wikilibras::BaseController | ||
| 9 | def dicionario | 9 | def dicionario |
| 10 | # @q = Wikivideo.search(params[:q]) | 10 | # @q = Wikivideo.search(params[:q]) |
| 11 | # @wikivideos = @q.result(:distinct => true) | 11 | # @wikivideos = @q.result(:distinct => true) |
| 12 | - @wikivideo = Wikivideo.new | ||
| 13 | - @wikivideos = Wikivideo.all | ||
| 14 | - @wikivideos = Wikivideo.where("signal_name like ?","%#{params[:signal_name]}%") if params[:signal_name] | 12 | +# @wikivideo = Wikivideo.new |
| 13 | +# @wikivideos = Wikivideo.all | ||
| 14 | +# @wikivideos = Wikivideo.where("signal_name like ?","%#{params[:signal_name]}%") if params[:signal_name] | ||
| 15 | + @wikivideos = Dir.glob('public/dictionary/*.flv') | ||
| 15 | end | 16 | end |
| 16 | 17 | ||
| 17 | def search | 18 | def search |
app/helpers/application_helper.rb
| @@ -25,8 +25,13 @@ module ApplicationHelper | @@ -25,8 +25,13 @@ module ApplicationHelper | ||
| 25 | end | 25 | end |
| 26 | 26 | ||
| 27 | def format_signal_name(name) | 27 | def format_signal_name(name) |
| 28 | - final = name.split(/\s*(\d+)\s*/,-1) | ||
| 29 | - return final[0] | 28 | + final = name.split("/").last.split(".").first |
| 29 | + return final | ||
| 30 | + end | ||
| 31 | + | ||
| 32 | + def format_signal_path(name) | ||
| 33 | + final = name.split("/")[1..-1].join("/") | ||
| 34 | + return final | ||
| 30 | end | 35 | end |
| 31 | 36 | ||
| 32 | def show_month(month) | 37 | def show_month(month) |
app/views/wikilibras/wikivideos/_sinal.html.haml
| 1 | / Author Igor Portela - www.igorportela.com | 1 | / Author Igor Portela - www.igorportela.com |
| 2 | :javascript | 2 | :javascript |
| 3 | $(function(){ | 3 | $(function(){ |
| 4 | - flowplayer("player#{wikivideo.id}", "/player/flowplayer-3.2.9.swf",{ | 4 | + flowplayer("player_#{format_signal_name(wikivideo)}", "/player/flowplayer-3.2.9.swf",{ |
| 5 | onFinish: function(){ this.getPlugin("play").hide(); }, | 5 | onFinish: function(){ this.getPlugin("play").hide(); }, |
| 6 | canvas: { backgroundColor: "#FFFFFF" } | 6 | canvas: { backgroundColor: "#FFFFFF" } |
| 7 | }); | 7 | }); |
| 8 | }); | 8 | }); |
| 9 | -.modal.hide.fade{"aria-hidden" => "true", "aria-labelledby" => "myModalLabel", :id => "signal_#{wikivideo.id}", :role => "dialog", :tabindex => "-1"} | 9 | +.modal.hide.fade{"aria-hidden" => "true", "aria-labelledby" => "myModalLabel", :id => "signal_#{format_signal_name(wikivideo)}", :role => "dialog", :tabindex => "-1"} |
| 10 | .modal-header | 10 | .modal-header |
| 11 | %button.close{"aria-hidden" => "true", "data-dismiss" => "modal", :type => "button"} × | 11 | %button.close{"aria-hidden" => "true", "data-dismiss" => "modal", :type => "button"} × |
| 12 | %h3#myModalLabel | 12 | %h3#myModalLabel |
| 13 | - Sinal: #{format_signal_name(wikivideo.signal_name)} | 13 | + Sinal: #{format_signal_name(wikivideo)} |
| 14 | .modal-body | 14 | .modal-body |
| 15 | %div{:style => "height:350px"} | 15 | %div{:style => "height:350px"} |
| 16 | - = link_to '', wikivideo.path_signal, id: "player#{wikivideo.id}" | 16 | + = link_to '', "/" + format_signal_path(wikivideo), id: "player_#{format_signal_name(wikivideo)}" |
| 17 | .modal-footer | 17 | .modal-footer |
| 18 | %button.btn.btn-primary{"aria-hidden" => "true", "data-dismiss" => "modal"} OK | 18 | %button.btn.btn-primary{"aria-hidden" => "true", "data-dismiss" => "modal"} OK |
| 19 | %button.btn.btn-danger Denunciar Erro | 19 | %button.btn.btn-danger Denunciar Erro |
| 20 | \ No newline at end of file | 20 | \ No newline at end of file |
app/views/wikilibras/wikivideos/dicionario.html.haml
| @@ -13,7 +13,7 @@ | @@ -13,7 +13,7 @@ | ||
| 13 | - @wikivideos.each do |wikivideo| | 13 | - @wikivideos.each do |wikivideo| |
| 14 | %tbody | 14 | %tbody |
| 15 | %tr | 15 | %tr |
| 16 | - %td= link_to format_signal_name(wikivideo.signal_name), "#signal_#{wikivideo.id}", "data-toggle" => "modal" | 16 | + %td= link_to format_signal_name(wikivideo), "#signal_#{format_signal_name(wikivideo)}", "data-toggle" => "modal" |
| 17 | = render "wikilibras/wikivideos/sinal", wikivideo: wikivideo | 17 | = render "wikilibras/wikivideos/sinal", wikivideo: wikivideo |
| 18 | - else | 18 | - else |
| 19 | .alert | 19 | .alert |