added new field
This commit is contained in:
parent
d3f6ef1d7e
commit
f0d783192f
|
|
@ -34,6 +34,7 @@ class VideoImage
|
||||||
field :update_user_id
|
field :update_user_id
|
||||||
field :view_count, type: Integer, default: 0
|
field :view_count, type: Integer, default: 0
|
||||||
field :scale, type: Float
|
field :scale, type: Float
|
||||||
|
field :details, type: String, localize: true
|
||||||
# LINK_OPEN_TYPES = ["local", "new_window"]
|
# LINK_OPEN_TYPES = ["local", "new_window"]
|
||||||
|
|
||||||
# before_save :add_http
|
# before_save :add_http
|
||||||
|
|
@ -45,7 +46,7 @@ class VideoImage
|
||||||
scope :can_display_and_sorted, ->{can_display.sorted}
|
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 :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 :sorted, ->{order({is_top: :desc,postdate: :desc,id: :desc})}
|
||||||
|
|
||||||
scope :is_expired, ->{self.and(VideoImage.unscoped.or({:deadline.lte=>Time.now}).selector)}
|
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)}
|
scope :not_expired, ->{self.and(VideoImage.unscoped.or({:deadline.gte=>Time.now},{:deadline=>nil}).selector)}
|
||||||
before_save do
|
before_save do
|
||||||
|
|
@ -75,7 +76,7 @@ class VideoImage
|
||||||
uri = URI.parse(youtube_img_url)
|
uri = URI.parse(youtube_img_url)
|
||||||
req = Net::HTTP::Get.new(uri.path)
|
req = Net::HTTP::Get.new(uri.path)
|
||||||
res = Net::HTTP.start( uri.host, uri.port,
|
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|
|
:verify_mode => OpenSSL::SSL::VERIFY_NONE) do |https|
|
||||||
https.request(req)
|
https.request(req)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -283,6 +283,17 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<!-- Details -->
|
||||||
|
<div class="control-group input-content">
|
||||||
|
<label class="control-label muted"><%= t("video_pro.details") %> (<%= t(locale.to_s) %>)</label>
|
||||||
|
<div class="controls">
|
||||||
|
<div class="textarea">
|
||||||
|
<%= 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 %>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<!-- Keyword -->
|
<!-- Keyword -->
|
||||||
<div class="control-group input-content">
|
<div class="control-group input-content">
|
||||||
<label class="control-label muted"><%= t("video_pro.keyword") %> (<%= t(locale.to_s) %>)</label>
|
<label class="control-label muted"><%= t("video_pro.keyword") %> (<%= t(locale.to_s) %>)</label>
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
video_image = data["video_image"]
|
video_image = data["video_image"]
|
||||||
video_title = video_image.title.to_s
|
video_title = video_image.title.to_s
|
||||||
video_desc = video_image.desc.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_post_agency = video_image.post_agency.to_s
|
||||||
video_postdate = video_image.postdate.to_s
|
video_postdate = video_image.postdate.to_s
|
||||||
if video_image.is_youtube
|
if video_image.is_youtube
|
||||||
|
|
@ -46,6 +47,10 @@
|
||||||
<% end %>
|
<% end %>
|
||||||
<div class="video_group_time"><%= video_post_agency %> | <%= video_postdate %></div>
|
<div class="video_group_time"><%= video_post_agency %> | <%= video_postdate %></div>
|
||||||
<div class="movie_desc"><%= video_desc %></div>
|
<div class="movie_desc"><%= video_desc %></div>
|
||||||
|
<% if !video_details.empty? %>
|
||||||
|
<label class="movie_details_label"><%= t("video_pro.details") %></label>
|
||||||
|
<div class="movie_details"><%= video_details %></div>
|
||||||
|
<% end %>
|
||||||
<div class="view_info">
|
<div class="view_info">
|
||||||
<span><img src="<%= hd_icon_url %>" alt="HD"></span>
|
<span><img src="<%= hd_icon_url %>" alt="HD"></span>
|
||||||
<span><img src="<%= view_icon_url %>" alt="<%= view_count_trans %>">x <%= view_count %></span>
|
<span><img src="<%= view_icon_url %>" alt="<%= view_count_trans %>">x <%= view_count %></span>
|
||||||
|
|
|
||||||
|
|
@ -69,4 +69,5 @@ en:
|
||||||
type: Image or Video
|
type: Image or Video
|
||||||
choose_type: Please Select One Type First
|
choose_type: Please Select One Type First
|
||||||
select: Please Select One
|
select: Please Select One
|
||||||
|
details: Details
|
||||||
video: Video
|
video: Video
|
||||||
|
|
@ -66,4 +66,5 @@ zh_tw:
|
||||||
type: 圖片 或 影片
|
type: 圖片 或 影片
|
||||||
choose_type: 請先選擇類型
|
choose_type: 請先選擇類型
|
||||||
select: 請選擇
|
select: 請選擇
|
||||||
|
details: 詳細內容
|
||||||
video: 影片
|
video: 影片
|
||||||
Loading…
Reference in New Issue