-
">
">
diff --git a/modules/ad_banner/_ad_banner_widget5.html.erb b/modules/ad_banner/_ad_banner_widget5.html.erb
index 08e3644..0e33172 100644
--- a/modules/ad_banner/_ad_banner_widget5.html.erb
+++ b/modules/ad_banner/_ad_banner_widget5.html.erb
@@ -1,5 +1,5 @@
-
+
-
--
+
++ - {{status}} - - - {{postdate}} - - - {{category}} + {{status}} +-+ {{title}} +
+{{subtitle}}
- {{title}} -
-{{subtitle}}
diff --git a/modules/announcement/_annc_widget15.html.erb b/modules/announcement/_annc_widget15.html.erb index 08776c8..f42cd4e 100644 --- a/modules/announcement/_annc_widget15.html.erb +++ b/modules/announcement/_annc_widget15.html.erb @@ -28,14 +28,11 @@-+ + {{status}} +- diff --git a/modules/announcement/_annc_widget2.html.erb b/modules/announcement/_annc_widget2.html.erb index a52bd31..ba3f3e7 100644 --- a/modules/announcement/_annc_widget2.html.erb +++ b/modules/announcement/_annc_widget2.html.erb @@ -5,25 +5,27 @@{{title}}
@@ -66,49 +66,7 @@ overflow: hidden; } - + diff --git a/modules/announcement/_annc_widget16.html.erb b/modules/announcement/_annc_widget16.html.erb index 859fe57..f747e5d 100644 --- a/modules/announcement/_annc_widget16.html.erb +++ b/modules/announcement/_annc_widget16.html.erb @@ -1,10 +1,7 @@-{{widget-title}}
- --diff --git a/modules/announcement/_annc_widget18.html.erb b/modules/announcement/_annc_widget18.html.erb index d8aa1a6..3998a1e 100644 --- a/modules/announcement/_annc_widget18.html.erb +++ b/modules/announcement/_annc_widget18.html.erb @@ -7,17 +7,17 @@- + + <%= (I18n.locale.to_s =="zh_tw") ? "更多+" : "More NEWS" %>-+ + {{status}} +{{title}}
@@ -40,9 +36,13 @@-
-
- ---+ +
- {{title}} -
-{{subtitle}}-{{read_more_text}}-++++ {{title}} +
+{{subtitle}}+{{read_more_text}}+
{{widget-title}}
- -+ ++-
- --- -
- {{title}} -
-{{subtitle}}
++diff --git a/modules/announcement/_annc_widget20.html.erb b/modules/announcement/_annc_widget20.html.erb index e147d98..be53f2c 100644 --- a/modules/announcement/_annc_widget20.html.erb +++ b/modules/announcement/_annc_widget20.html.erb @@ -10,14 +10,11 @@+++ + + {{status}} + ++ {{title}} +
+{{subtitle}}
+diff --git a/modules/custom_announcement/_annc_widget1.html.erb b/modules/custom_announcement/_annc_widget1.html.erb index 7cadadd..c7e0630 100644 --- a/modules/custom_announcement/_annc_widget1.html.erb +++ b/modules/custom_announcement/_annc_widget1.html.erb @@ -5,7 +5,7 @@-+ + {{status}} +diff --git a/modules/archive/archive_index6.html.erb b/modules/archive/archive_index6.html.erb index 79fb38e..70c7e0d 100644 --- a/modules/archive/archive_index6.html.erb +++ b/modules/archive/archive_index6.html.erb @@ -18,8 +18,7 @@{{title}}
diff --git a/modules/announcement/_annc_widget21.html.erb b/modules/announcement/_annc_widget21.html.erb index 01fb5a1..65f6e9d 100644 --- a/modules/announcement/_annc_widget21.html.erb +++ b/modules/announcement/_annc_widget21.html.erb @@ -29,14 +29,11 @@-+ + {{status}} +{{title}}
diff --git a/modules/announcement/_annc_widget22.html.erb b/modules/announcement/_annc_widget22.html.erb index b34ae4c..e80d594 100644 --- a/modules/announcement/_annc_widget22.html.erb +++ b/modules/announcement/_annc_widget22.html.erb @@ -19,11 +19,7 @@-
- - + diff --git a/modules/announcement/_annc_widget23.html.erb b/modules/announcement/_annc_widget23.html.erb index afa3707..f0af1e7 100644 --- a/modules/announcement/_annc_widget23.html.erb +++ b/modules/announcement/_annc_widget23.html.erb @@ -6,12 +6,9 @@@@ -80,7 +79,6 @@ Timeline.prototype = { //初始化 _init: function (_opt) { - //合併自訂參數與預設參數 var self = this; self.options = $.extend(true, {}, Timeline.options, _opt); @@ -100,6 +98,10 @@ $(this).find('.row').first().show().siblings().hide(); }); + // ✅ 初始狀態：全部顯示 + self.target.find('.events-body').show(); + self.target.find('.events-footer').show(); + self.target.find('img').on('load', function () { self.target.find('.events-body').each(function () { var maxHeight = 0; @@ -108,7 +110,10 @@ maxHeight = $(this).height(); } }); + // 只在桌機才設固定高度，RWD 不設 + if ($(window).width() > 768) { $(this).find('.row').height(maxHeight); + } }); }); }, @@ -116,8 +121,18 @@ //綁定事件 _event: function () { var self = this; + + // ✅ 點任一 .events-header 展開/收合所有 .events-body + var allExpanded = false; self.target.find('.events-header').click(function () { - $(this).siblings('.events-body').slideToggle().end().siblings('.events-footer').toggle(); + allExpanded = !allExpanded; + if (allExpanded) { + self.target.find('.events-body').slideDown(300); + self.target.find('.events-footer').show(); + } else { + self.target.find('.events-body').slideUp(300); + self.target.find('.events-footer').hide(); + } }); self.target.find('.events-footer li').click(function () { @@ -132,7 +147,6 @@ self.target.find('.events').hover(function () { clearInterval(self.carouselInterval); self.carouselInterval = null; - }, function () { if (self.carouselInterval == undefined) { self.carouselInterval = setInterval(function () { @@ -175,10 +189,32 @@ return this; } })(jQuery, window, document); - - - diff --git a/modules/announcement/annc_index12.html.erb b/modules/announcement/annc_index12.html.erb index 93b478e..c75a224 100644 --- a/modules/announcement/annc_index12.html.erb +++ b/modules/announcement/annc_index12.html.erb @@ -38,4 +38,5 @@ $('.i-annc__table').each(function(){ }); } });; +$('.index-announcement-12 table.dataTable > tbody > tr.child').remove(); diff --git a/modules/announcement/annc_index13.html.erb b/modules/announcement/annc_index13.html.erb index 6c508bc..70dea7b 100644 --- a/modules/announcement/annc_index13.html.erb +++ b/modules/announcement/annc_index13.html.erb @@ -1,4 +1,4 @@ --+ + {{status}} +
{{title}}
diff --git a/modules/announcement/_annc_widget24.html.erb b/modules/announcement/_annc_widget24.html.erb index df83d49..9fa6351 100644 --- a/modules/announcement/_annc_widget24.html.erb +++ b/modules/announcement/_annc_widget24.html.erb @@ -9,14 +9,11 @@-+ + {{status}} +{{title}}
diff --git a/modules/announcement/_annc_widget25.html.erb b/modules/announcement/_annc_widget25.html.erb index 0d8822f..cdaa91c 100644 --- a/modules/announcement/_annc_widget25.html.erb +++ b/modules/announcement/_annc_widget25.html.erb @@ -30,7 +30,7 @@-diff --git a/modules/announcement/_annc_widget26.html.erb b/modules/announcement/_annc_widget26.html.erb index f0f6e5c..163b314 100644 --- a/modules/announcement/_annc_widget26.html.erb +++ b/modules/announcement/_annc_widget26.html.erb @@ -6,13 +6,10 @@+ \ No newline at end of file diff --git a/modules/announcement/_annc_widget27.html.erb b/modules/announcement/_annc_widget27.html.erb new file mode 100644 index 0000000..249c5a6 --- /dev/null +++ b/modules/announcement/_annc_widget27.html.erb @@ -0,0 +1,173 @@ + + + diff --git a/modules/announcement/_annc_widget28.html.erb b/modules/announcement/_annc_widget28.html.erb new file mode 100644 index 0000000..e002a3c --- /dev/null +++ b/modules/announcement/_annc_widget28.html.erb @@ -0,0 +1,180 @@ + + diff --git a/modules/announcement/_annc_widget3.html.erb b/modules/announcement/_annc_widget3.html.erb index 4527a08..34f5355 100644 --- a/modules/announcement/_annc_widget3.html.erb +++ b/modules/announcement/_annc_widget3.html.erb @@ -7,9 +7,6 @@-+ + {{status}} +{{title}}
@@ -34,3 +34,51 @@ <%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %>+ + {{status}} +{{title}}
{{subtitle}}
-diff --git a/modules/announcement/_annc_widget30.html.erb b/modules/announcement/_annc_widget30.html.erb new file mode 100644 index 0000000..54bd5d3 --- /dev/null +++ b/modules/announcement/_annc_widget30.html.erb @@ -0,0 +1,244 @@ +++ + + + diff --git a/modules/announcement/_annc_widget31.html.erb b/modules/announcement/_annc_widget31.html.erb new file mode 100644 index 0000000..01a2a24 --- /dev/null +++ b/modules/announcement/_annc_widget31.html.erb @@ -0,0 +1,25 @@ + diff --git a/modules/announcement/_annc_widget4.html.erb b/modules/announcement/_annc_widget4.html.erb index 162aba8..f3df7c8 100644 --- a/modules/announcement/_annc_widget4.html.erb +++ b/modules/announcement/_annc_widget4.html.erb @@ -6,7 +6,7 @@ <%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %>+ {{widget-title}} +
+ ++ + + + + ++ + +-
-
- +
-
- -@@ -15,9 +15,6 @@+ + {{status}} +diff --git a/modules/announcement/annc_index10.html.erb b/modules/announcement/annc_index10.html.erb index 52223dd..d37995e 100644 --- a/modules/announcement/annc_index10.html.erb +++ b/modules/announcement/annc_index10.html.erb @@ -7,7 +7,7 @@
{{title}}
@@ -56,53 +56,8 @@ } diff --git a/modules/announcement/_annc_widget5.html.erb b/modules/announcement/_annc_widget5.html.erb index c0da6bc..86dc57d 100644 --- a/modules/announcement/_annc_widget5.html.erb +++ b/modules/announcement/_annc_widget5.html.erb @@ -20,9 +20,11 @@ {{status}} - {{title}} + {{title}}{{subtitle}}
+ + {{widget_tags}}-
-
- {{date-head}} +
@@ -25,11 +25,10 @@+{{subtitle}}+ more +
+diff --git a/modules/archive/archive_index4.html.erb b/modules/archive/archive_index4.html.erb index dab0713..ff406c9 100644 --- a/modules/archive/archive_index4.html.erb +++ b/modules/archive/archive_index4.html.erb @@ -23,8 +23,7 @@ {{description}}diff --git a/modules/archive/archive_index3.html.erb b/modules/archive/archive_index3.html.erb index a9545e2..43c5db8 100644 --- a/modules/archive/archive_index3.html.erb +++ b/modules/archive/archive_index3.html.erb @@ -15,8 +15,7 @@{{page-title}}
diff --git a/modules/announcement/annc_index15.html.erb b/modules/announcement/annc_index15.html.erb index 1d757b3..c947b67 100644 --- a/modules/announcement/annc_index15.html.erb +++ b/modules/announcement/annc_index15.html.erb @@ -35,5 +35,7 @@ $('.i-annc__table').each(function(){ autoWidth: false }); } -});; +}); +$('.index-announcement-15 table.dataTable > tbody > tr.child').remove(); + diff --git a/modules/announcement/annc_index16.html.erb b/modules/announcement/annc_index16.html.erb index 317b1c0..4017e31 100644 --- a/modules/announcement/annc_index16.html.erb +++ b/modules/announcement/annc_index16.html.erb @@ -5,8 +5,8 @@
@@ -50,4 +50,38 @@ $('.i-annc__table').each(function(){ }); } });; +$(function() { + setTimeout(function() { + var $linksTh = $('th#links'); + if ($linksTh.length > 0 && $linksTh.text().trim() === '超連結') { + $linksTh.text('連結'); + } + + var $filesTh = $('th#files'); + if ($filesTh.length > 0 && $filesTh.text().trim() === '檔案下載') { + $filesTh.text('檔案'); + } + }, 300); +}); +$('.index-announcement-16 table.dataTable > tbody > tr.child').remove(); +$(function() { + setTimeout(function() { + // 原本的邏輯不動 + var $linksTh = $('th#links'); + if ($linksTh.length > 0 && $linksTh.text().trim() === '超連結') { + $linksTh.text('連結'); + } + var $filesTh = $('th#files'); + if ($filesTh.length > 0 && $filesTh.text().trim() === '檔案下載') { + $filesTh.text('檔案'); + } + + // ✅ 新增：把 th 文字寫入對應 td 的 data-label + var fileLabel = $('th#files').text().trim(); + var linkLabel = $('th#links').text().trim(); + + $('.index-announcement-16 .i-annc__files').attr('data-label', fileLabel); + $('.index-announcement-16 .i-annc__links').attr('data-label', linkLabel); + }, 300); +}); diff --git a/modules/announcement/annc_index18.html.erb b/modules/announcement/annc_index18.html.erb index 778bb74..7c81390 100644 --- a/modules/announcement/annc_index18.html.erb +++ b/modules/announcement/annc_index18.html.erb @@ -2,30 +2,30 @@{{date-head}} {{title-head}} -{{link-head}} {{file-head}} +{{link-head}} - -
-
- - {{link_title}} - -
- @@ -32,6 +25,13 @@
+ -
+
- + {{link_title}} + +
{{page-title}}
-
- - --- +diff --git a/modules/announcement/annc_index21.html.erb b/modules/announcement/annc_index21.html.erb index 834e6f4..146789e 100644 --- a/modules/announcement/annc_index21.html.erb +++ b/modules/announcement/annc_index21.html.erb @@ -4,14 +4,14 @@+ ++
+ {{title}} +
+{{subtitle}}
+ -
- diff --git a/modules/archive/archive_index17.html.erb b/modules/archive/archive_index17.html.erb index 8cdec44..e847a6c 100644 --- a/modules/archive/archive_index17.html.erb +++ b/modules/archive/archive_index17.html.erb @@ -17,8 +17,7 @@diff --git a/modules/archive/archive_index2.html.erb b/modules/archive/archive_index2.html.erb index ed5dfca..7ac44db 100644 --- a/modules/archive/archive_index2.html.erb +++ b/modules/archive/archive_index2.html.erb @@ -26,8 +26,7 @@
- - {{file-name}} - {{file-type}} + {{file-name}}{{file-type}}
-
-diff --git a/modules/custom_announcement/_annc_widget15.html.erb b/modules/custom_announcement/_annc_widget15.html.erb index ab812db..05172c6 100644 --- a/modules/custom_announcement/_annc_widget15.html.erb +++ b/modules/custom_announcement/_annc_widget15.html.erb @@ -12,7 +12,7 @@
-
-diff --git a/modules/custom_announcement/_annc_widget16.html.erb b/modules/custom_announcement/_annc_widget16.html.erb index e8f44b7..ed7d680 100644 --- a/modules/custom_announcement/_annc_widget16.html.erb +++ b/modules/custom_announcement/_annc_widget16.html.erb @@ -27,7 +27,7 @@-diff --git a/modules/custom_announcement/_annc_widget18.html.erb b/modules/custom_announcement/_annc_widget18.html.erb index 0d24f0c..b1055da 100644 --- a/modules/custom_announcement/_annc_widget18.html.erb +++ b/modules/custom_announcement/_annc_widget18.html.erb @@ -9,7 +9,7 @@diff --git a/modules/custom_announcement/_annc_widget2.html.erb b/modules/custom_announcement/_annc_widget2.html.erb index ac0e8b9..b105a2e 100644 --- a/modules/custom_announcement/_annc_widget2.html.erb +++ b/modules/custom_announcement/_annc_widget2.html.erb @@ -5,7 +5,7 @@
-
--diff --git a/modules/custom_announcement/_annc_widget4.html.erb b/modules/custom_announcement/_annc_widget4.html.erb index 93ec7fb..5b2ae74 100644 --- a/modules/custom_announcement/_annc_widget4.html.erb +++ b/modules/custom_announcement/_annc_widget4.html.erb @@ -8,7 +8,7 @@
-
-- + + + + diff --git a/modules/event_news_mod/_event_news_widget2.html.erb b/modules/event_news_mod/_event_news_widget2.html.erb index d121630..2838c5f 100644 --- a/modules/event_news_mod/_event_news_widget2.html.erb +++ b/modules/event_news_mod/_event_news_widget2.html.erb @@ -6,7 +6,7 @@
-
diff --git a/modules/event_news_mod/_event_news_widget20.html.erb b/modules/event_news_mod/_event_news_widget20.html.erb index 9bb8c88..648d588 100644 --- a/modules/event_news_mod/_event_news_widget20.html.erb +++ b/modules/event_news_mod/_event_news_widget20.html.erb @@ -10,14 +10,11 @@-+ + {{status}} +
{{title}}
diff --git a/modules/event_news_mod/_event_news_widget21.html.erb b/modules/event_news_mod/_event_news_widget21.html.erb index be4a6a2..2cc5893 100644 --- a/modules/event_news_mod/_event_news_widget21.html.erb +++ b/modules/event_news_mod/_event_news_widget21.html.erb @@ -1,4 +1,4 @@ --
-+ + {{status}} +
{{title}}
@@ -130,7 +130,7 @@ num=1; } var flag=false; - $('.btn-left').click(function(){ + $('[data-subpart-id="{{subpart-id}}"] .btn-left, #prev-{{subpart-id}}').click(function(){ if(!flag){ var uls = $('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list:not(.hidden_item)').toArray(); var ul_length = uls.length; @@ -148,7 +148,7 @@ $('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list.active').eq(0).effect("slide", { direction: "left", mode: 'show', duration: 500},function(){flag=false;}); }; }); - $('.btn-right').click(function(){ + $('[data-subpart-id="{{subpart-id}}"] .btn-right, #next-{{subpart-id}}').click(function(){ var lilength = $('[data-subpart-id=\"{{subpart-id}}\"] li.w-annc__item').length; if(!flag){ var uls = $('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list:not(.hidden_item)').toArray(); diff --git a/modules/event_news_mod/_event_news_widget3.html.erb b/modules/event_news_mod/_event_news_widget3.html.erb index fcb850b..a3804c7 100644 --- a/modules/event_news_mod/_event_news_widget3.html.erb +++ b/modules/event_news_mod/_event_news_widget3.html.erb @@ -24,7 +24,7 @@{{subtitle}}
-
diff --git a/modules/event_news_mod/_event_news_widget4.html.erb b/modules/event_news_mod/_event_news_widget4.html.erb
index d661290..fcc5098 100644
--- a/modules/event_news_mod/_event_news_widget4.html.erb
+++ b/modules/event_news_mod/_event_news_widget4.html.erb
@@ -1,22 +1,20 @@
- +
-
\ No newline at end of file
+
diff --git a/modules/event_news_mod/_event_news_widget5.html.erb b/modules/event_news_mod/_event_news_widget5.html.erb
index 406176e..3a67486 100644
--- a/modules/event_news_mod/_event_news_widget5.html.erb
+++ b/modules/event_news_mod/_event_news_widget5.html.erb
@@ -4,6 +4,7 @@
-
+
+diff --git a/modules/event_news_mod/show.html.erb b/modules/event_news_mod/show.html.erb index a0c4bc6..35dc7af 100644 --- a/modules/event_news_mod/show.html.erb +++ b/modules/event_news_mod/show.html.erb @@ -12,6 +12,7 @@ +
- @@ -50,18 +51,40 @@
-
-
- - {{file_title}} +
附件檔案
+ -- - -
- {{link_title}} +參考連結
+ {{link_to_edit}} + \ No newline at end of file diff --git a/modules/event_news_mod/show2.html.erb b/modules/event_news_mod/show2.html.erb index 88def01..06f3b1c 100644 --- a/modules/event_news_mod/show2.html.erb +++ b/modules/event_news_mod/show2.html.erb @@ -2,6 +2,7 @@{{title}}
-
+
-
@@ -50,18 +51,40 @@
-
-
-
diff --git a/modules/video_pro/_video_pro_widget3.html.erb b/modules/video_pro/_video_pro_widget3.html.erb index 5f4cde7..c965bfa 100644 --- a/modules/video_pro/_video_pro_widget3.html.erb +++ b/modules/video_pro/_video_pro_widget3.html.erb @@ -27,7 +27,7 @@
{{view_count}}- +
-
-
-
{{view_count}}- +{{view_count}}- + - - -
{{view_count}}- +- +- +- +- +diff --git a/modules/web_resource/_web_res_widget8.html.erb b/modules/web_resource/_web_res_widget8.html.erb index 963f44c..36cd905 100644 --- a/modules/web_resource/_web_res_widget8.html.erb +++ b/modules/web_resource/_web_res_widget8.html.erb @@ -9,10 +9,10 @@- +diff --git a/modules/web_resource/_web_res_widget7.html.erb b/modules/web_resource/_web_res_widget7.html.erb index e4a72cc..15639dc 100644 --- a/modules/web_resource/_web_res_widget7.html.erb +++ b/modules/web_resource/_web_res_widget7.html.erb @@ -9,10 +9,10 @@- + - @@ -50,18 +51,40 @@
-
+
-+ + {{status}} +{{title}}
diff --git a/modules/event_news_mod/_event_news_widget22.html.erb b/modules/event_news_mod/_event_news_widget22.html.erb index 3b4c63d..605b210 100644 --- a/modules/event_news_mod/_event_news_widget22.html.erb +++ b/modules/event_news_mod/_event_news_widget22.html.erb @@ -21,13 +21,10 @@-{{widget-title}}
- <%= t("event_news.more") %> +-
-
-
-
-
-
-
-
-
-
-
">
">
diff --git a/modules/ad_banner/_ad_banner_widget9_video.html.erb b/modules/ad_banner/_ad_banner_widget9_video.html.erb
index 15d0ce3..c34e4c7 100644
--- a/modules/ad_banner/_ad_banner_widget9_video.html.erb
+++ b/modules/ad_banner/_ad_banner_widget9_video.html.erb
@@ -25,7 +25,7 @@
{{html}}
-
+
-
">
diff --git a/modules/announcement/_annc_widget1.html.erb b/modules/announcement/_annc_widget1.html.erb
index 7225a00..aa3aa9b 100644
--- a/modules/announcement/_annc_widget1.html.erb
+++ b/modules/announcement/_annc_widget1.html.erb
@@ -6,23 +6,25 @@