From 432719d0ef37eee89bb8c7a85eb7fb46a14de9f1 Mon Sep 17 00:00:00 2001 From: Bohung Date: Wed, 5 Jan 2022 15:52:40 +0800 Subject: [PATCH] Add video_snapshot feature. --- app/controllers/ad_banners_controller.rb | 3 ++- app/models/ad_image.rb | 1 + app/views/admin/ad_banners/show.html.erb | 5 +++- app/views/admin/ad_images/_form.html.erb | 29 ++++++++++++++++++++- app/views/admin/ad_images/_jplayer.html.erb | 4 ++- config/locales/en.yml | 1 + config/locales/zh_tw.yml | 1 + config/routes.rb | 12 +++++++-- 8 files changed, 50 insertions(+), 6 deletions(-) diff --git a/app/controllers/ad_banners_controller.rb b/app/controllers/ad_banners_controller.rb index fd4417d..0d94e7d 100644 --- a/app/controllers/ad_banners_controller.rb +++ b/app/controllers/ad_banners_controller.rb @@ -101,6 +101,7 @@ class AdBannersController < ApplicationController klass = (i == 0 ? "active" : "") video_url = ad_b.video_file.url rescue nil video_webm_url = ad_b.video_file_webm.url rescue nil + @file_poster = ad_b.video_snapshot.url rescue nil title = (ad_b.title.blank? ? File.basename(video_file) : ad_b.title) image_html = "
- #{ render_to_string(partial: "admin/ad_images/jplayer",locals:{i: (subpart.id.to_s+i.to_s),file_name: title,file_url: video_url,file_webm_url: video_webm_url,:@autoplay_video=>(@autoplay_video == "1" && i == 0),:@apply_autoplay_script=>true,:@hide_video_tools=>@hide_video_tools,:@is_frontend=>true}, layout: false).to_str } + #{ render_to_string(partial: "admin/ad_images/jplayer",locals:{i: (subpart.id.to_s+i.to_s),file_name: title,file_url: video_url,file_webm_url: video_webm_url,:@autoplay_video=>(@autoplay_video == "1" && i == 0),:@apply_autoplay_script=>true,:@hide_video_tools=>@hide_video_tools,:@is_frontend=>true,:@file_poster=>@file_poster}, layout: false).to_str }
" has_jplayer = true elsif ad_b.exchange_item == "2" diff --git a/app/models/ad_image.rb b/app/models/ad_image.rb index 8f89051..d41e62f 100644 --- a/app/models/ad_image.rb +++ b/app/models/ad_image.rb @@ -5,6 +5,7 @@ class AdImage include Mongoid::Timestamps mount_uploader :file, BannerImageUploader + mount_uploader :video_snapshot, BannerImageUploader mount_uploader :video_file, BannerUploader mount_uploader :video_file_webm, BannerUploader diff --git a/app/views/admin/ad_banners/show.html.erb b/app/views/admin/ad_banners/show.html.erb index c85f974..a68a0f5 100644 --- a/app/views/admin/ad_banners/show.html.erb +++ b/app/views/admin/ad_banners/show.html.erb @@ -56,7 +56,10 @@ <% elsif image.exchange_item == "2" %> <% elsif image.exchange_item == "3" %> -