From a5a25c56849123d4f6c0ea984c5e27b8e0d9f569 Mon Sep 17 00:00:00 2001
From: Bohung <bohung@rulingcom.com>
Date: Fri, 21 May 2021 15:48:40 +0800
Subject: [PATCH] Add cover image setting.

---
 app/controllers/announcements_controller.rb  |  2 +-
 app/models/bulletin.rb                       |  1 +
 app/views/admin/announcements/_form.html.erb | 15 +++++++++++++++
 config/locales/en.yml                        |  4 ++++
 config/locales/zh_tw.yml                     |  4 ++++
 modules/announcement/show.html.erb           | 10 +++++++++-
 6 files changed, 34 insertions(+), 2 deletions(-)

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 %>
         </div>
       </div>
+
+      <!-- Image display setting -->
+      <% image_display_class_relation = {"full_width"=>"full-size-img","up_left_corner"=>"pull-left","up_right_corner"=>"pull-right"} %>
+      <div class="control-group <%='hide' if !f.object.display_img %>" id="image_display_setting">
+        <%= f.label :image_display_class, t("announcement.cover_image_display_setting"), :class => "control-label muted" %>
+        <div class="controls">
+          <% image_display_class_relation.each.with_index do |(key,value),i| %>
+            <label>
+              <%= radio_button_tag "#{f.object_name}[image_display_class]", value , (f.object.image_display_class == value) %>
+              <%= t("announcement.#{key}") %>
+            </label>
+          <% end %>
+        </div>
+      </div>
     </div>
 
     <!-- Calendar Module -->
@@ -518,6 +532,7 @@
 	}
 </style>
 <script>
+  $("#bulletin_display_img").click(function(){$("#image_display_setting").toggleClass("hide")})
   function Appendzero(obj)
   {
     if(obj<10) return "0" +""+ obj;
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9886d19..e787e98 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3,6 +3,10 @@ en:
     feed: Feed
     import: Import
   announcement:
+    cover_image_display_setting: Cover Image display setting
+    full_width: Full width
+    up_left_corner: Up-left corner
+    up_right_corner: Up-right corner
     all_tabs_setting: '"All" tab setting'
     the_same_as_data_count: The same as data count
     display_all_in_other_tabs: Display all contents in other tabs
diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index d73cb6a..a6b89e9 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -3,6 +3,10 @@ zh_tw:
     feed: 供給
     import: 匯入
   announcement:
+    cover_image_display_setting: 封面圖片顯示設定
+    full_width: 滿版呈現
+    up_left_corner: 左上角
+    up_right_corner: 右上角
     all_tabs_setting: '"全部"頁籤設定'
     the_same_as_data_count: 與Data count相同
     display_all_in_other_tabs: 顯示在其他頁籤的全部內容
diff --git a/modules/announcement/show.html.erb b/modules/announcement/show.html.erb
index 981db72..95fcd4a 100644
--- a/modules/announcement/show.html.erb
+++ b/modules/announcement/show.html.erb
@@ -1,3 +1,11 @@
+<style type="text/css">
+  .full-size-img img {
+    width: 100%;
+  }
+  .full-size-img {
+      width: 100%;
+  }
+</style>
 <article class="s-annc show-announcement">
   <h1 class="s-annc__show-title">{{title}}</h1>
   
@@ -19,7 +27,7 @@
   </ul>
 
   <section class="s-annc__post-wrap">
-    <div class="s-annc__sub-img pull-right {{hide_class}}">
+    <div class="s-annc__sub-img {{hide_class}}">
     <img src="{{img_src}}" alt="{{img_description}}"></img>
     <span class="s-annc__img_description">{{img_description}}</span>
     </div>