From f1b71aa9b724e61abf4a57d559e85884742ed00e Mon Sep 17 00:00:00 2001
From: Bohung <bohung@rulingcom.com>
Date: Sun, 11 Apr 2021 22:37:50 +0800
Subject: [PATCH] Fix bug.

---
 app/controllers/announcements_controller.rb | 1 -
 app/helpers/announcements_helper.rb         | 4 ++--
 app/views/announcements/show.html.erb       | 7 +++----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/controllers/announcements_controller.rb b/app/controllers/announcements_controller.rb
index 97b6c0d..a8d5b8f 100644
--- a/app/controllers/announcements_controller.rb
+++ b/app/controllers/announcements_controller.rb
@@ -1,6 +1,5 @@
 class AnnouncementsController < ApplicationController
   include AnnouncementsHelper
-  helper_method :complementaryColor,:lighten_color
   def comment
     @bulletin = Bulletin.where(:uid=>params[:uid]).first
     comment_val = params['comment']
diff --git a/app/helpers/announcements_helper.rb b/app/helpers/announcements_helper.rb
index 63f1a2f..160c9ac 100644
--- a/app/helpers/announcements_helper.rb
+++ b/app/helpers/announcements_helper.rb
@@ -1,5 +1,5 @@
 module AnnouncementsHelper
-  def complementaryColor(my_hex)
+  def self.complementaryColor(my_hex)
     if my_hex[0] == '#'
       my_hex = my_hex[1..-1]
     end
@@ -7,7 +7,7 @@ module AnnouncementsHelper
     comp = rgb.map{|a| (255 - a.to_i(16)).to_s(16).rjust(2,'0')}
     '#'+comp.join
   end
-  def lighten_color(my_hex,percent)
+  def self.lighten_color(my_hex,percent)
     if my_hex[0] == '#'
       my_hex = my_hex[1..-1]
     end
diff --git a/app/views/announcements/show.html.erb b/app/views/announcements/show.html.erb
index 3c58a90..8627995 100644
--- a/app/views/announcements/show.html.erb
+++ b/app/views/announcements/show.html.erb
@@ -1,5 +1,4 @@
 <%
-  	require 'announcements_helper'
   	params = OrbitHelper.params
     page = Page.where(url:params['url']).first
     @show_back_and_next_flag = 0
@@ -78,9 +77,9 @@
    hover_color = site.orbit_bar_background_hover_color rescue nil
    hover_color = '#0095CF' if hover_color.blank?
    bg_color = site.orbit_bar_background_color rescue nil 
-   bg_color = bg_color.blank? ? '#3a3b3c' : lighten_color(bg_color,-40)
-   color1 = lighten_color(bg_color,-40)
-   color2 = lighten_color(complementaryColor(bg_color),40)
+   bg_color = bg_color.blank? ? '#3a3b3c' : AnnouncementsHelper.lighten_color(bg_color,-40)
+   color1 = AnnouncementsHelper.lighten_color(bg_color,-40)
+   color2 = AnnouncementsHelper.lighten_color(AnnouncementsHelper.complementaryColor(bg_color),40)
 %>
 <style type="text/css">
   div[contentEditable=true]:empty:before{