diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js index 49213b5..d94891c 100644 --- a/assets/javascripts/app.js +++ b/assets/javascripts/app.js @@ -1101,56 +1101,59 @@ $(function() { } } - // E. 重新計算標題 (關鍵邏輯：若 hasOriginalTitle 為真，則不進入此區塊) - if (!hasOriginalTitle) { - if (linkText === "" && $img.length > 0) { - var rawAlt = ($img.attr('alt') || '').trim(); - var forbidden = ['這是一張圖片', '圖片', 'image', 'photo', '圖', '']; - var imgAlt = forbidden.some(function(txt) { return rawAlt.toLowerCase() === txt; }) - ? ($a.attr('aria-label') || i18n.link) : rawAlt; - - var fileInfo = fileExt ? '[' + fileExt.toUpperCase() + '] ' : ''; - $a.attr('title', (fileInfo + imgAlt + " " + windowTask).trim()); - $img.attr('alt', imgAlt); - } - else if (linkText !== "") { - if (fileExt !== "" || hasBadSymbol || currentTitle === "" || currentTitle.includes('/uploads/')) { - if (fileExt !== "") { - $a.attr('title', linkText + " ." + fileExt + " " + windowTask); - } else { - $a.attr('title', windowTask); - } + // E. 重新計算標題 (關鍵邏輯：若 hasOriginalTitle 為真，則不進入此區塊) + if (!hasOriginalTitle) { + if (linkText === "" && $img.length > 0) { + var rawAlt = ($img.attr('alt') || '').trim(); + var forbidden = ['這是一張圖片', '圖片', 'image', 'photo', '圖', '']; + var imgAlt = forbidden.some(function(txt) { return rawAlt.toLowerCase() === txt; }) + ? ($a.attr('aria-label') || i18n.link) : rawAlt; + + var fileInfo = fileExt ? '[' + fileExt.toUpperCase() + '] ' : ''; + $a.attr('title', (fileInfo + imgAlt + " " + windowTask).trim()); + $img.attr('alt', imgAlt); + } + else if (linkText !== "") { + if (fileExt !== "" || hasBadSymbol || currentTitle === "" || currentTitle.includes('/uploads/')) { + if (fileExt !== "") { + $a.attr('title', linkText + " ." + fileExt + " " + windowTask); + } else { + $a.attr('title', windowTask); } } } + } - // ✅ 符合 HM1240404E：title 不應與連結文字或圖片 alt 重複 - if (hasOriginalTitle && currentTitle !== "") { - var titleWithoutWindow = currentTitle - .replace('(在本視窗開啟)', '') - .replace('(在新視窗開啟)', '') - .replace('Open in this window', '') - .replace('Open in new window', '') - .replace('另開新視窗前往', '') - .replace('另開新視窗', '') - .trim(); + // ✅ 符合 HM1240404E：title 不應與連結文字或圖片 alt 重複 + if (hasOriginalTitle && currentTitle !== "") { + var titleWithoutWindow = currentTitle + .replace('(在本視窗開啟)', '') + .replace('(在新視窗開啟)', '') + .replace('Open in this window', '') + .replace('Open in new window', '') + .replace('另開新視窗前往', '') + .replace('另開新視窗', '') + .trim(); - // ✅ title 去掉開窗字串後，若與連結文字或圖片原始 alt 相同，則只保留開窗提示 - if ( - (titleWithoutWindow === linkText && linkText !== i18n.link) || - (imgAltOriginal !== '' && titleWithoutWindow === imgAltOriginal) - ) { - $a.attr('title', windowTask); - } - - // ✅ 最終清理：若 title 出現空括號 () 則移除並補上正確開窗提示 - var finalTitle = ($a.attr('title') || '').trim(); - if (finalTitle.includes('()')) { - finalTitle = finalTitle.replace(/\(\)/g, '').trim(); - $a.attr('title', finalTitle + ' ' + windowTask); - } + // ✅ title 去掉開窗字串後，若與連結文字或圖片原始 alt 相同，則只保留開窗提示 + // ✅ 新增：若 linkText 包含副檔名且 title 也是同樣檔名，也只保留開窗提示 + if ( + (titleWithoutWindow === linkText && linkText !== i18n.link) || + (imgAltOriginal !== '' && titleWithoutWindow === imgAltOriginal) || + (fileExt !== '' && linkText.toLowerCase().endsWith('.' + fileExt) && titleWithoutWindow === linkText) + ) { + $a.attr('title', windowTask); + return; // ✅ 加上 return，避免繼續執行後面的清理邏輯造成二次污染 } + // ✅ 最終清理：若 title 出現空括號 () 則移除並補上正確開窗提示 + var finalTitle = ($a.attr('title') || '').trim(); + if (finalTitle.includes('()')) { + finalTitle = finalTitle.replace(/\(\)/g, '').trim(); + $a.attr('title', finalTitle + ' ' + windowTask); + } + } + // F. 最終清理：移除冗餘 label，避免螢幕閱讀器唸兩次 $a.removeAttr('aria-label'); }); @@ -1184,6 +1187,47 @@ $(function() { fixAccessibilityAll(); }, 800); }); +// 修正漢堡選單按鈕無障礙 +$(function() { + function fixNavbarToggleA11y() { + var isEn = $('html').attr('lang') === 'en'; + var label = isEn ? '開啟或關閉導覽選單' : '開啟或關閉導覽選單'; + + $('.navbar-toggle').each(function() { + var $btn = $(this); + + // 修正 title + $btn.attr('title', label); + + // 修正 sr-only 文字（原本是 "Toggle navigation"） + var $sr = $btn.find('.sr-only'); + if ($sr.length) { + $sr.text(label); + } else { + $btn.prepend('' + label + ''); + } + + // 補上 aria-label + $btn.attr('aria-label', label); + + // 補上 aria-expanded（依據目前是否展開） + if (!$btn.attr('aria-expanded')) { + var isExpanded = !$btn.hasClass('collapsed'); + $btn.attr('aria-expanded', isExpanded ? 'true' : 'false'); + } + + // 點擊時同步更新 aria-expanded + $btn.off('click.navA11y').on('click.navA11y', function() { + setTimeout(function() { + var isExpanded = !$('.navbar-toggle').hasClass('collapsed'); + $('.navbar-toggle').attr('aria-expanded', isExpanded ? 'true' : 'false'); + }, 50); + }); + }); + } + + setTimeout(fixNavbarToggleA11y, 500); +}); $(function() { @@ -2313,7 +2357,7 @@ $(document).ready(function() { if ($(window).width() <769) { $('.modules-menu-level-0').after($('.header-nav')); }else{ - $('.navbar-header').before($('.header-nav')); + $('.navbar-header').after($('.header-nav')); }; $('.sitemenu-vertical .sitemenu-dropdown-toggle').click(function(){ $('.sitemenu-vertical .dropdown-menu').slideToggle(); @@ -2381,7 +2425,7 @@ $(document).ready(function() { $('.modules-menu-level-0').after($('.header-nav')); }else{ - $('.navbar-header').before($('.header-nav')); + $('.navbar-header').after($('.header-nav')); }; if ($(window).width() > 821) { @@ -3166,6 +3210,16 @@ $(document).ready(function () { setTimeout(function() { $('.internal-page .ad-banner-widget-0 .w-ad-banner__image').attr('alt', ''); }, 800); +setTimeout(function() { + var found = false; + $('.navbar-header a[accesskey="M"]').each(function() { + if (found) { + $(this).remove(); + } else { + found = true; + } + }); +}, 1000); // 執行 member等高計算，目前改用flexbox故mark掉 by ika 20160105 // $(window).load(function() { // if ($('.index-member-3').length && $(window).width() > 992) { diff --git a/assets/stylesheets/template/base/_accesskey.scss b/assets/stylesheets/template/base/_accesskey.scss index 2cef1cf..1f3788e 100644 --- a/assets/stylesheets/template/base/_accesskey.scss +++ b/assets/stylesheets/template/base/_accesskey.scss @@ -18,6 +18,7 @@ a[accesskey] { a[accesskey] { position: relative!important; margin-left: -0.9375em; - color: transparent !important; + color: transparent ; + float: left; } } diff --git a/assets/stylesheets/template/base/_go_back_top.scss b/assets/stylesheets/template/base/_go_back_top.scss index 1f9e4d5..cc6276d 100644 --- a/assets/stylesheets/template/base/_go_back_top.scss +++ b/assets/stylesheets/template/base/_go_back_top.scss @@ -3,7 +3,7 @@ @import "variables"; .go-back-top { - background:#00000080; + background:#2760b0; text-align: center; padding: 0.625em 0.75em; position: fixed; diff --git a/assets/stylesheets/template/layout/footer.scss b/assets/stylesheets/template/layout/footer.scss index 2da65b6..61844d1 100644 --- a/assets/stylesheets/template/layout/footer.scss +++ b/assets/stylesheets/template/layout/footer.scss @@ -6,7 +6,7 @@ z-index: 1; clear: both; color: #E4E4E4; - background: url(/assets/bg_footer.png) repeat #24436E; + background: url(/assets/bg_footer.png) repeat #183864; position: relative; padding: 2em 0; color: $theme-color-main; diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss index 39deb6c..af3ea82 100644 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -95,6 +95,9 @@ display: flex; align-items: center; justify-content: flex-end; + @media(max-width:768px){ + width: 100%; + } ul{ padding: 0; } @@ -122,7 +125,7 @@ text-decoration: none; padding:5px; } - + @media (min-width:1025px) { position: relative; } @@ -139,14 +142,6 @@ margin-top: 1em!important; margin-bottom: 1em!important; } - @media (min-width: 769px){ - float: none!important; - } - // @media (max-width: $screen-sm) { - // width: 100%; - // display: flex; - // flex-flow: row-reverse; - // } .navbar-brand { line-height: 2.125em; color: $theme-color-main; diff --git a/assets/stylesheets/template/modules/announcement.scss b/assets/stylesheets/template/modules/announcement.scss index 91ae5eb..c132da2 100644 --- a/assets/stylesheets/template/modules/announcement.scss +++ b/assets/stylesheets/template/modules/announcement.scss @@ -2010,6 +2010,9 @@ a.w-annc__more.btn.btn-primary.pull-right { text-align: center; border-radius: 0; background: #2f4877!important; + .en{ + color: #f2f2f2!important; + } } .w-annc__more-wrap{ padding-right: 1em; diff --git a/home/header.html.erb b/home/header.html.erb index 38762d1..34a8ef7 100644 --- a/home/header.html.erb +++ b/home/header.html.erb @@ -21,21 +21,23 @@
-
- ::: - {{header-data}} -
-
- - - {{site_name}} - +
+
+ + + {{site_name}} +
+
+ ::: + {{header-data}} +
+
diff --git a/modules/archive/archive_index7.html.erb b/modules/archive/archive_index7.html.erb index d69e936..fc941b6 100644 --- a/modules/archive/archive_index7.html.erb +++ b/modules/archive/archive_index7.html.erb @@ -19,8 +19,7 @@
diff --git a/modules/text_marquee/_widget.html.erb b/modules/text_marquee/_widget.html.erb index b1a1e58..f4fc85c 100644 --- a/modules/text_marquee/_widget.html.erb +++ b/modules/text_marquee/_widget.html.erb @@ -1,18 +1,14 @@
- +
+ +
-
    +
    • {{content}}
@@ -26,8 +22,7 @@ var isPaused = false; var timer = null; - var $resumeBtn = main_div.find(".resume-slide"); - var $pauseBtn = main_div.find(".pause-slide"); + var $toggleBtn = main_div.find(".marquee-toggle-btn"); var $marquee = main_div.find("ul.marquee"); main_div.find("ul.marquee li").hide(); @@ -39,7 +34,7 @@ current_text = (current_text > total_texts ? 0 : current_text); last_text = (current_text === 0 ? total_texts : current_text - 1); - var speed = $(".marquee > li > a").eq(current_text).attr("speed") || 3000; + var speed = main_div.find(".marquee > li > a").eq(current_text).attr("speed") || 3000; main_div.find("ul.marquee li").eq(last_text).slideUp(500); main_div.find("ul.marquee li").eq(current_text).slideDown(500); @@ -52,30 +47,51 @@ function pause() { isPaused = true; clearTimeout(timer); - $pauseBtn.attr("aria-checked", "true").addClass("active"); - $resumeBtn.attr("aria-checked", "false").removeClass("active"); - // aria-live 暫停時設 off，避免螢幕報讀繼續讀 $marquee.attr("aria-live", "off"); + + // 切換按鈕狀態：aria-pressed="true" 表示目前已暫停 + $toggleBtn + .attr("aria-pressed", "true") + .attr("aria-label", "繼續跑馬燈") + .attr("title", "繼續跑馬燈") + .find("span.visually-hidden").text("繼續跑馬燈"); + $toggleBtn.addClass("is-paused"); + + // 暫停後讓目前顯示的 li 內連結可被 Tab + main_div.find("ul.marquee li").removeAttr("tabindex"); + main_div.find("ul.marquee li:visible a").attr("tabindex", "0"); + main_div.find("ul.marquee li:hidden a").attr("tabindex", "-1"); } function resume() { isPaused = false; - $resumeBtn.attr("aria-checked", "true").addClass("active"); - $pauseBtn.attr("aria-checked", "false").removeClass("active"); $marquee.attr("aria-live", "polite"); - var speed = $(".marquee > li > a").eq(current_text).attr("speed") || 3000; + + // 切換按鈕狀態：aria-pressed="false" 表示目前播放中 + $toggleBtn + .attr("aria-pressed", "false") + .attr("aria-label", "暫停跑馬燈") + .attr("title", "暫停跑馬燈") + .find("span.visually-hidden").text("暫停跑馬燈"); + $toggleBtn.removeClass("is-paused"); + + // 恢復播放，li 內連結不在 Tab 順序 + main_div.find("ul.marquee li").removeAttr("tabindex"); + main_div.find("ul.marquee li a").attr("tabindex", "-1"); + + var speed = main_div.find(".marquee > li > a").eq(current_text).attr("speed") || 3000; timer = setTimeout(textTransform, speed); } - // 播放/暫停按鈕 - $resumeBtn.on("click", function(e) { + // 單一切換按鈕 + $toggleBtn.on("click keydown", function(e) { + if (e.type === "keydown" && e.keyCode !== 13 && e.keyCode !== 32) return; e.preventDefault(); - if (isPaused) resume(); - }); - - $pauseBtn.on("click", function(e) { - e.preventDefault(); - if (!isPaused) pause(); + if (isPaused) { + resume(); + } else { + pause(); + } }); // 焦點進入跑馬燈區域時自動暫停 @@ -93,8 +109,8 @@ }); // 初始狀態：播放中 - $resumeBtn.addClass("active").attr("aria-checked", "true"); - $pauseBtn.attr("aria-checked", "false"); + main_div.find("ul.marquee li").removeAttr("tabindex"); + main_div.find("ul.marquee li a").attr("tabindex", "-1"); timer = setTimeout(textTransform, 500); })(); @@ -118,7 +134,7 @@ gap: 4px; } - .marquee-1 .controlplay a { + .marquee-1 .controlplay button.marquee-toggle-btn { display: inline-flex; align-items: center; justify-content: center; @@ -128,53 +144,47 @@ border-radius: 50%; background: #fff; cursor: pointer; - text-decoration: none; transition: background 0.15s; + padding: 0; } - .marquee-1 .controlplay a:hover, - .marquee-1 .controlplay a:focus { + .marquee-1 .controlplay button.marquee-toggle-btn:hover, + .marquee-1 .controlplay button.marquee-toggle-btn:focus { background: #f0f0f0; outline: 2px solid #005fcc; outline-offset: 2px; } - /* resume icon：play 三角形 */ - .marquee-1 .controlplay .resume-slide i::before { - content: ''; - display: inline-block; - width: 0; - height: 0; - border-style: solid; - border-width: 4px 0 4px 8px; - border-color: transparent transparent transparent #555; - margin-left: 2px; - } - - /* pause icon：兩條直線 */ - .marquee-1 .controlplay .pause-slide i { + /* 播放中：顯示 pause icon（兩條直線） */ + .marquee-1 .controlplay button.marquee-toggle-btn:not(.is-paused) .marquee-icon { display: inline-flex; gap: 2px; align-items: center; } - .marquee-1 .controlplay .pause-slide i::before, - .marquee-1 .controlplay .pause-slide i::after { + .marquee-1 .controlplay button.marquee-toggle-btn:not(.is-paused) .marquee-icon::before, + .marquee-1 .controlplay button.marquee-toggle-btn:not(.is-paused) .marquee-icon::after { content: ''; display: inline-block; width: 3px; height: 10px; - background: #555; + background: #ff4500; border-radius: 1px; } - /* active 狀態顏色 */ - .marquee-1 .controlplay .resume-slide.active i::before { + /* 已暫停：顯示 play icon（三角形） */ + .marquee-1 .controlplay button.marquee-toggle-btn.is-paused .marquee-icon::before { + content: ''; + display: inline-block; + width: 0; + height: 0; + border-style: solid; + border-width: 5px 0 5px 10px; border-color: transparent transparent transparent #32D9C3; + margin-left: 2px; } - .marquee-1 .controlplay .pause-slide.active i::before, - .marquee-1 .controlplay .pause-slide.active i::after { - background: #ff4500; + .marquee-1 .controlplay button.marquee-toggle-btn.is-paused .marquee-icon::after { + display: none; } \ No newline at end of file diff --git a/modules/web_resource/_web_res_widget1.html.erb b/modules/web_resource/_web_res_widget1.html.erb index 1f0760d..5a34c99 100644 --- a/modules/web_resource/_web_res_widget1.html.erb +++ b/modules/web_resource/_web_res_widget1.html.erb @@ -6,7 +6,7 @@
  • - {{img_description}} + {{img_description}}
    diff --git a/modules/web_resource/_web_res_widget2.html.erb b/modules/web_resource/_web_res_widget2.html.erb index 41e4694..bcb3f56 100644 --- a/modules/web_resource/_web_res_widget2.html.erb +++ b/modules/web_resource/_web_res_widget2.html.erb @@ -7,7 +7,7 @@
    - {{img_description}} + {{img_description}}
    diff --git a/modules/web_resource/_web_res_widget7.html.erb b/modules/web_resource/_web_res_widget7.html.erb index 702a940..96aa10f 100644 --- a/modules/web_resource/_web_res_widget7.html.erb +++ b/modules/web_resource/_web_res_widget7.html.erb @@ -6,7 +6,7 @@
  • - {{img_description}} + {{img_description}}
    diff --git a/modules/web_resource/_web_res_widget8.html.erb b/modules/web_resource/_web_res_widget8.html.erb index a3a4996..a1fb269 100644 --- a/modules/web_resource/_web_res_widget8.html.erb +++ b/modules/web_resource/_web_res_widget8.html.erb @@ -6,7 +6,7 @@
  • - {{img_description}} + {{img_description}}
    {{title}} diff --git a/modules/web_resource/_web_res_widget9.html.erb b/modules/web_resource/_web_res_widget9.html.erb index 82f1aa7..6b159c1 100644 --- a/modules/web_resource/_web_res_widget9.html.erb +++ b/modules/web_resource/_web_res_widget9.html.erb @@ -7,7 +7,7 @@
    - {{img_description}} + {{img_description}}
    {{title}} diff --git a/modules/web_resource/web_res_index1.html.erb b/modules/web_resource/web_res_index1.html.erb index 23715b0..cc5c3a7 100644 --- a/modules/web_resource/web_res_index1.html.erb +++ b/modules/web_resource/web_res_index1.html.erb @@ -6,7 +6,7 @@
  • - {{img_description}} + {{img_description}}

    {{title}} diff --git a/modules/web_resource/web_res_index2.html.erb b/modules/web_resource/web_res_index2.html.erb index f41769a..4bb2d57 100644 --- a/modules/web_resource/web_res_index2.html.erb +++ b/modules/web_resource/web_res_index2.html.erb @@ -6,7 +6,7 @@
  • - {{img_description}} + {{img_description}}