diff --git a/app/controllers/announcements_controller.rb b/app/controllers/announcements_controller.rb index d44f615..92acbdb 100644 --- a/app/controllers/announcements_controller.rb +++ b/app/controllers/announcements_controller.rb @@ -417,32 +417,35 @@ class AnnouncementsController < ApplicationController if (@read_more_option != 0 rescue false) extra_html += " @@ -491,7 +494,7 @@ class AnnouncementsController < ApplicationController def get_tabs_option subpart = OrbitHelper.get_current_widget tab_options = ["not_enable_tabs","enable_tabs_with_categories_include_all","enable_tabs_with_categories"] - read_more_options = ['default','upper_left','lower_left','upper_right','lower_right'] + read_more_options = ['default','upper_left','lower_left','upper_right','lower_right', 'display_none'] all_setting_options = ['the_same_as_data_count','display_all_in_other_tabs'] @tab_option = 0 @read_more_option = 0 diff --git a/config/locales/en.yml b/config/locales/en.yml index ccd2136..5890262 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -39,10 +39,11 @@ en: display_all_in_other_tabs: Display all contents in other tabs read_more_position_options: '"read more" button position' default: Default - upper_left: Upper left - lower_left: Lower left - upper_right: Upper right - lower_right: Lower right + upper_left: Upper Left + lower_left: Lower Left + upper_right: Upper Right + lower_right: Lower Right + display_none: Display None tabs_options: Tabs options not_enable_tabs: Not enable tabs enable_tabs_with_categories_include_all: Enable tabs with categories(include all) diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 9c7d21c..d472687 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -44,6 +44,7 @@ zh_tw: lower_left: 左下 upper_right: 右上 lower_right: 右下 + display_none: 隱藏 tabs_options: 頁籤選項 not_enable_tabs: 無頁籤 enable_tabs_with_categories_include_all: 開啟頁籤(依類別,並包含全部所選類別之頁籤) diff --git a/lib/announcement/engine.rb b/lib/announcement/engine.rb index f425a4c..dac0e67 100644 --- a/lib/announcement/engine.rb +++ b/lib/announcement/engine.rb @@ -24,7 +24,7 @@ module Announcement value2_item2 = {} key1_options = ['small_size','medium_size','orignal_size'] key2_options = ['not_enable_tabs','enable_tabs_with_categories_include_all','enable_tabs_with_categories'] - key3_options = ['default','upper_left','lower_left','upper_right','lower_right'] + key3_options = ['default','upper_left','lower_left','upper_right','lower_right', 'display_none'] key4_options = ['the_same_as_data_count','display_all_in_other_tabs'] key1_options.each_with_index do |k,i| key1_attr[i] = {}