diff --git a/app/models/video_image.rb b/app/models/video_image.rb
index 8389b24..e058fe6 100644
--- a/app/models/video_image.rb
+++ b/app/models/video_image.rb
@@ -34,6 +34,7 @@ class VideoImage
field :update_user_id
field :view_count, type: Integer, default: 0
field :scale, type: Float
+ field :details, type: String, localize: true
# LINK_OPEN_TYPES = ["local", "new_window"]
# before_save :add_http
@@ -45,7 +46,7 @@ class VideoImage
scope :can_display_and_sorted, ->{can_display.sorted}
scope :valid_time_range, ->{any_of({:postdate.lte=>Time.now, :deadline.gte=>Time.now},{:postdate.lte=>Time.now, :deadline=>nil},{:postdate=>nil,:deadline.gte=>Time.now},{:postdate=>nil,:deadline=>nil})}
scope :sorted, ->{order({is_top: :desc,postdate: :desc,id: :desc})}
-
+
scope :is_expired, ->{self.and(VideoImage.unscoped.or({:deadline.lte=>Time.now}).selector)}
scope :not_expired, ->{self.and(VideoImage.unscoped.or({:deadline.gte=>Time.now},{:deadline=>nil}).selector)}
before_save do
@@ -75,7 +76,7 @@ class VideoImage
uri = URI.parse(youtube_img_url)
req = Net::HTTP::Get.new(uri.path)
res = Net::HTTP.start( uri.host, uri.port,
- :use_ssl => (uri.scheme == 'https'),
+ :use_ssl => (uri.scheme == 'https'),
:verify_mode => OpenSSL::SSL::VERIFY_NONE) do |https|
https.request(req)
end
diff --git a/app/views/admin/video_pros/_form.html.erb b/app/views/admin/video_pros/_form.html.erb
index fd3d5e8..5c3aa41 100644
--- a/app/views/admin/video_pros/_form.html.erb
+++ b/app/views/admin/video_pros/_form.html.erb
@@ -283,6 +283,17 @@
+
+
+
<%= t("video_pro.details") %> (<%= t(locale.to_s) %>)
+
+
+ <%= f.fields_for :details_translations do |f| %>
+ <%= f.cktext_area locale, rows: 5, class: "input-block-level", :value => (@video_image.details_translations[locale] rescue nil) %>
+ <% end %>
+
+
+
<%= t("video_pro.keyword") %> (<%= t(locale.to_s) %>)
diff --git a/app/views/video_pros/show.html.erb b/app/views/video_pros/show.html.erb
index 32fbec6..eefd1ca 100644
--- a/app/views/video_pros/show.html.erb
+++ b/app/views/video_pros/show.html.erb
@@ -3,6 +3,7 @@
video_image = data["video_image"]
video_title = video_image.title.to_s
video_desc = video_image.desc.to_s
+ video_details = video_image.details.to_s
video_post_agency = video_image.post_agency.to_s
video_postdate = video_image.postdate.to_s
if video_image.is_youtube
@@ -46,6 +47,10 @@
<% end %>
<%= video_post_agency %> | <%= video_postdate %>
<%= video_desc %>
+ <% if !video_details.empty? %>
+
<%= t("video_pro.details") %>
+
<%= video_details %>
+ <% end %>
x <%= view_count %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2d3c949..adacef4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -69,4 +69,5 @@ en:
type: Image or Video
choose_type: Please Select One Type First
select: Please Select One
+ details: Details
video: Video
\ No newline at end of file
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 59fecde..e98b30b 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -66,4 +66,5 @@ zh_tw:
type: 圖片 或 影片
choose_type: 請先選擇類型
select: 請選擇
+ details: 詳細內容
video: 影片
\ No newline at end of file