diff --git a/app/controllers/announcements_controller.rb b/app/controllers/announcements_controller.rb index c23e2b3..c8dfb34 100644 --- a/app/controllers/announcements_controller.rb +++ b/app/controllers/announcements_controller.rb @@ -590,7 +590,7 @@ class AnnouncementsController < ApplicationController "image" => announcement.image.url, "img_src" => img_src, "img_description" => img_description, - "hide_class" => announcement.display_img? ? '' : ' hide', + "hide_class" => announcement.display_img? ? announcement.image_display_class : ' hide', "alt_title" => desc, "resume_btn_title" => resume_btn_title, "pause_btn_title" => pause_btn_title, diff --git a/app/models/bulletin.rb b/app/models/bulletin.rb index 3551b60..a669e03 100644 --- a/app/models/bulletin.rb +++ b/app/models/bulletin.rb @@ -26,6 +26,7 @@ class Bulletin before_destroy do AnnsCache.all.destroy end + 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 field :calendar_start_date, :type => DateTime field :calendar_end_date, :type => DateTime diff --git a/app/views/admin/announcements/_form.html.erb b/app/views/admin/announcements/_form.html.erb index 3dbb71f..6d8954c 100644 --- a/app/views/admin/announcements/_form.html.erb +++ b/app/views/admin/announcements/_form.html.erb @@ -114,6 +114,20 @@ <%= f.check_box :display_img %> + + + <% image_display_class_relation = {"full_width"=>"full-size-img","up_left_corner"=>"pull-left","up_right_corner"=>"pull-right"} %> +