diff --git a/app/assets/images/event_news/AAAAAA.png b/app/assets/images/event_news/AAAAAA.png new file mode 100644 index 0000000..772a39b Binary files /dev/null and b/app/assets/images/event_news/AAAAAA.png differ diff --git a/app/controllers/event_news_mods_controller.rb b/app/controllers/event_news_mods_controller.rb index 3e0481b..3e14ca7 100644 --- a/app/controllers/event_news_mods_controller.rb +++ b/app/controllers/event_news_mods_controller.rb @@ -672,6 +672,20 @@ class EventNewsModsController < ApplicationController pause_btn_title = (I18n.locale.to_s =="zh_tw") ? "暫停播放" : "pause" prev_btn_title = (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" next_btn_title = (I18n.locale.to_s =="zh_tw") ? "下一張" : "next" + carousel_data = { + "event_carousel_images" => event_carousel_images, + "resume_btn_title" => resume_btn_title, + "pause_btn_title" => pause_btn_title, + "prev_btn_title" => prev_btn_title, + "next_btn_title" => next_btn_title, + "carousel_display_style" => (event_carousel_images.count == 0 ? 'display: none' : "width: #{event_news.carousel_image_width};margin: auto;"), + "carousel_count" => event_carousel_images.count} + carousel_html = "" + if carousel_data["carousel_count"] != 0 + carousel_image_type = event_news.carousel_image_type + ac = ActionController::Base.new() + carousel_html = ac.render_to_string(:partial=>'event_news_mods/carousels',:locals=>{:data=>carousel_data,:carousel_image_type=>carousel_image_type}) + end begin event_time = event_news.event_time_formated_for_frontend rescue => e @@ -692,7 +706,6 @@ class EventNewsModsController < ApplicationController "event_news_files" => files, "profiles" => profiles, "event_news_links" => links, - "event_carousel_images" => event_carousel_images, "data" => { "title-head" => EventNewsCustomTitle.get_trans('title'), "speaker-head" => EventNewsCustomTitle.get_trans('speaker'), @@ -724,7 +737,8 @@ class EventNewsModsController < ApplicationController "carousel_display_style" => (event_carousel_images.count == 0 ? 'display: none' : "width: #{event_news.carousel_image_width};margin: auto;"), "carousel_count" => event_carousel_images.count, "place_text" => (event_news.place.blank? ? "" : "#{EventNewsCustomTitle.get_trans("place")}: #{event_news.place}"), - "place-css" => (event_news.place.blank? ? "display: none;" : "") + "place-css" => (event_news.place.blank? ? "display: none;" : ""), + "carousel_html" => carousel_html, }, "impressionist" => (event_news.is_preview ? nil : event_news), "url_to_edit"=>url_to_edit @@ -796,13 +810,26 @@ class EventNewsModsController < ApplicationController pause_btn_title = (I18n.locale.to_s =="zh_tw") ? "暫停播放" : "pause" prev_btn_title = (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" next_btn_title = (I18n.locale.to_s =="zh_tw") ? "下一張" : "next" + carousel_data = { + "event_carousel_images" => event_carousel_images, + "resume_btn_title" => resume_btn_title, + "pause_btn_title" => pause_btn_title, + "prev_btn_title" => prev_btn_title, + "next_btn_title" => next_btn_title, + "carousel_display_style" => (event_carousel_images.count == 0 ? 'display: none' : "width: #{EventNewsSetting.last.carousel_image_width};margin: auto;"), + "carousel_count" => event_carousel_images.count} + carousel_html = "" + if carousel_data["carousel_count"] != 0 + carousel_image_type = event_news["carousel_image_type"].to_i + ac = ActionController::Base.new() + carousel_html = ac.render_to_string(:partial=>'event_news_mods/carousels',:locals=>{:data=>carousel_data,:carousel_image_type=>carousel_image_type}) + end speaker = event_news["speaker_translations"][locale] host = event_news["host_translations"][locale] { "tags" => tags, "event_news_files" => files, "event_news_links" => links, - "event_carousel_images" => event_carousel_images, "data" => { "title" => event_news["title_translations"][locale], "subtitle_ann" => subtitle_ann, @@ -834,7 +861,8 @@ class EventNewsModsController < ApplicationController "carousel_display_style" => (event_carousel_images.count == 0 ? 'display: none' : "width: #{EventNewsSetting.last.carousel_image_width};margin: auto;"), "carousel_count" => event_carousel_images.count, "place_text" => (event_news["place"].blank? ? "" : "#{I18n.t("event_news.place")}: #{event_news["place"]}"), - "place-css" => (event_news["place"].blank? ? "display: none;" : "") + "place-css" => (event_news["place"].blank? ? "display: none;" : ""), + "carousel_html" => carousel_html }, "impressionist" => nil, "url_to_edit" => url_to_edit diff --git a/app/helpers/event_news_helper.rb b/app/helpers/event_news_helper.rb index 094e3c5..ce76249 100644 --- a/app/helpers/event_news_helper.rb +++ b/app/helpers/event_news_helper.rb @@ -500,58 +500,6 @@ module EventNewsHelper end layout_types end - def render_ad_banner(event_carousel_images,data) - ("
-
-
" + - event_carousel_images.collect do |e| - "
- \"#{e['description_text']}\" -
-

#{e['description']}

-
-
-
" - end.join+ - "
- - -
-
-

1/#{data['carousel_count']}

- - -
-
").html_safe - end def complementaryColor(my_hex) if my_hex[0] == '#' diff --git a/app/models/event_news.rb b/app/models/event_news.rb index 9ec740d..edcc530 100644 --- a/app/models/event_news.rb +++ b/app/models/event_news.rb @@ -52,6 +52,7 @@ class EventNews field :hour_clock_24, type: Boolean, default: true field :is_edit, type: Boolean, default: false #use to check whether the preview record changed field :copy_id + field :custom_carousel_image_type, :type => Integer, :default => 0 # 0: default, 1: carousel, 2: album field :custom_carousel_image_width, type: String, default: "" field :image_display_class, type: String, default: "full-size-img" #3 choices: full-size-img , pull-left , pull-right field :add_to_calendar,type: Boolean,default: false @@ -399,8 +400,11 @@ class EventNews def hidden_text I18n.t("announcement.status.hidden") end + def carousel_image_type + (self.custom_carousel_image_type == 0 ? EventNewsSetting.last.carousel_image_type : self.custom_carousel_image_type - 1) rescue 0 + end def carousel_image_width - (self.custom_carousel_image_width.blank? ? AnnouncementSetting.last.carousel_image_width : self.custom_carousel_image_width) + (self.custom_carousel_image_width.blank? ? EventNewsSetting.last.carousel_image_width : self.custom_carousel_image_width) end def self.agenda_events(agenda_start, agenda_end,read_more_url) diff --git a/app/models/event_news_setting.rb b/app/models/event_news_setting.rb index 183aae0..cf4e854 100644 --- a/app/models/event_news_setting.rb +++ b/app/models/event_news_setting.rb @@ -1,6 +1,7 @@ class EventNewsSetting include Mongoid::Document include Mongoid::Timestamps + field :carousel_image_type, :type => Integer, :default => 0 # 0: carousel, 1: album field :carousel_image_width, type: String, :default => "75%" field :top_limit, type: Integer, :default => 0 field :pro_enabled, type: Boolean, :default => false diff --git a/app/views/admin/event_news/_form.html.erb b/app/views/admin/event_news/_form.html.erb index 9dc869f..dc9af17 100644 --- a/app/views/admin/event_news/_form.html.erb +++ b/app/views/admin/event_news/_form.html.erb @@ -287,7 +287,7 @@ <% if @event_news.image.file %> <%= image_tag @event_news.image %> <% else %> - + <% end %>
@@ -320,6 +320,13 @@