update

assets/javascripts/app.js

@@ -307,7 +307,13 @@
 
             $('.mobile-menu').toggleClass('active');
             $('body').toggleClass('noscroll');
-          $('.mobile-menu .navbar-toggle').removeClass('collapsed');
+
+            // ★ 修正：依據 active 狀態決定 collapsed 的加/移除
+            if ($('.mobile-menu').hasClass('active')) {
+              $('.mobile-menu .navbar-toggle').removeClass('collapsed'); // 打開 → 叉叉
+            } else {
+              $('.mobile-menu .navbar-toggle').addClass('collapsed');    // 關閉 → 三條橫線
+            }
 
             // 關閉所有下拉選單
             $('.mobile-menu1 > ul, .mobile-menu2 > ul').slideUp(500);
@@ -321,6 +327,34 @@
             }
           });
 
+          // ✅ Tab 鍵跳過 .mobile-menu 時，觸發收合邏輯
+          $(document).on('focusout', '.mobile-menu', function(e) {
+            setTimeout(function() {
+              var $newFocus = $(document.activeElement);
+
+              // 焦點在 body 時代表滑鼠正在點擊中，不處理
+              if ($newFocus.is('body')) return;
+
+              if ($('.mobile-menu').hasClass('active') && $newFocus.closest('.mobile-menu').length === 0) {
+
+                var $btn = $('.navbar-toggle').first();
+
+                if ($btn.attr('data-bs-toggle')) {
+                  var target = $btn.attr('data-bs-target');
+                  var bsCollapse = window.bootstrap && bootstrap.Collapse.getInstance($(target)[0]);
+                  if (bsCollapse) bsCollapse.hide();
+                  $('.mobile-menu').removeClass('active');
+                  $('body').removeClass('noscroll');
+                  $('.mobile-menu .navbar-toggle').addClass('collapsed');
+                  $('.mobile-menu1 > ul, .mobile-menu2 > ul').slideUp(500);
+                  $('.mobile-menu1 > .menu-drop, .mobile-menu2 > .menu-drop').removeClass('opened');
+                } else {
+                  $btn.trigger('click');
+                }
+              }
+            }, 50);
+          });
+
           $('.mobile-menu1 > .menu-drop').click(function(){
             var $that = $(this);
             var opencheck1 = $that.hasClass('opened');
@@ -865,7 +899,7 @@
                     var isLinkImage = $parentA.length > 0 && $parentA.text().replace(/\u00a0/g, '').trim() === "";
 
                     // --- 1. 處理「裝飾性圖片」標註 ---
-                    if (currentAlt === "announcement image" || currentAlt === "裝飾圖片" || currentTitle === "裝飾圖片") {
+                    if (currentAlt === "announcement image" || currentAlt === "裝飾圖片" || currentTitle === "裝飾圖片" || currentAlt === "這是一張圖片" || currentTitle === "這是一張圖片") {
                         $img.attr('alt', '');
                         $img.removeAttr('title');
                         return; 
@@ -1160,7 +1194,12 @@ $(function() {
       bars        : isEn ? 'Menu'                : '選單',
       print       : isEn ? 'Print this page'     : '列印此頁',
       share       : isEn ? 'Share'               : '分享至社群',
-        close       : isEn ? 'Close'          : '關閉視窗'
+      close       : isEn ? 'Close window'        : '關閉視窗',
+      closePopup  : isEn ? 'Close announcement'  : '關閉公告視窗',
+      closeGallery: isEn ? 'Close gallery'       : '關閉相簿',
+      toggleDesc  : isEn ? 'Show or hide image description' : '顯示或隱藏圖片說明',
+      themeSwitch : isEn ? 'Switch gallery theme': '切換相簿主題',
+      showOriginal: isEn ? 'Show original image' : '顯示原始圖片'
     };
 
     $('i').each(function() {
@@ -1173,7 +1212,50 @@ $(function() {
       // 特判：.close-screen-btn 內的圖示，移除無關的 sr-only 並設正確 aria-label
       if ($parent.hasClass('close-screen-btn')) {
         $parent.find('.sr-only').remove();
-          $parent.attr('aria-label', '關閉公告視窗');
+        $parent.attr('aria-label', labels.closePopup);
+        if ($icon.next('.sr-only').length === 0) {
+          $icon.after('<span class="sr-only">' + labels.closePopup + '</span>');
+        }
+        return;
+      }
+
+      // 特判：.gallery-close 內的圖示，移除錯誤的 sr-only 並補正確說明
+      if ($parent.closest('.gallery-close').length > 0) {
+        $parent.closest('.gallery-close').find('.sr-only').remove();
+        $parent.closest('.gallery-close').attr('aria-label', labels.closeGallery);
+        $parent.closest('.gallery-close').attr('role', 'button');
+        $parent.closest('.gallery-close').attr('tabindex', '0');
+        if ($icon.next('.sr-only').length === 0) {
+          $icon.after('<span class="sr-only">' + labels.closeGallery + '</span>');
+        }
+        return;
+      }
+
+      // 特判：.gallery-toggle-desc 補說明
+      if ($parent.closest('.gallery-toggle-desc').length > 0) {
+        var $toggleBtn = $parent.closest('.gallery-toggle-desc');
+        if (!$toggleBtn.attr('aria-label')) {
+          $toggleBtn.attr('aria-label', labels.toggleDesc);
+          $toggleBtn.attr('role', 'button');
+          $toggleBtn.attr('tabindex', '0');
+        }
+        if ($icon.next('.sr-only').length === 0) {
+          $icon.after('<span class="sr-only">' + labels.toggleDesc + '</span>');
+        }
+        return;
+      }
+
+      // 特判：.gallery-theme-switch 補說明
+      if ($parent.closest('.gallery-theme-switch').length > 0) {
+        var $themeBtn = $parent.closest('.gallery-theme-switch');
+        if (!$themeBtn.attr('aria-label')) {
+          $themeBtn.attr('aria-label', labels.themeSwitch);
+          $themeBtn.attr('role', 'button');
+          $themeBtn.attr('tabindex', '0');
+        }
+        if ($icon.next('.sr-only').length === 0) {
+          $icon.after('<span class="sr-only">' + labels.themeSwitch + '</span>');
+        }
         return;
       }
 
@@ -1207,16 +1289,13 @@ $(function() {
         else if (cls.includes('print'))                                labelText = labels.print;
         else if (cls.includes('share'))                                labelText = labels.share;
         else if (cls.includes('close') || cls.includes('times'))       labelText = labels.close;
+        else if (cls.includes('image') || cls.includes('photo'))       labelText = labels.showOriginal;
       }
 
       // --- 3. 執行補強 ---
       if (labelText !== '') {
-          if ($container.length > 0 && $container.text().trim() === '') {
-            $container.attr('aria-label', labelText);
-          } else {
         $icon.after('<span class="sr-only">' + labelText + '</span>');
       }
-        }
     });
   }
 
@@ -2736,6 +2815,9 @@ $(function() {
   var target = document.getElementById('gallery-theater-stage');
   if (!target) return;
 
+  // 頁面載入時若已存在 #gallery-theater-stage，則還原 z-index
+  $('.verticalhome').css('z-index', 'auto');
+
   var observer = new MutationObserver(function() {
     var display = target.style.display;
     if (display === 'block') {
@@ -2787,6 +2869,89 @@ $(document).ready(function() {
     subtree: true
   });
 
+});
+//萬用表格無障礙
+function fixSortLinkA11y() {
+  $('a').filter(function () {
+    return $(this).find('.universal-th-icon').length > 0;
+  }).each(function () {
+    var $link = $(this);
+
+    // === Step 1: 移除 display:none 的 span ===
+    $link.find('span').each(function () {
+      if ($(this).css('display') === 'none' || $(this).attr('style') && $(this).attr('style').indexOf('display: none') !== -1) {
+        $(this).remove();
+      }
+    });
+
+    // === Step 2: 取得 aria-label ===
+    var ariaLabel = $link.attr('aria-label') || '';
+
+    // 若 aria-label 空白或含未替換模板變數，從旁邊 .universal-th-text 補
+    if (!ariaLabel || ariaLabel.indexOf('{{') !== -1) {
+      var $th = $link.closest('th, div[class*="col-"]');
+      var colName = $th.find('.universal-th-text').text().trim();
+      ariaLabel = colName ? '重新排序' + colName : '排序';
+      $link.attr('aria-label', ariaLabel);
+    }
+
+    // === Step 3: 補上 title 屬性 ===
+    if (!$link.attr('title')) {
+      $link.attr('title', ariaLabel + '(在本視窗開啟)');
+    }
+
+    // === Step 4: 確保圖示有 aria-hidden ===
+    $link.find('.universal-th-icon').attr('aria-hidden', 'true');
+
+    // === Step 5: 補上 visually-hidden 連結文字 ===
+    if ($link.find('.visually-hidden').length === 0) {
+      $link.append('<span class="visually-hidden">' + ariaLabel + '</span>');
+    }
+  });
+}
+function fixSearchInputA11y() {
+  $('input[type="search"], input[type="text"]').each(function () {
+    var $input = $(this);
+
+    // 已有對應 label 就跳過
+    var inputId = $input.attr('id');
+    if (inputId && $('label[for="' + inputId + '"]').length) return;
+
+    // 已有 aria-label / aria-labelledby / title 就跳過
+    if ($input.attr('aria-label') || $input.attr('aria-labelledby') || $input.attr('title')) return;
+
+    // 從 placeholder 取得說明文字
+    var placeholder = $input.attr('placeholder') || '';
+
+    // 從最近的 th 或欄位標題取得欄位名稱
+    var colName = '';
+    var $th = $input.closest('th, div[class*="col-"]');
+    if ($th.length) {
+      colName = $th.find('.universal-th-text').text().trim();
+    }
+
+    // 組合標籤文字
+    var label = '';
+    if (colName && placeholder) {
+      label = colName + '搜尋';
+    } else if (colName) {
+      label = colName + '搜尋';
+    } else if (placeholder) {
+      label = placeholder;
+    } else {
+      label = '搜尋關鍵字';
+    }
+
+    $input.attr('aria-label', label);
+    $input.attr('title', label);
+  });
+}
+
+$(document).ready(function () {
+  setTimeout(function () {
+    fixSortLinkA11y();
+    fixSearchInputA11y();
+  }, 500);
 });
   // 執行 member等高計算，目前改用flexbox故mark掉 by ika 20160105
   // $(window).load(function() {

assets/stylesheets/template/base/_global.scss

@@ -11,6 +11,9 @@
     display: block
   }
 }
+#orbit-bar .orbit-bar-menu .orbit-bar-logo{
+  cursor: unset!important;
+}
 
 .login-btn:focus {
         outline: 0.3125em auto -webkit-focus-ring-color !important;

assets/stylesheets/template/modules/archives.scss

@@ -144,18 +144,18 @@
 .i-archive-title {
   @extend .unity-title;
 }
-.link { background-color: #1368d4 !important; } /* 對比 4.6:1 */
+.link { background-color: #1368d4 !important; margin-left: 0.5em; } /* 對比 4.6:1 */
-.txt  { background-color: #3a8a40 !important; } /* 對比 4.6:1 */
+.txt  { background-color: #3a8a40 !important; margin-left: 0.5em; } /* 對比 4.6:1 */
-.xlsx { background-color: #9e3050 !important; } /* 對比 4.6:1 */
+.xlsx { background-color: #9e3050 !important; margin-left: 0.5em; } /* 對比 4.6:1 */
-.pdf  { background-color: #2a7d36 !important; } /* 對比 4.6:1 */
+.pdf  { background-color: #2a7d36 !important; margin-left: 0.5em; } /* 對比 4.6:1 */
-.docx { background-color: #5e46a0 !important; } /* 對比 4.6:1 */
+.docx { background-color: #5e46a0 !important; margin-left: 0.5em; } /* 對比 4.6:1 */
-.doc  { background-color: #1368d4 !important; } /* 對比 4.6:1 */
+.doc  { background-color: #1368d4 !important; margin-left: 0.5em; } /* 對比 4.6:1 */
-.pptx { background-color: #3d4aa0 !important; } /* 對比 4.6:1 */
+.pptx { background-color: #3d4aa0 !important; margin-left: 0.5em; } /* 對比 4.6:1 */
-.jpg  { background-color: #8f3333 !important; } /* 對比 4.6:1 */
+.jpg  { background-color: #8f3333 !important; margin-left: 0.5em; } /* 對比 4.6:1 */
-.zip  { background-color: #8a6400 !important; } /* 對比 4.6:1 */
+.zip  { background-color: #8a6400 !important; margin-left: 0.5em; } /* 對比 4.6:1 */
-.rar  { background-color: #9e5000 !important; } /* 對比 4.6:1 */
+.rar  { background-color: #9e5000 !important; margin-left: 0.5em; } /* 對比 4.6:1 */
-.xls  { background-color: #3a8a40 !important; } /* 對比 4.6:1 */
+.xls  { background-color: #3a8a40 !important; margin-left: 0.5em; } /* 對比 4.6:1 */
-.odt  { background-color: #767676 !important; } /* 對比 4.6:1 */
+.odt  { background-color: #767676 !important; margin-left: 0.5em; } /* 對比 4.6:1 */
 .table>caption+thead>tr:first-child>td, .table>caption+thead>tr:first-child>th, .table>colgroup+thead>tr:first-child>td, .table>colgroup+thead>tr:first-child>th, .table>thead:first-child>tr:first-child>td, .table>thead:first-child>tr:first-child>th{
     // border-top: 0.0625em solid #ddd;
 }

modules/announcement/_annc_widget1.html.erb

@@ -7,7 +7,7 @@
 
       <div class="w-annc__img-wrap ">
         <a href="{{link_to_show}}" aria-label="前往{{widget-title}}" title="{{widget-title}}">
-         <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+         <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
         </a>
       </div>
       <div class="w-annc__meta">

modules/announcement/_annc_widget15.html.erb

@@ -27,7 +27,7 @@
     <li class="w-annc__item " >
     <div class="w-annc__img-wrap bullseye" style="position:relative">
 	<a href="{{link_to_show}}" aria-label="前往{{widget-title}}" title="{{widget-title}}">
-      <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+      <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
       <div class="transitionfade"></div>
     </a>
     </div>

modules/announcement/_annc_widget16.html.erb

@@ -22,7 +22,7 @@
 
     <div class="w-annc__item">
       <div class="w-annc__img-wrap">
-        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
       </div>
       <div class="w-annc__content-wrap">
         <div class="w-annc__meta">

modules/announcement/_annc_widget18.html.erb

@@ -9,7 +9,7 @@
     <li class="w-annc__item  col-sm-4">
 	    <div class="w-annc__img-wrap">
       <a href="{{link_to_show}}" aria-label="前往{{widget-title}}" title="{{widget-title}}">
-	      		<img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+	      		<img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
 	      </a>
 	    </div>
 	    <div class="w-annc__content-wrap">

modules/announcement/_annc_widget2.html.erb

@@ -6,7 +6,7 @@
     <li class="w-annc__item row">
       <div class="w-annc__img-wrap col-sm-4 bullseye">
       <a href="{{link_to_show}}" aria-label="前往{{widget-title}}" title="{{widget-title}}">
-        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
       </a>
       </div>
       <div class="w-annc__content-wrap col-sm-8">

modules/announcement/_annc_widget20.html.erb

@@ -9,7 +9,7 @@
     <li class="w-annc__item  col-md-4">
     <div class="w-annc__img-wrap bullseye" >
 	<a href="{{link_to_show}}" aria-label="前往{{widget-title}}" title="{{widget-title}}">
-      <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+      <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
       <div class="transitionfade"></div>
       </a>
     </div>

modules/announcement/_annc_widget21.html.erb

@@ -27,7 +27,7 @@
       <li class="w-annc__item">
         <div class="w-annc__img-wrap bullseye" >
         <a href="{{link_to_show}}" aria-label="前往{{widget-title}}" title="{{widget-title}}">
-          <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+          <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
           <div class="transitionfade"></div>
           </a>
         </div>

modules/announcement/_annc_widget23.html.erb

@@ -7,7 +7,7 @@
 
       <div class="w-annc__img-wrap ">
       <a href="{{link_to_show}}" aria-label="前往{{widget-title}}" title="{{widget-title}}">
-         <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+         <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
         </a>
       </div>
       <div class="w-annc__meta">

modules/announcement/_annc_widget24.html.erb

@@ -9,7 +9,7 @@
     <li class="w-annc__item  col-md-4">
     <div class="w-annc__img-wrap bullseye" >
 	<a href="{{link_to_show}}" aria-label="前往{{widget-title}}" title="{{widget-title}}">
-      <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+      <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
       <div class="transitionfade"></div>
       </a>
     </div>

modules/announcement/_annc_widget25.html.erb

@@ -29,7 +29,7 @@
       <li class="w-annc__item">
         <div class="w-annc__img-wrap bullseye" >
         <a href="{{link_to_show}}" aria-label="前往{{widget-title}}" title="{{widget-title}}">
-          <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+          <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
           <div class="transitionfade"></div>
           </a>
         </div>

modules/announcement/_annc_widget26.html.erb

@@ -7,7 +7,7 @@
 
       <div class="w-annc__img-wrap ">
         <a href="{{link_to_show}}" aria-label="前往{{widget-title}}" title="{{widget-title}}">
-         <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+         <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
         </a>
       </div>
       <div class="w-annc__content-wrap card">

modules/announcement/_annc_widget3.html.erb

@@ -24,7 +24,7 @@
         <p class="w-annc__subtitle">{{subtitle}}</p>
       </div>
       <div class="w-annc__img-wrap  col-sm-4 bullseye">
-        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
       </div>      
     </li>
   </ul>

modules/announcement/_annc_widget4.html.erb

@@ -9,7 +9,7 @@
     <li class="w-annc__item  col-md-4">
       <div class="w-annc__img-wrap bullseye" style="position:relative">
 	  <a href="{{link_to_show}}" aria-label="前往{{widget-title}}" title="{{widget-title}}">
-        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
         <div class="transitionfade"></div>
       </a>
       </div>

modules/custom_announcement/_annc_widget1.html.erb

@@ -5,7 +5,7 @@
   <ul class="w-annc__list" data-level="0" data-list="custom_announcements">
     <li class="w-annc__item">
       <div class="w-annc__img-wrap bullseye">
-        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
       </div>
       <div class="w-annc__meta">
         <span class="w-annc__status-wrap" data-list="statuses" data-level="1">

modules/custom_announcement/_annc_widget15.html.erb

@@ -12,7 +12,7 @@
   <ul class="w-annc__list  row" data-level="0" data-list="custom_announcements">
     <li class="w-annc__item  col-md-4">
     <div class="w-annc__img-wrap bullseye">
-      <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+      <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
     </div>
     <div class="w-annc__content-wrap">
       <div class="w-annc__meta">

modules/custom_announcement/_annc_widget16.html.erb

@@ -27,7 +27,7 @@
 
     <div class="w-annc__item">
       <div class="w-annc__img-wrap">
-        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
       </div>
       <div class="w-annc__content-wrap">
         <div class="w-annc__meta">

modules/custom_announcement/_annc_widget18.html.erb

@@ -9,7 +9,7 @@
     <li class="w-annc__item  col-md-4">
 	    <div class="w-annc__img-wrap">
 	    	<a href="{{link_to_show}}" title="{{title}}">
-	      		<img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+	      		<img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
 	      	</a>
 	    </div>
 	    <div class="w-annc__content-wrap">

modules/custom_announcement/_annc_widget2.html.erb

@@ -5,7 +5,7 @@
   <ul class="w-annc__list" data-level="0" data-list="custom_announcements">
     <li class="w-annc__item row">
       <div class="w-annc__img-wrap col-sm-4 bullseye">
-        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
       </div>
       <div class="w-annc__content-wrap col-sm-8">  
         <div class="w-annc__meta">

modules/custom_announcement/_annc_widget3.html.erb

@@ -24,7 +24,7 @@
         <p class="w-annc__subtitle">{{subtitle}}</p>
       </div>
       <div class="w-annc__img-wrap  col-sm-4 bullseye">
-        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
       </div>      
     </li>
   </ul>

modules/custom_announcement/_annc_widget4.html.erb

@@ -8,7 +8,7 @@
   <ul class="w-annc__list  row" data-level="0" data-list="custom_announcements">
     <li class="w-annc__item  col-md-4">
     <div class="w-annc__img-wrap bullseye">
-      <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+      <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
     </div>
     <div class="w-annc__content-wrap">
       <div class="w-annc__meta">

modules/custom_gallery/custom_gallery_index1.html.erb

@@ -6,7 +6,7 @@
     <div class="index-content col-xs-4 col-sm-3">
       <div class="index-content-inner">
         <div class="index-pic">
-          <img class="img-thumbnail" src="{{thumb-src}}" alt="{{alt_title}}">
+          <img class="img-thumbnail" src="{{thumb-src}}" alt="{{album-name}}">
         </div>
         <section class="index-part">
           <h4 class="index-content-title">

modules/custom_gallery/custom_gallery_index3.html.erb

@@ -6,7 +6,7 @@
     <div class="index-content col-xs-4 col-sm-3">
       <div class="index-content-inner">
         <div class="index-pic">
-          <img class="img-thumbnail" src="{{thumb-src}}" alt="{{alt_title}}">
+          <img class="img-thumbnail" src="{{thumb-src}}" alt="{{album-name}}">
         </div>
         <section class="index-part">
           <h4 class="index-content-title">

modules/event_news_mod/_event_news_widget1.html.erb

@@ -6,7 +6,7 @@
     <li class="w-annc__item">
       <div class="w-annc__img-wrap bullseye">
       <a href="{{link_to_show}}" aria-label="前往{{widget-title}}" title="{{widget-title}}">
-        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
       </a>
       </div>
       <div class="w-annc__meta">

modules/event_news_mod/_event_news_widget15.html.erb

@@ -24,7 +24,7 @@
     <li class="w-annc__item">
       <div class="w-annc__img-wrap bullseye" style="position:relative">
 	  <a href="{{link_to_show}}" aria-label="前往{{widget-title}}" title="{{widget-title}}">
-        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
         <div class="transitionfade"></div>
       </a>
       </div>

modules/event_news_mod/_event_news_widget2.html.erb

@@ -6,7 +6,7 @@
     <li class="w-annc__item row">
       <div class="w-annc__img-wrap col-sm-4 bullseye">
       <a href="{{link_to_show}}" aria-label="前往{{widget-title}}" title="{{widget-title}}">
-        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
         </a>
       </div>
       <div class="w-annc__content-wrap col-sm-8">

modules/event_news_mod/_event_news_widget20.html.erb

@@ -6,7 +6,7 @@
     <li class="w-annc__item  col-md-4">
     <div class="w-annc__img-wrap bullseye" >
 	<a href="{{link_to_show}}" aria-label="前往{{widget-title}}" title="{{widget-title}}">
-      <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+      <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
       <div class="transitionfade"></div>
       </a>
     </div>

modules/event_news_mod/_event_news_widget21.html.erb

@@ -24,7 +24,7 @@
       <li class="w-annc__item">
         <div class="w-annc__img-wrap bullseye" >
         <a href="{{link_to_show}}" aria-label="前往{{widget-title}}" title="{{widget-title}}">
-          <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+          <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
           <div class="transitionfade"></div>
           </a>
         </div>

modules/event_news_mod/_event_news_widget22.html.erb

@@ -21,7 +21,7 @@
     <li class="w-annc__item  col-md-4">
     <div class="w-annc__img-wrap bullseye">
 	<a href="{{link_to_show}}" aria-label="前往{{widget-title}}" title="{{widget-title}}">
-      <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+      <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
     </a>
     </div>
     <div class="w-annc__content-wrap">

modules/event_news_mod/_event_news_widget3.html.erb

@@ -24,7 +24,7 @@
         <p class="w-annc__subtitle">{{subtitle}}</p>
       </div>
       <div class="w-annc__img-wrap  col-sm-4 bullseye">
-        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
       </div>
     </li>
   </ul>

modules/event_news_mod/_event_news_widget4.html.erb

@@ -9,7 +9,7 @@
     <li class="w-annc__item  col-md-4">
       <div class="w-annc__img-wrap bullseye" style="position:relative">
 	  <a href="{{link_to_show}}" aria-label="前往{{widget-title}}" title="{{widget-title}}">
-        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
+        <img class="w-annc__img" src="{{img_src}}" alt="{{img_description}}">
         <div class="transitionfade"></div>
       </a>
       </div>

modules/gallery/gallery_index1.html.erb

@@ -4,15 +4,16 @@
   </h3>
   <div class="row" data-level="0" data-list="albums" style="display: flex;flex-wrap: wrap;">
     <div class="index-content col-sm-3">
-      <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">
+      
       <div class="index-content-inner">
+        <a href="{{link_to_show}}" title="{{album-name}}">
         <div class="index-pic">
-          <img class="img-thumbnail" src="{{thumb-src}}" alt="{{alt_title}}">
+          <img class="img-thumbnail" src="{{thumb-src}}" alt="{{album-name}}">
         </div>
         </a>
         <div class="index-part">
           <h4 class="index-content-title">
-            <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">{{album-name}}</a>
+            <a href="{{link_to_show}}" title="{{album-name}}">{{album-name}}</a>
           </h4>
           <div class="index-img-description">{{album-description}}</div>
         </div>

modules/gallery/gallery_index2.html.erb

@@ -5,14 +5,14 @@
   <div class="row" data-level="0" data-list="albums" style="display: flex;flex-wrap: wrap;">
     <div class="index-content">
       <div class="index-content-inner clearfix row">
-       <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">
+       <a href="{{link_to_show}}" aria-label="前往{{album-name}}" title="{{album-name}}">
         <div class="index-pic col-xs-5 col-sm-2">
           <img class="index-img" src="{{thumb-src}}" alt="{{alt_title}}">
         </div>
         </a>
         <div class="index-part col-xs-7 col-sm-10">
           <h4 class="index-content-title">
-           <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">{{album-name}}</a>
+           <a href="{{link_to_show}}" aria-label="前往{{album-name}}" title="{{album-name}}">{{album-name}}</a>
           </h4>
           <div class="index-img-description">{{album-description}}</div>
         </div>

modules/gallery/gallery_index3.html.erb

@@ -4,15 +4,15 @@
   </h3>
   <div class="row" data-level="0" data-list="albums" style="display: flex;flex-wrap: wrap;">
     <div class="index-content col-sm-3">
-      <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">
+      <a href="{{link_to_show}}" aria-label="前往{{album-name}}" title="{{album-name}}">
         <div class="index-content-inner">
           <div class="index-pic">
-            <img class="img-thumbnail" src="{{thumb-src}}" alt="{{alt_title}}">
+            <img class="img-thumbnail" src="{{thumb-src}}" alt="{{album-name}}">
           </div>
       </a>
         <div class="index-part">
             <h4 class="index-content-title">
-              <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">{{album-name}}</a>
+              <a href="{{link_to_show}}" aria-label="前往{{album-name}}" title="{{album-name}}">{{album-name}}</a>
             </h4>
         </div>
     </div>

modules/gallery/gallery_index4.html.erb

@@ -5,14 +5,14 @@
   <div class="row" data-level="0" data-list="albums" style="display: flex;flex-wrap: wrap;">
     <div class="index-content">
       <div class="index-content-inner clearfix row">
-        <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">
+        <a href="{{link_to_show}}" aria-label="前往{{album-name}}" title="{{album-name}}">
           <div class="index-pic col-xs-5 col-sm-2">
             <img class="index-img" src="{{thumb-src}}" alt="{{alt_title}}">
           </div>
         </a>
         <div class="index-part col-xs-7 col-sm-10">
             <h4 class="index-content-title">
-              <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">{{album-name}}</a>
+              <a href="{{link_to_show}}" aria-label="前往{{album-name}}" title="{{album-name}}">{{album-name}}</a>
             </h4>
         </div>
 

modules/gallery/gallery_index5.html.erb

@@ -8,11 +8,11 @@
 
         <div class="card-front">
           <div class="card-body" style="padding:0;">
-          <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">
+          <a href="{{link_to_show}}" aria-label="前往{{album-name}}" title="{{album-name}}">
             <img src="{{thumb-src}}"alt="{{alt_title}}">
             </a>
             <div class="card-footer">
-            <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">
+            <a href="{{link_to_show}}" aria-label="前往{{album-name}}" title="{{album-name}}">
               <h3 class="card-title">{{album-name}}</h3>
             </a>
             </div>

modules/gallery/gallery_index6.html.erb

@@ -6,14 +6,14 @@
     <div class="index-content  col-sm-3">
 
         <div class="index-content-inner">
-          <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">
+          <a href="{{link_to_show}}" aria-label="前往{{album-name}}" title="{{album-name}}">
           <div class="index-pic">
-            <img class="img-thumbnail" src="{{thumb-src}}" alt="{{alt_title}}">
+            <img class="img-thumbnail" src="{{thumb-src}}" alt="{{album-name}}">
           </div>
           </a>
           <section class="index-part">
             <h4 class="index-content-title">
-              <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">{{album-name}}</a>
+              <a href="{{link_to_show}}" aria-label="前往{{album-name}}" title="{{album-name}}">{{album-name}}</a>
             </h4>
           </section>
         </div>