diff --git a/app/assets/images/announcement-default.jpg b/app/assets/images/announcement-default-2.jpg similarity index 100% rename from app/assets/images/announcement-default.jpg rename to app/assets/images/announcement-default-2.jpg diff --git a/app/controllers/announcements_controller.rb b/app/controllers/announcements_controller.rb index fa6de5d..d44f615 100644 --- a/app/controllers/announcements_controller.rb +++ b/app/controllers/announcements_controller.rb @@ -1,5 +1,6 @@ class AnnouncementsController < ApplicationController include AnnouncementsHelper + DefaultImgSrc = "/assets/announcement-default.jpg\" onerror=\"this.src="/assets/announcement-default-2.jpg";this.onerror='';" def initialize super @app_title = 'announcement' @@ -126,7 +127,7 @@ class AnnouncementsController < ApplicationController "is_top" => (a.is_top? ? 1 : 0), "link_to_show" => link_to_show+"\" #{(link_to_show[0] == '/' rescue true) ? '' : 'target="_blank"'} title=\"#{title}", "target" => target, - "img_src" => image_url || "/assets/announcement-default.jpg", + "img_src" => image_url || DefaultImgSrc, "img_description" => desc, "more" => t("announcement.more"), "view_count" => a.view_count @@ -743,7 +744,7 @@ class AnnouncementsController < ApplicationController img_src = nil img_description = nil subtitle_ann = announcement.subtitle if announcement.display_subtitle? - img_src = (announcement.image.url || "/assets/announcement-default.jpg") if announcement.display_img? + img_src = (announcement.image.url || DefaultImgSrc) if announcement.display_img? img_description = announcement.image_description if (announcement.image_description.present?) && (announcement.display_img?) show_comment_flag = announcement.open_comment_for_user(OrbitHelper.current_user) bulletin_carousel_images = announcement.bulletin_carousel_images.map{|image| {"src"=>image.file.url,"description"=>image.description.to_s,"description_text"=>image.description_text }} @@ -851,7 +852,7 @@ class AnnouncementsController < ApplicationController img_description = nil img_description = announcement["image_description_translations"][I18n.locale] if announcement['display_img'] img_src = nil - img_src = (announcement['image']['original'] || "/assets/announcement-default.jpg") if announcement['display_img'] + img_src = (announcement['image']['original'] || DefaultImgSrc) if announcement['display_img'] subtitle_ann = announcement['subtitle_ann'] request = OrbitHelper.request if announcement["subtitle_translations"].present? @@ -979,7 +980,7 @@ class AnnouncementsController < ApplicationController "is_top" => (a.is_top? ? 1 : 0), "link_to_show" => link_to_show+"\" #{(link_to_show[0] == '/' rescue true) ? '' : 'target="_blank"'} title=\"#{title}", "target" => target, - "img_src" => a.image.thumb.url || "/assets/announcement-default.jpg", + "img_src" => a.image.thumb.url || DefaultImgSrc, "img_description" => desc, "more" => t("announcement.more"), "view_count" => a.view_count diff --git a/app/helpers/announcements_helper.rb b/app/helpers/announcements_helper.rb index 41d0fe4..8e126ed 100644 --- a/app/helpers/announcements_helper.rb +++ b/app/helpers/announcements_helper.rb @@ -63,7 +63,7 @@ module AnnouncementsHelper "author" => author, "link_to_show" => link_to_show+"\" #{(link_to_show[0] == '/' rescue true) ? '' : 'target="_blank"'} title=\"#{title}", "target" => target, - "img_src" => image_url || "/assets/announcement-default.jpg", + "img_src" => image_url || AnnouncementsController::DefaultImgSrc, "img_description" => desc } end @@ -114,7 +114,7 @@ module AnnouncementsHelper "source-site-link" => fa["source-site"], "link_to_show" => OrbitHelper.url_to_show(fa["params"]), "target" => "_self", - "img_src" => fa["image"]["thumb"] || "/assets/announcement-default.jpg", + "img_src" => fa["image"]["thumb"] || AnnouncementsController::DefaultImgSrc, "img_description" => fa["image_description_translations"][locale], "more" => t("announcement.more"), "view_count" => ""