diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js
index 23882ba..7a54bfd 100644
--- a/assets/javascripts/app.js
+++ b/assets/javascripts/app.js
@@ -1187,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() {
diff --git a/modules/archive/archive_index1.html.erb b/modules/archive/archive_index1.html.erb
index a43b4ec..6049889 100644
--- a/modules/archive/archive_index1.html.erb
+++ b/modules/archive/archive_index1.html.erb
@@ -17,8 +17,7 @@
-
- {{file-name}}
- {{file-type}}
+ {{file-name}}{{file-type}}
diff --git a/modules/archive/archive_index14.html.erb b/modules/archive/archive_index14.html.erb
index 619ab08..8a62923 100644
--- a/modules/archive/archive_index14.html.erb
+++ b/modules/archive/archive_index14.html.erb
@@ -18,8 +18,7 @@
diff --git a/modules/member/member_index2.html.erb b/modules/member/member_index2.html.erb
index fd9f416..1b55e70 100644
--- a/modules/member/member_index2.html.erb
+++ b/modules/member/member_index2.html.erb
@@ -100,16 +100,20 @@ $(function () {
const $profileList = $item.find('.i-member-profile-list');
const $target = $item.find('.member-details .member-intro');
- // 保護:必要元素不存在就跳過
if (!$profileList.length || !$target.length) return;
- // 取倒數兩個 .i-member-profile-item
- const $lastTwoItems = $profileList
- .children('.i-member-profile-item')
- .slice(-2);
+ // 只抓包含 .member-data-title-6 的 profile-item
+ const $item6 = $item
+ .find('.i-member-profile-item')
+ .has('.member-data-title-6');
- // 移動到 member-intro 裡
- $lastTwoItems.appendTo($target);
+ // 只抓包含 .member-data-title-7 的 profile-item
+ const $item7 = $item
+ .find('.i-member-profile-item')
+ .has('.member-data-title-7');
+
+ $item6.appendTo($target);
+ $item7.appendTo($target);
});
diff --git a/modules/web_resource/_web_res_widget1.html.erb b/modules/web_resource/_web_res_widget1.html.erb
index d42d07e..921269f 100644
--- a/modules/web_resource/_web_res_widget1.html.erb
+++ b/modules/web_resource/_web_res_widget1.html.erb
@@ -6,7 +6,7 @@
{{title}}
diff --git a/modules/web_resource/_web_res_widget10.html.erb b/modules/web_resource/_web_res_widget10.html.erb
index dd5dd1f..bd25f4d 100644
--- a/modules/web_resource/_web_res_widget10.html.erb
+++ b/modules/web_resource/_web_res_widget10.html.erb
@@ -6,7 +6,7 @@
diff --git a/modules/web_resource/_web_res_widget11.html.erb b/modules/web_resource/_web_res_widget11.html.erb
index 0c4026e..3a34e0f 100644
--- a/modules/web_resource/_web_res_widget11.html.erb
+++ b/modules/web_resource/_web_res_widget11.html.erb
@@ -6,7 +6,7 @@
{{title}}
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 @@
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 @@
-

+