diff --git a/app/controllers/video_pros_controller.rb b/app/controllers/video_pros_controller.rb index 704adc3..91ae09c 100644 --- a/app/controllers/video_pros_controller.rb +++ b/app/controllers/video_pros_controller.rb @@ -231,6 +231,8 @@ class VideoProsController < ApplicationController video_post_agency = video_image.post_agency(@video_pro_setting) video_postdate = video_image.postdate.to_s video_category = video_image.category_title + video_tags = video_image.tags + video_tag = (video_tags.count > 0 ? video_tags.first.name : video_category) statuses = video_image.statuses_with_classname video_desc = video_image.desc video_desc_escape = video_desc.gsub('"',""") rescue "" @@ -253,6 +255,7 @@ class VideoProsController < ApplicationController "api_url" => api_url, "video_show_url" => show_url + slug, "video_category" => video_category, + "video_tag" => video_tag, "statuses" => statuses, "video_post_agency" => video_post_agency, "video_postdate" => video_postdate, diff --git a/app/views/video_pros/show.html.erb b/app/views/video_pros/show.html.erb index d44f4c3..8daf263 100644 --- a/app/views/video_pros/show.html.erb +++ b/app/views/video_pros/show.html.erb @@ -21,6 +21,9 @@ snapshot_url = video_image.get_snapshot_url @is_frontend = true video_scale = (video_image.scale ? video_image.scale : 56.25) + video_category = video_image.category_title + video_tags = video_image.tags + video_tag = (video_tags.count > 0 ? video_tags.first.name : video_category) %>

<%= video_title %>

@@ -39,6 +42,7 @@ <% end %>
<%= video_post_agency %> | <%= video_postdate %>
+
<%= video_tag %>
<%= video_desc %>
HD @@ -65,7 +69,7 @@ .video_group_time{ color: #4487cb; } - .video_category{ + .video_tag{ color: #e4374a; } .video_title h4{ diff --git a/modules/video_pro/_video_pro_widget1.html.erb b/modules/video_pro/_video_pro_widget1.html.erb index 0d81bb6..9892e67 100644 --- a/modules/video_pro/_video_pro_widget1.html.erb +++ b/modules/video_pro/_video_pro_widget1.html.erb @@ -5,7 +5,7 @@
{{video_post_agency}} | {{video_postdate}}
-
{{video_category}}
+
{{video_tag}}

{{video_title}}

{{video_desc}}
@@ -25,7 +25,7 @@ .video_group_time{ color: #4487cb; } - .video_category{ + .video_tag{ color: #e4374a; } .video_title h4{ diff --git a/modules/video_pro/_video_pro_widget_jqcloud1.html.erb b/modules/video_pro/_video_pro_widget_jqcloud1.html.erb index 10087b8..e2c5add 100644 --- a/modules/video_pro/_video_pro_widget_jqcloud1.html.erb +++ b/modules/video_pro/_video_pro_widget_jqcloud1.html.erb @@ -1,6 +1,6 @@
<%= javascript_include_tag 'video_pro/wordcloud2.js' %> -
+