diff --git a/app/controllers/event_news_mods_controller.rb b/app/controllers/event_news_mods_controller.rb index 24646e9..7e056c7 100644 --- a/app/controllers/event_news_mods_controller.rb +++ b/app/controllers/event_news_mods_controller.rb @@ -42,6 +42,8 @@ class EventNewsModsController < ApplicationController "statuses" => statuses, "category" => (a.category.title rescue ""), "postdate" => event_time, + "event_start_date" => a.event_date_frontend, + "event_end_date" => a.event_end_date_frontend, "event-time-formated" => event_time_formated, "event-time-css" => (event_time_formated.blank? ? "display: none;" : ""), "author" => author, @@ -69,6 +71,7 @@ class EventNewsModsController < ApplicationController "event_news" => event_news, "extras" => { "widget-title" =>t('event_news.event_news'), + "category-head" => EventNewsCustomTitle.get_trans('category'), "title-head" => EventNewsCustomTitle.get_trans('title'), "speaker-head" => EventNewsCustomTitle.get_trans('speaker'), "place-head" => EventNewsCustomTitle.get_trans('place'), @@ -76,10 +79,11 @@ class EventNewsModsController < ApplicationController "notes-head" => EventNewsCustomTitle.get_trans('notes'), "event_date-head" => EventNewsCustomTitle.get_trans('event_date'), "date-head" => EventNewsCustomTitle.get_trans('event_date'), + "event_start_date-head" => EventNewsCustomTitle.get_trans('start_date'), + "event_end_date-head" => EventNewsCustomTitle.get_trans('end_date'), "status-head" => t('event_news.table.status'), "author-head" => t('event_news.table.author'), "subtitle-head" => t('event_news.table.sub_title'), - "category-head" => t('event_news.table.category'), "link-head" => t('event_news.table.link'), "file-head" => t('event_news.table.file'), "view-count-head" => t('event_news.table.view_count'), @@ -376,6 +380,7 @@ class EventNewsModsController < ApplicationController "more_url"=>OrbitHelper.widget_more_url, "main_picture" => mp, "main_picture_description" => mpd, + "category-head" => EventNewsCustomTitle.get_trans('category'), "title-head" => EventNewsCustomTitle.get_trans('title'), "speaker-head" => EventNewsCustomTitle.get_trans('speaker'), "place-head" => EventNewsCustomTitle.get_trans('place'), @@ -383,10 +388,11 @@ class EventNewsModsController < ApplicationController "notes-head" => EventNewsCustomTitle.get_trans('notes'), "event_date-head" => EventNewsCustomTitle.get_trans('event_date'), "date-head" => EventNewsCustomTitle.get_trans('event_date'), + "event_start_date-head" => EventNewsCustomTitle.get_trans('start_date'), + "event_end_date-head" => EventNewsCustomTitle.get_trans('end_date'), "author-head" => t('event_news.table.author'), "status-head" => t('event_news.table.status'), "subtitle-head" => t('event_news.table.sub_title'), - "category-head" => t('event_news.table.category'), "link-head" => t('event_news.table.link'), "file-head" => t('event_news.table.file'), "read_more" => read_more_url, @@ -836,6 +842,8 @@ class EventNewsModsController < ApplicationController "statuses" => statuses, "category" => (a.category.title rescue ""), "postdate" => event_time, + "event_start_date" => a.event_date_frontend, + "event_end_date" => a.event_end_date_frontend, "author" => author, "is_top" => (a.is_top? ? 1 : 0), "link_to_show" => link_to_show+"\" title=\"#{title}\"", @@ -861,6 +869,7 @@ class EventNewsModsController < ApplicationController "event_news" => event_news, "extras" => { "widget-title" =>t('event_news.event_news'), + "category-head" => EventNewsCustomTitle.get_trans('category'), "title-head" => EventNewsCustomTitle.get_trans('title'), "speaker-head" => EventNewsCustomTitle.get_trans('speaker'), "place-head" => EventNewsCustomTitle.get_trans('place'), @@ -868,10 +877,11 @@ class EventNewsModsController < ApplicationController "notes-head" => EventNewsCustomTitle.get_trans('notes'), "event_date-head" => EventNewsCustomTitle.get_trans('event_date'), "date-head" => EventNewsCustomTitle.get_trans('event_date'), + "event_start_date-head" => EventNewsCustomTitle.get_trans('start_date'), + "event_end_date-head" => EventNewsCustomTitle.get_trans('end_date'), "status-head" => t('event_news.table.status'), "author-head" => t('event_news.table.author'), "subtitle-head" => t('event_news.table.sub_title'), - "category-head" => t('event_news.table.category'), "link-head" => t('event_news.table.link'), "file-head" => t('event_news.table.file'), "view-count-head" => t('event_news.table.view_count'), diff --git a/app/helpers/event_news_helper.rb b/app/helpers/event_news_helper.rb index f33f12e..a0dd716 100644 --- a/app/helpers/event_news_helper.rb +++ b/app/helpers/event_news_helper.rb @@ -65,6 +65,8 @@ module EventNewsHelper "category" => (a.category.title rescue ""), "tag_ids" => (set_tag_ids.nil? ? (a.tag_ids.map{|id| id.to_s}.to_s.gsub('"',"'") rescue '[]') : set_tag_ids), "postdate" => event_time_formated, + "event_start_date" => a.event_date_frontend, + "event_end_date" => a.event_end_date_frontend, "event_date" => event_time_formated, "author" => author, "link_to_show" => link_to_show, diff --git a/app/models/event_news.rb b/app/models/event_news.rb index 49e12cd..9e50f4c 100644 --- a/app/models/event_news.rb +++ b/app/models/event_news.rb @@ -161,6 +161,24 @@ class EventNews "#{st} ~ #{ed}" end end + def event_date_frontend + s = self.event_date.in_time_zone(Time.zone.utc_offset / 3600) rescue nil + if s.blank? + "" + else + parse_format = self.date_parse_format + custom_strftime(s, self.date_parse_format) + end + end + def event_end_date_frontend + e = self.event_end_date.in_time_zone(Time.zone.utc_offset / 3600) rescue nil + if e.blank? + "" + else + parse_format = self.date_parse_format + custom_strftime(e, self.date_parse_format) + end + end def event_time_formated s = self.event_date.in_time_zone(Time.zone.utc_offset / 3600) rescue nil e = self.event_end_date.in_time_zone(Time.zone.utc_offset / 3600) rescue nil diff --git a/app/models/event_news_custom_title.rb b/app/models/event_news_custom_title.rb index ba32926..1ea03b4 100644 --- a/app/models/event_news_custom_title.rb +++ b/app/models/event_news_custom_title.rb @@ -3,7 +3,7 @@ class EventNewsCustomTitle include Mongoid::Timestamps field :key field :title, type: String, localize: true - KEYS = ['title','speaker','host','event_date','place','notes'] + KEYS = ['category', 'title','speaker','host','event_date','place','notes'] def self.get_map KEYS.map do |k| s = self.where(key: k).first || self.create(key: k,title_translations: I18n.available_locales.map{|l| [l,I18n.with_locale(l){I18n.t("event_news.#{k}")}]}.to_h) diff --git a/config/locales/en.yml b/config/locales/en.yml index c90a692..d654b10 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -4,6 +4,7 @@ en: event_news_mod: event_news_mod: Event News event_news: + category: Category event_date_setting: "Event date setting" event_date_use_default_setting: "Event date use default setting" including_day_of_the_week: "Including day of the week" @@ -37,6 +38,8 @@ en: notes: Notes speaker: Speaker host: Host + unit: Unit + employer: Employer event_date: Event Date event_end_date: Event End Date start_date: Start date diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index 74a3fe1..0faf9b3 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -4,6 +4,7 @@ zh_tw: event_news_mod: event_news_mod: 活動公告 event_news: + category: 類別 event_date_setting: "事件日期設定" event_date_use_default_setting: "使用預設的事件日期設定" including_day_of_the_week: "包含星期幾" @@ -37,10 +38,12 @@ zh_tw: notes: 備註 speaker: 演講者 host: 主持人 + unit: 公告單位 + employer: 徵求單位 event_date: 事件日期 event_end_date: 事件結束日期 start_date: 公告日期 - end_date: 下架日期 + end_date: 截止日期 add_to_calendar: 加入行事曆 blank_to_set: (留白則使用公告設定) stime: 開始時間 diff --git a/modules/event_news_mod/_event_news_widget19.html.erb b/modules/event_news_mod/_event_news_widget19.html.erb new file mode 100644 index 0000000..89522bd --- /dev/null +++ b/modules/event_news_mod/_event_news_widget19.html.erb @@ -0,0 +1,33 @@ +
+

+ {{widget-title}} +

+ + + + + + + + + + + + + + + + + + + + + +
{{category-head}}{{speaker-head}}{{event_start_date-head}}{{title-head}}{{event_end_date-head}}{{view-count-head}}
{{category}}{{speaker}}{{event_start_date}} + + {{status}} + + {{title}} + {{event_end_date}}{{view_count}}
+
+{{pagination_goes_here}} diff --git a/modules/event_news_mod/event_news_index19.html.erb b/modules/event_news_mod/event_news_index19.html.erb new file mode 100644 index 0000000..693a3ae --- /dev/null +++ b/modules/event_news_mod/event_news_index19.html.erb @@ -0,0 +1,29 @@ +
+

{{page-title}}

+ + + + + + + + + + + + + + + + + + + +
{{category-head}}{{event_date-head}}{{speaker-head}}{{title-head}}{{view-count-head}}
{{category}}{{postdate}}{{speaker}} + + {{status}} + + {{title}} + {{view_count}}
+
+{{pagination_goes_here}} diff --git a/modules/event_news_mod/event_news_index20.html.erb b/modules/event_news_mod/event_news_index20.html.erb new file mode 100644 index 0000000..4dc7b1e --- /dev/null +++ b/modules/event_news_mod/event_news_index20.html.erb @@ -0,0 +1,31 @@ +
+

{{page-title}}

+ + + + + + + + + + + + + + + + + + + + + +
{{category-head}}{{speaker-head}}{{event_start_date-head}}{{title-head}}{{event_end_date-head}}{{view-count-head}}
{{category}}{{speaker}}{{event_start_date}} + + {{status}} + + {{title}} + {{event_end_date}}{{view_count}}
+
+{{pagination_goes_here}} diff --git a/modules/event_news_mod/info.json b/modules/event_news_mod/info.json index 268777e..7cdae46 100644 --- a/modules/event_news_mod/info.json +++ b/modules/event_news_mod/info.json @@ -143,6 +143,22 @@ "en" : "18. Standard Title List-2 ( EventDate, speaker, status, title, host, notes)" }, "thumbnail" : "event_news_index1_thumbs.png" + }, + { + "filename" : "event_news_index19", + "name" : { + "zh_tw" : "19. 標準標題列表-3 ( 類別, 日期, 演講者, 狀態, 標題, 瀏覽人次 )", + "en" : "19. Standard Title List-3 ( category, EventDate, speaker, status, title, view-count)" + }, + "thumbnail" : "event_news_index1_thumbs.png" + }, + { + "filename" : "event_news_index20", + "name" : { + "zh_tw" : "20. 標準標題列表-4 ( 類別, 演講者, 事件日期, 狀態, 標題, 截止日期, 瀏覽人次 )", + "en" : "20. Standard Title List-4 ( category, EventDate, speaker, EventDate, status, title, EndDate, view-count)" + }, + "thumbnail" : "event_news_index1_thumbs.png" } ], "widgets" : [ @@ -292,6 +308,14 @@ }, "force_cover" : "true", "thumbnail" : "event_news_widget13_thumbs.png" + }, + { + "filename" : "event_news_widget19", + "name" : { + "zh_tw" : "19. 標準標題列表-3 ( 類別, 演講者, 事件日期, 狀態, 標題, 截止日期, 瀏覽人次 )", + "en" : "19. Standard Title List-3 ( category, EventDate, speaker, EventDate, status, title, EndDate, view-count)" + }, + "thumbnail" : "event_news_widget7_thumbs.png" } ] } \ No newline at end of file