From 11c686efdc056f186ade9ea8698522a370be99fd Mon Sep 17 00:00:00 2001
From: kenlee <poopooken11@gmail.com>
Date: Mon, 24 Mar 2025 17:56:51 +0800
Subject: [PATCH] 'refresh'

---
 assets/javascripts/app.js                     | 613 ++++++++---
 .../stylesheets/template/layout/header.scss   |   1 +
 .../template/modules/ad_banner.scss           |  91 +-
 .../template/modules/announcement.scss        | 708 +++++++------
 .../template/modules/archives.scss            |   1 +
 .../template/modules/calendar.scss            | 481 +++++++--
 .../stylesheets/template/modules/epaper.scss  |  17 +-
 .../template/modules/event_news.scss          |  33 +-
 .../stylesheets/template/modules/gallery.scss |   1 +
 .../stylesheets/template/modules/member.scss  |  77 ++
 .../template/modules/text_marquee.scss        |  29 +-
 .../template/modules/universal-table.scss     |  23 +-
 .../stylesheets/template/modules/video.scss   | 963 ++++++++++++++++++
 .../template/modules/web_resource.scss        |  43 +-
 modules/ad_banner/_ad_banner_widget0.html.erb |   5 +-
 modules/ad_banner/_ad_banner_widget1.html.erb |   5 +-
 .../_ad_banner_widget2_video.html.erb         |   5 +-
 modules/ad_banner/_ad_banner_widget3.html.erb |   5 +-
 modules/ad_banner/_ad_banner_widget5.html.erb |   5 +-
 .../ad_banner/_ad_banner_widget6.html .erb    |   5 +-
 modules/ad_banner/_ad_banner_widget7.html.erb |  12 +-
 .../_ad_banner_widget8_video.html.erb         |   5 +-
 modules/announcement/_annc_widget1.html.erb   |   2 +-
 modules/announcement/_annc_widget15.html.erb  |   2 +-
 modules/announcement/_annc_widget16.html.erb  |   4 +-
 modules/announcement/_annc_widget18.html.erb  |   6 +-
 modules/announcement/_annc_widget19.html.erb  |   2 +-
 modules/announcement/_annc_widget2.html.erb   |   2 +-
 modules/announcement/_annc_widget20.html.erb  |   2 +-
 modules/announcement/_annc_widget21.html.erb  |   2 +-
 modules/announcement/_annc_widget23.html.erb  |  33 +
 modules/announcement/_annc_widget24.html.erb  | 111 ++
 modules/announcement/_annc_widget4.html.erb   |   2 +-
 modules/announcement/annc_index20.html.erb    |   8 +-
 modules/announcement/annc_index21.html.erb    |   4 +-
 modules/announcement/info.json                |  16 +
 modules/announcement/show.html.erb            |   2 +-
 .../thumbs/annc_widget23_thumbs.png           | Bin 0 -> 12280 bytes
 .../thumbs/annc_widget24_thumbs.png           | Bin 0 -> 13396 bytes
 modules/archive/archive_index16.html.erb      |   3 +
 modules/calendar/index.html.erb               |  10 +-
 modules/e_paper/epaper_index1.html.erb        |   4 +-
 modules/e_paper/epaper_index2.html.erb        |   8 +-
 .../_event_news_widget1.html.erb              |   2 +-
 .../_event_news_widget15.html.erb             |  15 +-
 .../_event_news_widget2.html.erb              |   2 +
 .../_event_news_widget20.html.erb             |  15 +-
 .../_event_news_widget21.html.erb             |  14 +-
 .../_event_news_widget22.html.erb             |   2 +-
 .../_event_news_widget4.html.erb              |   2 +-
 modules/event_news_mod/show.html.erb          |   2 +-
 modules/event_news_mod/show2.html.erb         |   2 +-
 modules/faq/faq_index2.html.erb               |   2 +-
 modules/gallery/gallery_index1.html.erb       |  11 +-
 modules/gallery/gallery_index2.html.erb       |  11 +-
 modules/gallery/gallery_index3.html.erb       |  11 +-
 modules/gallery/gallery_index4.html.erb       |  13 +-
 modules/gallery/gallery_index5.html.erb       |  26 +-
 modules/gallery/gallery_index6.html.erb       |   8 +-
 modules/member/info.json                      |   8 +
 modules/member/member_index2.html.erb         |   2 +-
 modules/member/member_index3.html.erb         |   2 +-
 modules/member/member_index5.html.erb         |   2 +-
 modules/member/member_index7.html.erb         |  38 +
 modules/member/thumbs/member_index4_thumb.png | Bin 0 -> 7101 bytes
 modules/member/thumbs/member_index5_thumb.png | Bin 0 -> 6136 bytes
 modules/member/thumbs/member_index7_thumb.png | Bin 0 -> 6149 bytes
 modules/property_hire/index_calendar.html.erb |  12 +-
 .../publication/publications_index2.html.erb  |   2 +-
 .../publication/publications_index3.html.erb  |   2 +-
 modules/universal_table/index.html.erb        |   4 +-
 modules/universal_table/index2.html.erb       |   4 +-
 modules/video_pro/_video_pro_widget1.html.erb |  33 +-
 modules/video_pro/_video_pro_widget2.html.erb |  59 ++
 modules/video_pro/_video_pro_widget3.html.erb | 129 +++
 modules/video_pro/_video_pro_widget4.html.erb |  47 +
 modules/video_pro/_video_pro_widget5.html.erb | 176 ++++
 modules/video_pro/info.json                   |  53 +-
 modules/video_pro/video_pro_index1.html.erb   |   9 +-
 modules/video_pro/video_pro_index2.html.erb   |   8 +-
 .../video_pro/video_pro_index2_tag.html.erb   |   6 -
 modules/video_pro/video_pro_index3.html.erb   |  10 +-
 modules/video_pro/video_pro_index4.html.erb   | 162 +++
 .../video_pro_index_post_agency1.html.erb     |   8 +-
 .../web_resource/_web_res_widget2.html.erb    |   1 +
 .../web_resource/_web_res_widget3.html.erb    |   4 -
 86 files changed, 3485 insertions(+), 785 deletions(-)
 create mode 100644 assets/stylesheets/template/modules/video.scss
 create mode 100644 modules/announcement/_annc_widget23.html.erb
 create mode 100644 modules/announcement/_annc_widget24.html.erb
 create mode 100644 modules/announcement/thumbs/annc_widget23_thumbs.png
 create mode 100644 modules/announcement/thumbs/annc_widget24_thumbs.png
 create mode 100644 modules/member/member_index7.html.erb
 create mode 100644 modules/member/thumbs/member_index4_thumb.png
 create mode 100644 modules/member/thumbs/member_index5_thumb.png
 create mode 100644 modules/member/thumbs/member_index7_thumb.png
 create mode 100644 modules/video_pro/_video_pro_widget2.html.erb
 create mode 100644 modules/video_pro/_video_pro_widget3.html.erb
 create mode 100644 modules/video_pro/_video_pro_widget4.html.erb
 create mode 100644 modules/video_pro/_video_pro_widget5.html.erb
 create mode 100644 modules/video_pro/video_pro_index4.html.erb

diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js
index 4849751..62c8615 100644
--- a/assets/javascripts/app.js
+++ b/assets/javascripts/app.js
@@ -55,14 +55,14 @@
       },
 
       // 外掛，所有的外掛都可以放到這個物件裡
-      plugins: {
-        // 自適應圖片裁切，Ray的外掛
-        bullEye: function() {
-          $('.bullseye').bullseye({
-            fadeEffect: false
-          });
-        }
-      },
+      // plugins: {
+      //   // 自適應圖片裁切，Ray的外掛
+      //   bullEye: function() {
+      //     $('.bullseye').bullseye({
+      //       fadeEffect: false
+      //     });
+      //   }
+      // },
 
       // nav: {
         // 自適應使用的下拉選單
@@ -411,7 +411,7 @@
     initdata1();
     orbit.sitemenuDropdown();
     orbit.goBackTop('top', 800);
-    orbit.plugins.bullEye();
+    // orbit.plugins.bullEye();
     orbit.setColumn('.left-column', '.right-column');
 
     // 自適應網頁使用，當網頁載入時，如果視窗寬度小於769，就執行orbit.nav.setDropdown函數
@@ -465,83 +465,344 @@
     //   $('.header-buttom').appendTo($('.dropdowns'));
     // }
   function forFreeGo() {
+    if (document.documentElement.lang === 'zh_tw') {
+      document.documentElement.lang = 'zh-Hant';
+    }    
+    //tab鍵按下
+    $(document).on('keydown', function(e) {
+      if (e.key === "Tab" || e.keyCode === 9) {
+        $('.header-nav, .dropdowns').css('display', 'block');
+      }
+    });
+
+    //li被hover
+    $('li').hover(
+      function() {
+        $(this).children('ul').addClass('show');
+      },
+      function() {
+        $(this).children('ul').removeClass('show');
+      }
+    );
+    //刪除空的h1
+    $('h1').each(function() {
+      if ($(this).text().trim() === '') {
+          $(this).remove();
+      }
+    });
+    //
+    // $('.epaper-index2-container h4 a').each(function() {
+    //   var $this = $(this);
+    //   // 取得 a 內部的純文字內容，移除前後空白
+    //   var textContent = $this.text().trim();
+    //   // 檢查 a 內部是否所有子元素都是 display: none
+    //   var hasVisibleContent = $this.children().filter(function() {
+    //       return $(this).css('display') !== 'none';
+    //   }).length > 0;
+    //   // 如果 a 內部沒有純文字，且內部所有元素都是 display: none，則刪除該 a
+    //   if (textContent === '' || !hasVisibleContent) {
+    //       $this.remove();
+    //   }
+    // });
+    //refresh_btn加上aria-label
+    $('#refresh_btn').each(function() {
+      var $this = $(this);
+
+      // 如果 button 尚未有 aria-label，則新增
+      if (!$this.attr('aria-label')) {
+          $this.attr('aria-label', '重新整理');
+      }
+    });
+    //無障礙會員表格刪除沒有顯示的th
+    $('.i-member-tr-head').each(function() {
+      if ($(this).css('display') === 'none') {
+          $(this).remove();
+      }
+    });
+      //無障礙公告a是空的
+      $('.w-annc__subtitle').each(function () {
+        var $this = $(this);
+        var $link = $this.find('a');
+
+        // 檢查 a 是否存在，且去除空白後是否為空字串
+        if ($link.length && $link.text().trim() === '') {
+            $this.remove(); // 移除外層 .w-annc__subtitle
+        }
+      });
+        //無障礙單位轉換
+        $("[style*='font-size']").each(function() {
+          var fontSize = $(this).css("font-size");
+          if (fontSize.includes("px")) {
+              var pxValue = parseFloat(fontSize); // 取得數值
+              var emValue = pxValue / 16; // 假設 1em = 16px
+              $(this).css("font-size", emValue + "em");
+          }
+        });
+        $("[style*='font-size']").each(function() {
+          var fontSize = $(this).css("font-size");
+          if (fontSize.includes("pt")) {
+              var ptValue = parseFloat(fontSize); // 取得數值
+              var emValue = ptValue / 12; // 1em = 12pt（一般轉換標準）
+              $(this).css("font-size", emValue + "em");
+          }
+       });
+       $("table").each(function() {
+            $(this).find("tr").each(function(rowIndex) {
+                $(this).find("th").each(function(colIndex) {
+                    if (rowIndex === 0) {
+                        // 第一列的 th，適用於該欄
+                        $(this).attr("scope", "col");
+                    } else if (colIndex === 0) {
+                        // 其他列的第一個 th，適用於該行
+                        $(this).attr("scope", "row");
+                    }
+                });
+            });
+        });
+        $(".banner-pager button").addClass('banner-pagerbtn');
+        $(".banner-pager button").attr("type","button");
+        $(".banner-pager button").append('<span style="display: none;">下一張</span>');
+        $("button").attr("role", "button");
+        $("select").attr("title","選擇類別");
+        $(".jarallax-video-audio").attr("role", "button");
+        $('button').each(function() {
+          var $this = $(this);
+          if (!$this.attr('title') || $this.attr('title').trim() === '') {
+            $this.attr('title', '按鈕');
+          }
+        });        
+        $('img').each(function() {
+          var $this = $(this);
+          if (!$this.attr('alt') || $this.attr('alt').trim() === '') {
+            $this.attr('alt', '這是一張圖片');
+          }
+        });    
+        $('img').each(function() {
+          var $this = $(this);
+          if (!$this.attr('title') || $this.attr('title').trim() === '') {
+            $this.attr('title', '這是一張圖片');
+          }
+        });
+        $(".w-annc__img-wrap a").each(function () {
+          var $this = $(this);
+          // 確保 <a> 內沒有文字節點 (避免重複添加)
+          if ($this.text().trim() === "") {
+              $this.append('<span class="sr-only">公告圖片</span>');
+          }
+      });
+        $(".widget-link__widget-title").each(function () {
+          if ($(this).text().trim() === "") {
+              $(this).append('<span class="sr-only">公告標題</span>');
+          }
+          });
+        $(".sitemenu-title").each(function () {
+        if ($(this).text().trim() === "") {
+            $(this).append('<span class="sr-only">次選單</span>');
+        }
+        });
+        $(".annc-title").each(function () {
+          if ($(this).text().trim() === "") {
+              $(this).append('<span class="sr-only">內頁公告標題</span>');
+          }
+        });
+        $(".event-annc-title").each(function () {
+          if ($(this).text().trim() === "") {
+              $(this).append('<span class="sr-only">內頁活動公告標題</span>');
+          }
+        });
+        $(".show-title").each(function () {
+          if ($(this).text().trim() === "") {
+              $(this).append('<span class="sr-only">內頁活動公告標題</span>');
+          }
+        });
+        $(".w-annc__widget-title").each(function () {
+          if ($(this).text().trim() === "") {
+              $(this).append('<span class="sr-only">公告標題</span>');
+          }
+        });
+        $(".widget-title").each(function () {
+          if ($(this).text().trim() === "") {
+              $(this).append('<span class="sr-only">網路資源標題</span>');
+          }
+        });
+        $(".widget-title").each(function () {
+          if ($(this).text().trim() === "") {
+              $(this).append('<span class="sr-only">網路資源標題</span>');
+          }
+        });
+        $('input').each(function() {
+          var $this = $(this);
+          if (!$this.attr('title') || $this.attr('title').trim() === '') {
+            $this.attr('title', '網內搜尋');
+          }
+        });
+        $('.rucaptcha-image').each(function() {
+          var $button = $(this).next('button'); // 取得緊接在 .rucaptcha-image 之後的 button
+          if ($button.length && !$button.attr('aria-label')) {
+              $button.attr('aria-label', '播放驗證碼語音');
+          }
+        });
+  // 幫有連結目的之所有a標籤加上aria-label
+    $('a').each(function() {
+      var $this = $(this);
+
+      // 如果 <a> 已經有 aria-label，則跳過
+      if ($this.attr('aria-label')) return;
+
+      var href = $this.attr('href');
+      if (!href) return; // 如果沒有 href，則跳過
+
+      var ariaLabel = "";
+
+      // 加入開啟方式
+      if ($this.attr('target') === '_self') {
+          ariaLabel += '在本視窗開啟 ';
+      } else if ($this.attr('target') === '_blank') {
+          ariaLabel += '在新視窗開啟 ';
+      }
+
+      // 取得 <a> 的文字內容
+      var linkText = $this.text().trim();
+      if (linkText) {
+          ariaLabel += linkText;
+      } else if ($this.children('span').length === 1) {
+          ariaLabel += $this.children('span').text().trim();
+      }
+          // 如果包含 <i> 圖示，標示為 icon
+      if ($this.find('i').length) {
+        ariaLabel = "這是 icon";
+      }
+
+      // 如果是圖片連結，標示為照片
+      if ($this.find('img').length) {
+          ariaLabel = "這是一張照片";
+      }
+
+      // 設定 aria-label
+      if (ariaLabel) {
+          $this.attr('aria-label', ariaLabel);
+      }
+  });
+
     // 幫有連結目的之所有a標籤加上title
-  for(var i=0;i<$('a').length;i++){
-		if($('a').eq(i).attr("href") != "" || $('a').eq(i).attr("href") != undefined ){
-		var titlestr="";
-		if($('a').eq(i).attr('target')=='_self')
-			titlestr += '在本視窗開啟 ';
-		else if($('a').eq(i).attr('target') == '_blank')
-			titlestr += '在新視窗開啟 ';
-		if($('a').eq(i).attr('title') == "" || $('a').eq(i).attr('title')==undefined && $('a').eq(i).html().search('</') == -1)
-			titlestr += $('a').eq(i).html().trim();
-		else if($('a').eq(i).attr('title') == "" || $('a').eq(i).attr('title') == undefined && $('a').eq(i).find('>span').length==1)
-			titlestr += $('a').eq(i).find('>span').html().trim();
-		else if($('a').eq(i).attr('title') == "" || $('a').eq(i).attr('title') == undefined){
-			try{
-			if($('a').eq(i).html().trim().split('>').length==2)
-				titlestr += $('a').eq(i).html().trim().split('>')[1].trim();
-			else if($('a').eq(i).html().trim().split('>').length==3)
-				titlestr += $('a').eq(i).html().trim().split('>')[2].trim();
-			}catch(e){};
-		}
-		else
-			titlestr += $('a').eq(i).attr('title');
-		if(titlestr.search('<img') != -1)
-			titlestr = "這是一張照片";
-		if(titlestr != "")
-			$('a').eq(i).attr('title',titlestr);
-		};
-	};
+    $('a').each(function() {
+      var $this = $(this);
+      var href = $this.attr('href');
+      if (!href) return; // 沒有 href 就跳過
+      // 如果 <a> 已經有 title 屬性，則不進行修改
+      if ($this.attr('title')) return;
+      var titlestr = "";
+      // 加入開啟方式
+      if ($this.attr('target') == '_self') {
+          titlestr += '在本視窗開啟 ';
+      } else if ($this.attr('target') == '_blank') {
+          titlestr += '在新視窗開啟 ';
+      }
+      // 決定 title 內容
+      var linkText = $this.text().trim();
+      if (linkText) {
+          titlestr += linkText;
+      } else if ($this.children('span').length == 1) {
+          titlestr += $this.children('span').text().trim();
+      }
+      // 如果是圖片連結，標示為照片
+      if ($this.find('img').length) {
+          titlestr = "這是一張照片";
+      }
+      // 設定 title
+      if (titlestr) {
+          $this.attr('title', titlestr);
+      }
+   });
+
+  // for(var i=0;i<$('a').length;i++){
+  //  if($('a').eq(i).attr("href") != "" || $('a').eq(i).attr("href") != undefined ){
+  //  var titlestr="";
+  //  if($('a').eq(i).attr('target')=='_self')
+  //    titlestr += '在本視窗開啟 ';
+  //  else if($('a').eq(i).attr('target') == '_blank')
+  //    titlestr += '在新視窗開啟 ';
+  //  if($('a').eq(i).attr('title') == "" || $('a').eq(i).attr('title')==undefined && $('a').eq(i).html().search('</') == -1)
+  //    titlestr += $('a').eq(i).html().trim();
+  //  else if($('a').eq(i).attr('title') == "" || $('a').eq(i).attr('title') == undefined && $('a').eq(i).find('>span').length==1)
+  //    titlestr += $('a').eq(i).find('>span').html().trim();
+  //  else if($('a').eq(i).attr('title') == "" || $('a').eq(i).attr('title') == undefined){
+  //    try{
+  //    if($('a').eq(i).html().trim().split('>').length==2)
+  //      titlestr += $('a').eq(i).html().trim().split('>')[1].trim();
+  //    else if($('a').eq(i).html().trim().split('>').length==3)
+  //      titlestr += $('a').eq(i).html().trim().split('>')[2].trim();
+  //    }catch(e){};
+  //  }
+  //  else
+  //    titlestr += $('a').eq(i).attr('title');
+  //  if(titlestr.search('<img') != -1)
+  //    titlestr = "這是一張照片";
+  //  if(titlestr != "")
+  //    $('a').eq(i).attr('title',titlestr);
+  //  };
+  // };
+
   // 刪除banner-slide的空連結和空連結目標
-	for(var i=0;i<$('.w-ba-banner__slide a').length;i++){
-		if($('.w-ba-banner__slide a').eq(i).attr('href')=="")
-			$('.w-ba-banner__slide a').eq(i).removeAttr('href');
-		if($('.w-ba-banner__slide a').eq(i).attr('target') == "")
-			$('.w-ba-banner__slide a').eq(i).removeAttr('target');
-	};
-	// 幫無標題之iframe加上title
-	for(var i=0;i<$('iframe').length;i++)
-		if($('iframe').eq(i).attr('title')=="" || $('iframe').eq(i).attr('title')== undefined ){
-			if($('iframe').eq(i).attr('src').search('facebook') != -1 )
-				$('iframe').eq(i).attr('title','facebook');
-			else if($('iframe').eq(i).attr('src').search('google') != -1 )
-				$('iframe').eq(i).attr('title','google');
-			else if($('iframe').eq(i).attr('src').search('youtube') != -1 )
-				$('iframe').eq(i).attr('title','youtube');
-			else if($('iframe').eq(i).attr('src').search('twitframe') != -1 )
-				$('iframe').eq(i).attr('title','twitter');
-			else
-				$('iframe').eq(i).attr('title','unknown');
-		};
-	// 刪除空的檔案室
-	var archievelen = $('dd a.i-archive-files-item').length;
-	for(i=archievelen-1;i>=0;i--)
-		if($('dd a.i-archive-files-item').eq(i).html().trim()=="")
-			$('dd a.i-archive-files-item').eq(i).parent('dd').remove();
+  for(var i=0;i<$('.w-ba-banner__slide a').length;i++){
+    if($('.w-ba-banner__slide a').eq(i).attr('href')=="")
+      $('.w-ba-banner__slide a').eq(i).removeAttr('href');
+    if($('.w-ba-banner__slide a').eq(i).attr('target') == "")
+      $('.w-ba-banner__slide a').eq(i).removeAttr('target');
+  };
+  // 幫無標題之iframe加上title
+  for(var i=0;i<$('iframe').length;i++)
+    if($('iframe').eq(i).attr('title')=="" || $('iframe').eq(i).attr('title')== undefined ){
+      if($('iframe').eq(i).attr('src').search('facebook') != -1 )
+        $('iframe').eq(i).attr('title','facebook');
+      else if($('iframe').eq(i).attr('src').search('google') != -1 )
+        $('iframe').eq(i).attr('title','google');
+      else if($('iframe').eq(i).attr('src').search('youtube') != -1 )
+        $('iframe').eq(i).attr('title','youtube');
+      else if($('iframe').eq(i).attr('src').search('twitframe') != -1 )
+        $('iframe').eq(i).attr('title','twitter');
+      else
+        $('iframe').eq(i).attr('title','unknown');
+    };
+    //button是空的就加上內容
+    $('button').each(function() {
+      var $this = $(this);
+      var titleText = $this.attr('title') || '';
+
+      // 檢查 button 是否是空的（沒有可見文字或子元素）
+      if ($this.text().trim() === '' && !$this.children().length && titleText) {
+          // 新增隱藏的 span，內容為 title
+          $this.append('<span class="sr-only">' + titleText + '</span>');
+      }
+  });
+  // 刪除空的檔案室
+  var archievelen = $('dd a.i-archive-files-item').length;
+  for(i=archievelen-1;i>=0;i--)
+    if($('dd a.i-archive-files-item').eq(i).html().trim()=="")
+      $('dd a.i-archive-files-item').eq(i).parent('dd').remove();
   // 刪除具有空連結欄位的橫列
-	for(var i = 0;i < $('*[data-list] tr td a').length ; i++)
-		if($('*[data-list] tr td a').eq(i).html().trim()=="")
-			$('*[data-list] tr td a').eq(i).parent('td').parent('tr').remove();
-	// tab按鍵選到menu,會顯示下層的menu(為了符合無障礙)
-	   $('.nav-level-0>li>a').focus(function(e) {
+  for(var i = 0;i < $('*[data-list] tr td a').length ; i++)
+    if($('*[data-list] tr td a').eq(i).html().trim()=="")
+      $('*[data-list] tr td a').eq(i).parent('td').parent('tr').remove();
+  // tab按鍵選到menu,會顯示下層的menu(為了符合無障礙)
+     $('.nav-level-0>li>a').focus(function(e) {
       e.stopPropagation();
-  	  $(this).parent().focus();
+      $(this).parent().focus();
         if ($(this).parent().find('.nav-level-1').hasClass('show')) {
         } else {
           $('.nav-level-1').removeClass('show');
           $(this).parent().find('.nav-level-1').addClass('show');
         }
     });
-  	$('.nav-level-1>li>a').focus(function(e) {
-  		e.stopPropagation();
-  		if ($(this).parent().find('.nav-level-2').hasClass('show')) {
-  		}else{
-  			$('.nav-level-2').removeClass('show');
-  			$(this).parent().find('.nav-level-2').addClass('show');
-  		}
-  	});
-  	$('show').parent('li').focus();
+    $('.nav-level-1>li>a').focus(function(e) {
+      e.stopPropagation();
+      if ($(this).parent().find('.nav-level-2').hasClass('show')) {
+      }else{
+        $('.nav-level-2').removeClass('show');
+        $(this).parent().find('.nav-level-2').addClass('show');
+      }
+    });
+    $('show').parent('li').focus();
     }
   forFreeGo();
 
@@ -549,9 +810,9 @@
 
    //header banner setting
    if ( location.href.search('editmode=on') != -1 ) {
-		$('.header-banner').css('z-index','2');
-	} else {
-		$('.header-banner').css({
+    $('.header-banner').css('z-index','2');
+  } else {
+    $('.header-banner').css({
       'position': 'relative',
       'top': '0',
       'z-index': '-2',
@@ -631,19 +892,126 @@ extendPanelWidget();
 
 
 }
+$(document).ready(function () {
+  if ($(".main-content .video_detail").length > 0) {
+    $('.videopagenone').css("display","none");
+    $('.videopage').css('display', 'block');
+    $('.sitemenu').css("display","none");
+    $('span img[alt="HD"]').parent().hide();
+    $('span img[alt="觀看人數"]').remove();
+    $(".video_detail .view_info span").each(function () {
+      var text = $(this).text().trim(); // 取得 <span> 裡的文字，去掉前後空格
+      var number = text.replace(/\D/g, ""); // 只保留數字部分
+      if (number) {
+        $(this).text(`・觀看次數：${number}次`); // 更新內容格式
+      }
+    });    
+    $(".movie_desc").before('<div class="movietitle"><h4>單元介紹</h4></div>');
+    $(".movie_desc").each(function () {
+      var decodedHtml = $("<div/>").html($(this).text()).html(); // 轉換轉義的 HTML
+      $(this).html(decodedHtml); // 設置為真正的 HTML
+    });
+    $(".video_group_time").each(function () {
+      var $this = $(this); // 當前 .video_group_time
+      // 找到對應的 <q>，並移動到 .video_group_time 內部
+      var $q = $this.closest(".imglst_desc").find(".movie_desc q");
+      if ($q.length) {
+        $this.append($q.clone()); // 將 <q> 複製並添加到 .video_group_time
+        $q.remove(); // 移除 .movie_desc 裡的 <q>
+      }
+      // 移動 .view_info 到 .video_group_time 的內部
+      $this.append($this.siblings(".view_info"));
+      // 取得內容並移除 "SystemAdmin | " 前綴
+      var text = $this.text().trim();
+      var newText = text.replace(/^.*\|\s*/, ""); // 移除 "SystemAdmin | "
+      $this.text(newText); // 更新內容
+      $(this).insertBefore($(this).closest(".imglst_desc").siblings("h3"));
+    });
+    
+    $(".main-content").css({
+      "max-width": "920px",
+      "margin": "auto"
+    });
+    $(".video_box_wrap").css("padding-bottom", "56%");
+    $(".video_detail .video_yt_box").insertBefore(".video_detail .video_group_time");
+    
+  };
+    function getYouTubeThumbnail() {
+      var $ytThumb = $(".ytp-cued-thumbnail-overlay-image");
+      if ($ytThumb.length) {
+        var imageUrl = $ytThumb.css("background-image");
+        // 檢查背景圖格式：url("https://...")
+        var urlMatch = imageUrl.match(/url\(["']?(.*?)["']?\)/);
+        var extractedUrl = urlMatch ? urlMatch[1] : null;
+        if (extractedUrl) {
+          // console.log("成功獲取縮圖:", extractedUrl);
+          $(".background").css("background-image", `url("${extractedUrl}")`);
+        } else {
+          // console.log("背景圖格式不對，改用影片 ID 生成縮圖");
+          setThumbnailFromVideoId();
+        }
+      } else {
+        // console.log("找不到 .ytp-cued-thumbnail-overlay-image，改用影片 ID 生成縮圖");
+        setThumbnailFromVideoId();
+      }
+    }
+    function setThumbnailFromVideoId() {
+      var $iframe = $("iframe[src*='youtube.com/embed']");
+      if ($iframe.length) {
+        var src = $iframe.attr("src");
+        var videoIdMatch = src.match(/youtube\.com\/embed\/([^?]+)/);
+        var videoId = videoIdMatch ? videoIdMatch[1] : null;
 
+        if (videoId) {
+          var fallbackImageUrl = `https://img.youtube.com/vi/${videoId}/maxresdefault.jpg`;
+          // console.log("透過影片 ID 取得縮圖:", fallbackImageUrl);
+          $(".background").css("background-image", `url("${fallbackImageUrl}")`);
+        }
+      }
+    }
+    // 嘗試多次加載
+    var interval = setInterval(function () {
+      if ($(".ytp-cued-thumbnail-overlay-image").length || $("iframe[src*='youtube.com/embed']").length) {
+        getYouTubeThumbnail();
+        clearInterval(interval);
+      }
+    }, 1000);
+  });
+  
   // 當文件物件模型(DOM)載入後，執行init函數
   $(document).ready(function() {
-
-    //背景widget設定
-    if ( location.href.search('editmode=on') != -1 ) {
-      $('.background').css('z-index','2');
-      $('.background').css('position','relative');
-    } else {
-      $('.background').css('z-index','-1');
-      $('.background').css('position','fixed');
-    };
-
+      // 綁定滑動事件
+      $(".cycle-slideshow").swipe({
+        swipeLeft: function () {
+          $(this).cycle("next"); // 向左滑動，切換到下一張
+        },
+        swipeRight: function () {
+          $(this).cycle("prev"); // 向右滑動，切換到上一張
+        },
+        threshold: 50, // 滑動靈敏度（數值越小越敏感）
+      });
+      //改變日期格式
+      $(".video_group_time").each(function () {
+        var $this = $(this);
+        var originalText = $this.text().trim();
+        // 把 YYYY-MM-DD 轉換成 M月D日
+        var formattedText = originalText.replace(/(\d{4})-(\d{2})-(\d{2})/g, function (match, year, month, day) {
+            return parseInt(month, 10) + "月" + parseInt(day, 10) + "日";
+        });
+        // 找到對應的 <q>，並複製
+        var $q = $this.closest(".video_data").find(".video_desc q").clone();
+        // 更新內容並加上 <q>
+        $this.html(formattedText).append($q);
+    });
+    //常用到的js
+    // $('.').after($('.'));
+    // $('.').before($('.'));
+    // $('.').append($('.'));
+    // if($('.show-announcement').hasClass('show-announcement')) {
+    //   $('.').css('', '');
+    // }
+    $(".mybooking").append('<i class="fa-solid fa-circle-user"></i>');
+    //內頁dattpp移位
     $('.i-annc__page-title').after($('.sitemenu-wrap2'));
     $('.i-archive-title').after($('.sitemenu-wrap2'));
     $('.page-module-title').after($('.sitemenu-wrap2'));
@@ -654,34 +1022,37 @@ extendPanelWidget();
     $(".member-data2-tr").before($(".show-member .table-striped > tbody > tr:nth-of-type(4)"));
     $(".nav-pills").before($(".show-member .table-striped > tbody > tr:last-child"));
 
-    //常用到的js
-    // $('.').after($('.'));
-    // $('.').before($('.'));
-    // $('.').append($('.'));
-    // if($('.show-announcement').hasClass('show-announcement')) {
-    //   $('.').css('', '');
-    // }
 
 
+    //檔案室手風琴
+    $('.panel-title>.collapsed').click(function(){
+      $(this).find('.fa').toggleClass("fa-chevron-down");
+      $(this).find('.fa').toggleClass("fa-chevron-up");
+    });
+
+    //背景widget設定
+    if ( location.href.search('editmode=on') != -1 ) {
+      $('.background').css('z-index','2');
+      $('.background').css('position','relative');
+    } else {
+      $('.background').css('z-index','-1');
+      $('.background').css('position','fixed');
+    };
     //公告類別顏色
-    $(".w-annc .w-annc__category-wrap").each(function() {
-      var SaveCategory = $(this).find(".w-annc__category").text();
-      // console.log(SaveCategory);
-      $(this).addClass(SaveCategory);
-    })
-    $(".w-annc__item ").each(function() {
-      var SaveCategory2 = $(this).find(".w-annc__category").text();
-      // console.log(SaveCategory);
-      $(this).addClass(SaveCategory2);
-    })
+    // $(".w-annc .w-annc__category-wrap").each(function() {
+    //   var SaveCategory = $(this).find(".w-annc__category").text();
+    //   $(this).addClass(SaveCategory);
+    // })
+    // $(".w-annc__item ").each(function() {
+    //   var SaveCategory2 = $(this).find(".w-annc__category").text();
+    //   $(this).addClass(SaveCategory2);
+    // })
     $(".i-annc__item .i-annc__category-wrap").each(function() {
       var SaveCategory = $(this).find(".i-annc__category").text();
-      // console.log(SaveCategory);
       $(this).addClass(SaveCategory);
     })
     $(".i-annc__item ").each(function() {
       var SaveCategory2 = $(this).find(".i-annc__category").text();
-      // console.log(SaveCategory);
       $(this).addClass(SaveCategory2);
     })
 
@@ -726,7 +1097,7 @@ extendPanelWidget();
       $("nav ul").toggleClass('hidden');
     });
     $('.morebken').click(function(){
-      $('.list-unstyled>li:nth-child(n+16)').slideToggle();
+      $('.list-unstyled>li:nth-child(n+5)').slideToggle();
       $(".morebken .fa-chevron-down").toggleClass("rotate");
       $(".openmorebken").toggleClass("closemorebken");
 
@@ -741,6 +1112,7 @@ extendPanelWidget();
       headerH();
     $(window).resize(function() {
       if ($(window).width() <769) {
+
          $('.modules-menu-level-0').after($('.header-nav'));
       }else{
         $('.outdropdowns').before($('.header-nav'));
@@ -770,8 +1142,11 @@ extendPanelWidget();
     //     $('.outdropdowns').removeClass('navFixed'); /* 移除選單固定效果 */
     //   }
     // });
-    $('.navbar-brand h2').replaceWith(function () {
-      return "<h1>" +$(this).html() + "</h1>";
+    $('.navbar-brand h2').replaceWith(function() {
+      return $("<h1>", {
+        class: this.className,
+        html: $(this).html()
+      });
     });
     $('#search'). attr('title', '另開新視窗');
     $(window).scroll(function() {
@@ -831,15 +1206,15 @@ extendPanelWidget();
 // // //選單
 // $(document).ready(function() {
 //
-// 			//drop down menu
-// 					$(".dropdown-toggle").hover(function() {
-// 						$('.modules-menu-level-1').addClass('display-on');
-// 					});
-// 					$(".dropdown-toggle").mouseleave(function() {
-// 						$('.modules-menu-level-1').removeClass('display-on');
-// 					});
+//      //drop down menu
+//          $(".dropdown-toggle").hover(function() {
+//            $('.modules-menu-level-1').addClass('display-on');
+//          });
+//          $(".dropdown-toggle").mouseleave(function() {
+//            $('.modules-menu-level-1').removeClass('display-on');
+//          });
 //
-// 		});
+//    });
 //     $(document).ready(function() {
 //
 //       "use strict";
diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss
index aec97bb..c9bcac9 100644
--- a/assets/stylesheets/template/layout/header.scss
+++ b/assets/stylesheets/template/layout/header.scss
@@ -21,6 +21,7 @@
   outline: 0.3125em auto -webkit-focus-ring-color !important;
 }
 .layout-header {
+  z-index: 2;
   position: relative;
   margin-bottom: 0;
   border: none;
diff --git a/assets/stylesheets/template/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss
index b2bd0c3..2a0f360 100644
--- a/assets/stylesheets/template/modules/ad_banner.scss
+++ b/assets/stylesheets/template/modules/ad_banner.scss
@@ -14,20 +14,28 @@
 iframe{
   border: none;
 }
+  .jp-video{
+    border:0;
+  }
 .w-ba-banner {
   position: relative;
   height: fit-content !important;
-
   .cursor {
     cursor: pointer;
   }
+  .w-ad-banner__caption{
+    @media(max-width:768px){
+      h3{
+        margin-top: 0;
+      }
+    }
+  }
 }
 
 .w-ba-banner__wrap {
   width: 100%;
   max-width: 100%;
   height: auto;
-  overflow: hidden;
 }
 
 .w-ba-banner__slide {
@@ -55,23 +63,34 @@ iframe{
 .banner-pager {
   @include list-reset;
   position: absolute;
-  bottom: 0.5rem;
+  bottom: 0.5rem!important;
   z-index: 200;
   text-align:center;
   width: 100%;
   li {
-    display: inline-block;
-    height: 3px;
-    width: 4%;
+
+    // height: 3px;
+    // width: 4%;
+    // margin: 0 2px;
     cursor: pointer;
-    margin: 0 2px;
+    display: inline-block;
+    width:auto!important;
   }
 
   button {
-    background: hsla(0,0%,100%,.4);
-    width: 100%;
-    height: 3px;
-    border: unset;
+    // background: hsla(0,0%,100%,.4);
+    // width: 100%;
+    // height: 3px;
+    // border: unset;
+    background: white !important;
+    display: inline-block;
+    margin-right: 0.25em;
+    width: 0.8em !important;
+    height: 0.8em !important;
+    border-radius: 50%;
+    opacity: .5;
+    cursor: pointer;
+    border: 0;
   }
   .active-slide button {
     opacity: 1;
@@ -98,7 +117,7 @@ iframe{
 	position: absolute;
 	right: 1em;
 	top: 3%;
-	z-index: 99;
+	z-index:101;
 	 a {
     display: inline-block;
     margin-right: 0.25em;
@@ -147,7 +166,7 @@ ul.button-mid{
     top: 50%;
     position: absolute;
     transform: translateY(-50%);
-    z-index: 99;
+    z-index: 100;
 
     &:hover {
       background: rgba(0,0,0,0.1);
@@ -169,7 +188,7 @@ ul.button-mid{
     top: 50%;
     position: absolute;
     transform: translateY(-50%);
-    z-index: 99;
+    z-index: 100;
     &:hover {
       background: rgba(0,0,0,0.1);
     }
@@ -215,17 +234,13 @@ ul.button-mid{
   }
   .ad-overlay{
     text-align: center;
-    padding-top: 20%;
     position: relative;
     background: none;
     color: #fff;
+    z-index: 99;
+    padding-left: 10%;
+    padding-right: 10%;
     // text-shadow: 1px 1px 1px #0000008c;
-    @media screen and (min-width:$screen-xs) and (max-width:1025px){
-        padding-top: 30%;
-    }
-    @media(max-width: $screen-xs){
-      padding-top: 60%;
-    }
   }
     img{
       position: fixed;
@@ -270,7 +285,7 @@ ul.button-mid{
     }
     @media(max-width: $screen-xs){
       .ad-overlay{
-          top: 17%;
+          top: 35%;
           position: absolute;
       }
     }
@@ -367,22 +382,20 @@ ul.button-mid{
 
 }
 
-// specific style for youtube widget
-.ba-banner-widget-youtube {
-  .cycle-slide-active {
-    z-index: 101 !important;
-  }
-}
+
 
 //Widget 5
 .ba-banner-widget-5 {
-  background: url(/assets/BANNER-BG-01.jpg) 0 0 no-repeat;
-  .slide-img { padding: 1rem 1.5rem; }
+  margin: 1em 0;
+  .slide-img {
+    @media(min-width:769px){
+      padding: 0;
+    }    
+    }
   .slide-content {
     z-index: 200;
     font-family: $main-font;
-    padding-top: 0.5rem;
-    padding-left: 0;
+    padding: 1em 7em 1em 1em;
 
     h3 {
       font-size: 1rem;
@@ -395,14 +408,9 @@ ul.button-mid{
       word-break: break-all;
       font-size: 1rem;
       color: #373634;
-      padding: 0 2em 0.5em 0;
     }
   }
-  .controlplay { display: none; }
   .banner-pager {
-    right: 1rem;
-    top: 0;
-    width: unset;
    li { height: unset; width: unset; }
    a { background: #a0d2f3;}
   }
@@ -473,6 +481,7 @@ ul.button-mid{
     display: none;
   }
   .banner-overlay {
+    border-bottom: 3px solid $theme-color-second;
     text-align: center;
     width: 100%;
     visibility: unset !important;
@@ -490,8 +499,12 @@ ul.button-mid{
     }
     p{
       padding: 0 0.2em;
-      border-bottom: 3px solid $theme-color-second;
-      box-shadow: 0px 0px 3px 0px #3333334d;
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: normal;
     }
   }
 }
diff --git a/assets/stylesheets/template/modules/announcement.scss b/assets/stylesheets/template/modules/announcement.scss
index a6d5f13..2eb74b1 100644
--- a/assets/stylesheets/template/modules/announcement.scss
+++ b/assets/stylesheets/template/modules/announcement.scss
@@ -8,12 +8,29 @@
 
 // Announcement widget
 // ## Gerneral styles for widgets
+.VivaTimeline{
+  z-index: 1;
+  position: relative;
+}
 .w-annc__table{
       // border: 0.0625em solid #ddd !important;
   .w-annc__th{
     @extend .i-title;
   }
 }
+.w-annc__status{
+  margin-right: 0.5em;
+  line-height: 1 !important;
+}
+.w-annc__status-wrap{
+  display: flex;
+}
+.i-annc__status-wrap{
+  display: flex;
+}
+.i-annc__th--date{
+  min-width: 6em;
+}
 // .w-annc__th{
 //   border-bottom:0.0625em solid #ddd!important;
 // }
@@ -217,7 +234,7 @@
     padding-bottom: 0;
   }
   .w-annc__img-wrap {
-    height: 12.5em;
+    height: 13.5em;
     margin:0;
   }
 
@@ -251,7 +268,7 @@
     padding-bottom: 0;
   }
   .w-annc__img-wrap {
-    height: 12.5em;
+    height: 13.5em;
     margin:0;
   }
 
@@ -336,11 +353,6 @@
           background: $theme-color-main;
          }
      }
-     @media(max-width: $screen-xs){
-       margin-left: 0!important;
-       margin-right: 0!important;
-       width: 100% !important;
-     }
    }
   .w-annc__item{
     // @media(min-width:  $screen-lg){
@@ -417,9 +429,6 @@
 
   .w-annc__title{
     color: #fff;
-    @media(min-width:1920px){
-      font-size: 1.6rem!important;
-    }
   }
   .w-annc__title {
     font-family: $main-font;
@@ -492,8 +501,8 @@
    }
   .w-annc__item{
     @media(max-width: $screen-xs){
-      margin-left: 0 !important;
-      margin-right: 0 !important;
+      // margin-left: 0 !important;
+      // margin-right: 0 !important;
     }
       &:hover{
         -webkit-transform: translateY(-6px);
@@ -546,16 +555,6 @@
       font-size: 1.2em;
     }
   }
-  .w-annc__img-wrap {
-    img{
-      height: 100% !important;
-      width: auto!important;
-      max-width: unset;
-      position: relative !important;
-      margin: 0 !important;
-      // transform: translateX(-7%);
-    }
-  }
   .w-annc__item{
     padding: 0;
     margin-right: 0.5em;
@@ -677,9 +676,6 @@
 
   .w-annc__title{
     color: #fff;
-    @media(min-width:1920px){
-      font-size: 1.6rem!important;
-    }
   }
   .w-annc__title {
     font-family: $main-font;
@@ -746,9 +742,9 @@
        width: 356px!important;
      }
      @media (max-width: $screen-xs) {
-       width: 94vw !important;
-       margin-left: 0 !important;
-       margin-right: 0 !important;
+      width: 93.5vw !important;
+      margin-left: 0 !important;
+      margin-right: 1em !important;
      }
      &:hover{
       -webkit-transition: all .3s ease;
@@ -814,16 +810,6 @@
       font-size: 1.2em;
     }
   }
-  .w-annc__img-wrap {
-    img{
-      height: 100% !important;
-      width: auto!important;
-      max-width: unset;
-      position: relative !important;
-      margin: 0 !important;
-      // transform: translateX(-7%);
-    }
-  }
   .w-annc__item{
     padding: 0;
     margin-right: 0.5em;
@@ -911,7 +897,7 @@
     background-color:#dfdfdf;
     display: flex;
     align-items: center;
-    padding: 0 1em;
+    padding:0.5em 1em;
   }
   h4,p{
     padding: 0 1em;
@@ -960,11 +946,342 @@
     }
     @media (max-width: 767px) {
       width: 100%!important;
-      margin-left: 0;
-      margin-right: 0;
     }
  }
 }
+//  Widget-23
+.widget-announcement-23 {
+  .w-annc__list{
+        flex-wrap: wrap;
+        display: flex;
+        justify-content: center;
+        .w-annc__item{
+          @media(min-width:769px){
+            margin: 0.5em;
+              width: calc(25% - 1em)!important;
+          }
+        }
+      .w-annc__item:first-child{
+        @media(min-width:769px){
+            width: calc(50% - 1em)!important;
+        }
+      }
+      .w-annc__item:nth-child(2){
+        @media(min-width:769px){
+            width: calc(50% - 1em)!important;
+        }
+      }
+  }
+  .w-annc__more-wrap{
+    display: none;
+  }
+
+  .w-annc__title {
+    font-family: $main-font;
+  }
+  .w-annc__img-wrap {
+    margin-bottom: 0.5em;
+    border-radius: 20px;
+    overflow: hidden;
+    .w-annc__img{
+      width: 100%;
+      position: relative !important;
+    }
+  }
+  .w-annc__item{
+    margin-bottom: 1em;
+    padding: 0;
+    background-color: transparent!important;
+    &:hover{
+        .w-annc__img{
+          -webkit-transition: .3s ease-out;
+          -moz-transition: .3s ease-out;
+          -ms-transition: .3s ease-out;
+          -o-transition: .3s ease-out;
+          transition: .3s ease-out;
+          filter: brightness(40%);
+        }
+    }
+  }
+  .w-annc__entry-title{
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  .w-annc__meta{
+    padding-top: 1em;
+    display: none;
+  }
+}
+//  Widget-24
+.widget-announcement-24 {
+  .cycle-carousel-wrap{
+    display: flex;
+    align-items: baseline;
+  }
+  .w-annc__entry-title{
+    margin: 0;
+  }
+  .w-annc__meta i{
+    color: #fff!important;
+  }
+  .w-annc__list{
+    display: flex;
+    justify-content: center;
+    flex-wrap: wrap;
+  }
+  .w-annc__postdate-wrap{
+    color: #fff!important;
+  }
+  .w-annc__status-wrap{
+    color: #fff!important;
+  }
+  .w-annc__category-wrap{
+    color: #fff!important;
+  }
+
+  .w-annc__title{
+    color: #fff;
+  }
+  .w-annc__title {
+    font-family: $main-font;
+  }
+  .w-annc__widget-title {     text-align: center; }
+  .w-annc__more { margin-top: 1.5em; }
+  .w-annc__list > .w-annc__item:nth-child(3n+1) {
+    clear: both;
+  }
+
+  .w-annc__img-wrap {
+    margin:0;
+    height: auto;
+  }
+  .w-annc__content-wrap{
+    padding: 1.5em;
+    div{
+      display: -webkit-box;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      -webkit-box-decoration-break: clone;
+      box-decoration-break: clone;
+      -webkit-line-clamp: 3;
+      -webkit-box-orient: vertical;
+    }
+  }
+  .clearfix{
+    // text-align: center;
+    // display: flex;
+    // justify-content: center;
+  }
+  .w-annc__subtitle {
+    display: -webkit-box;
+   -webkit-line-clamp: 2;
+   -webkit-box-orient: vertical;
+   overflow: hidden;
+   text-overflow: ellipsis;
+  }
+  .w-annc__content-wrap {
+   display: inline-block;
+   &:after {
+     content: '';
+     display: block;
+     margin-top: 5px;
+     height: 4px;
+     width: 0;
+     background: transparent;
+     transition: width .5s ease, background-color .5s ease;
+   }
+  }
+   .w-annc__item{
+     -webkit-transition: .3s all ease;
+     -o-transition: .3s all ease;
+     transition: .3s all ease;
+     padding-bottom: 1em;
+     @media (max-width: $screen-xs) {
+       margin: 0;
+     }
+     &:hover{
+      -webkit-transition: all .3s ease;
+      -moz-transition: all .3s ease;
+      -ms-transition: all .3s ease;
+      -o-transition: all .3s ease;
+      transition: all .3s ease;
+         .w-annc__content-wrap:after{
+           width: 100%;
+          background: #f2f2f2;
+         }
+     }
+   }
+  .w-annc__item{
+    @media(max-width: $screen-xs){
+
+    }
+      &:hover{
+        -webkit-transform: translateY(-6px);
+        -ms-transform: translateY(-6px);
+        transform: translateY(-6px);
+
+      .w-annc__img-wrap{
+        box-shadow: 0 12px 24px #0000004d, 0 10px 10px #00000033;
+        -webkit-box-shadow: 0 12px 24px #0000004d, 0 10px 10px #00000033;
+      }
+      img{
+          // transform: scale(1.2)!important;
+          // -webkit-transition: .3s ease-out;
+          // -moz-transition: .3s ease-out;
+          // -ms-transition: .3s ease-out;
+          // -o-transition: .3s ease-out;
+          // transition: .3s ease-out;
+      }
+      .transitionfade{
+        height: inherit;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        background-color: rgba(0,0,0,.4);
+        -webkit-transition: .3s ease-out;
+        -moz-transition: .3s ease-out;
+        -ms-transition: .3s ease-out;
+        -o-transition: .3s ease-out;
+        transition: .3s ease-out;
+      }
+    }
+  }
+  .w-annc__subtitle{
+    color: #fff;
+    font-size: 1rem;
+    display: -webkit-box;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    -webkit-box-decoration-break: clone;
+    box-decoration-break: clone;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    max-height: 0;
+    opacity: 0;
+    -webkit-transition: max-height .6s,opacity .6s;
+    transition: max-height .6s,opacity .6s;
+    @media(min-width:1920px){
+      font-size: 1.2em;
+    }
+  }
+  .w-annc__img-wrap {
+    img{
+      // height: 100% !important;
+      width:100%!important;
+      @media(max-width:767px){
+      }
+    }
+  }
+  .w-annc__item{
+    padding: 0;
+    margin-right: 0.5em;
+    margin-left: 0.5em;
+    margin-bottom: 1em;
+    overflow: hidden;
+    position: relative !important;
+    @media(min-width:768px){
+      &:nth-child(1){
+        width: calc(200% / 3 - 1em)!important;
+      }
+      &:nth-child(2){
+        width: calc(100% / 3 - 1em)!important;
+      }
+      &:nth-child(3){
+        width: calc(100% / 3 - 1em)!important;
+      }
+      &:nth-child(4){
+        width: calc(200% / 3 - 1em)!important;
+      }
+    }
+    @media(max-width:767px){
+
+      &:nth-child(2){
+        width: calc(100% / 2 - 1em) !important;
+        margin-right: 0.5em;
+      }
+      &:nth-child(3){
+        width: calc(100% / 2 - 1em) !important;
+        margin-left: 0.5em;
+      }
+    }
+
+    @media(max-width: $screen-xs){
+      width: 100% !important;
+    }
+    @media(min-width: 1100px){
+       height: 22em;
+      .w-annc__img-wrap{
+          height: 22em;
+      }
+    }
+    @media(min-width: 821px)and(max-width: 1100px){
+       height: 22em;
+      .w-annc__img-wrap{
+        height: 22em;
+      }
+    }
+    @media(min-width: $screen-xs)and(max-width: 820px){
+      height: 15em;
+     .w-annc__img-wrap{
+       height: 15em;
+     }
+   }
+    @media(max-width: $screen-xs){
+      height: 10em;
+     .w-annc__img-wrap{
+       height: 10em;
+     }
+    }
+  }
+      li{
+      &:hover{
+          .card:before{
+            height:100%;
+          }
+            .w-annc__subtitle{
+              max-height: 100px;
+              opacity: 1;
+            }
+      }
+      position: relative;
+    }
+    .card{
+      position: absolute;
+      z-index:0;
+      padding: 20px 25px;
+      bottom: 0;
+      left: 0;
+      background-color: transparent;
+      background-image: -webkit-gradient(linear, left top, left bottom, color-stop(32%, #ffffff00), color-stop(89%, #00000080));
+      background-image: linear-gradient(
+      180deg
+      , #ffffff00 32%, #00000080 89%);
+      width: 100%;
+      @media(max-width:$screen-xs){
+        padding: 10px;
+        .w-annc__title{
+          font-size: medium;
+        }
+      }
+    }
+    .card:before{
+      content: "";
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      width: 100%;
+      height: 8px;
+      background-color: $theme-color-second;
+      z-index: -1;
+      -webkit-transition: height .6s;
+      transition: height .6s;
+    }
+}
 // Widget-5
 .widget-announcement-5 {
   .w-annc__title {
@@ -1279,13 +1596,8 @@
 .widget-announcement-14 {
 
   .w-annc__img-wrap {
-    height: 18.75em;
-    margin-bottom: 0.9375em;
-
-    @media (min-width: $screen-md) {
-      height: 12.5em;
       margin-bottom: 0;
-    }
+      padding: 0;
   }
 
   .w-annc__item {
@@ -1329,7 +1641,7 @@
  }
 
  .w-annc__img-wrap {
-   height: 17.5em;
+   height: 15.5em;
    margin: 0;
    overflow: hidden;
  }
@@ -1354,9 +1666,9 @@
       width: 356px!important;
     }
     @media (max-width: $screen-xs) {
-      width: 94vw !important;
+      width: 94.5vw !important;
       margin-left: 0 !important;
-      margin-right: 0 !important;
+      margin-right: 1em !important;
     }
  }
  // .cycle-slide{
@@ -1368,6 +1680,9 @@
 }
 //Widget 16
 .widget-announcement-16 {
+  .w-annc__img{
+    width: 100%;
+  }
   .w-annc__content-wrap{
     padding: 1em;
   }
@@ -1382,7 +1697,6 @@
   .w-annc__title {
    font-family: $main-font;
  }
- .w-annc__item { padding: 0; }
  .w-annc__img-wrap {
    margin: 0 0 0.5rem 0;
  }
@@ -1428,14 +1742,14 @@
    white-space: normal;
   }
   .w-annc__entry-title {
-    height: 2.5em;
+    height: 2em;
   }
   .w-annc__img-wrap {
-    height: 12.5em;
+    height: 13.5em;
     margin:0;
     overflow: hidden;
     @media (max-width: $screen-xs) {
-      height: 12.5em;
+      height: 13.5em;
     }
   }
   .w-annc__content-wrap{
@@ -1530,6 +1844,9 @@
 
 //widget 19
 .widget-announcement-19 {
+  .w-annc__title{
+    white-space: normal;
+  }
   .cycle-carousel-wrap{
         display: flex;
   }
@@ -1560,7 +1877,7 @@
    -webkit-line-clamp: 2;
 }
  .w-annc__img-wrap {
-   height: 12.5em;
+   height: 13.5em;
    margin: 0 0 1em 0;
    overflow: hidden;
  }
@@ -1575,7 +1892,7 @@
       margin-left: 0.5em;
       height: 14em;
   @media(min-width:  $screen-lg){
-    width:579px !important;
+    width:582px !important;
   }
   @media(max-width: 1025px)and(min-width: 821px){
     width: 30.5vw !important;
@@ -1584,8 +1901,10 @@
     width: 356px!important;
   }
   @media (max-width: $screen-xs) {
-    width: 90vw!important;
-  }
+    width: 89vw !important;
+    margin-left: 0.5em !important;
+    margin-right: 0.5em !important;
+   }
  }
 
 }
@@ -1683,7 +2002,7 @@
   .i-annc__img-wrap {
     overflow: hidden;
     height: 14.5em;
-    margin: 0 0 1em 0;
+    margin: 1em 0.5em;
     @media (max-width:$screen-xs) {
       height: 7em;
     }
@@ -1719,7 +2038,7 @@
     // box-shadow: #0000004d 0 0 4px;
     // background: #fff;
     @media(min-width: $screen-xs){
-      float: left;
+      // float: left;
     }
     &:hover{
       // border: 1px solid $theme-color-second;
@@ -1747,13 +2066,15 @@
     font-family: $main-font;
     @extend .i-title;
   }
+  .i-annc__status{
+    margin-right: 0.5em;
+  }
   .i-annc__status-wrap {
     span {
       display: inline-block;
       padding: .2em .6em .3em;
 
       &:last-child {
-        margin: 0 0.3125em 0.1875em 0;
         display: inline-block;
       }
     }
@@ -1779,6 +2100,10 @@
     display: flex !important;
     position: relative;
     align-items: center;
+    flex-wrap: wrap;
+    .i-annc__status-wrap{
+      width:100% ;
+    }
     .i-annc__status-wrap,
     .i-annc__postdate-wrap,
     .i-annc__category-wrap {
@@ -1870,7 +2195,6 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl
 
   .i-annc__status {
     @extend .i-title;
-    display: inline-block;
   }
 }
 
@@ -1901,7 +2225,6 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl
 
   .i-annc__status {
     @extend .i-title;
-    display: inline-block;
   }
 
 }
@@ -1931,6 +2254,9 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl
 }
 // Index-7
 .index-announcement-7 {
+  .i-annc__item{
+    border:0;
+  }
   .i-annc__list {
     display: flex;
     flex-wrap: wrap;
@@ -1939,18 +2265,12 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl
     font-family: $main-font;
   }
   .i-annc__list > .i-annc__item {
-    margin-right: 0.9375em;
-    width: calc( 100%/3 - 1.5em );
-    margin-bottom: 1em;
-    border-bottom: 0;
-    @media (max-width:767px) {
-      width: calc( 100%/2 - 1.25em );
-      min-height: unset;
-      margin: 0;
-            margin-bottom: 1em;
-    }
+    width:calc( 100%/3);
     @media (max-width: $screen-xs) {
       width: 100%!important;
+      min-height: unset;
+      margin: 0;
+      margin-bottom: 1em;
     }
 
   }
@@ -1958,11 +2278,13 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl
     clear: both;
 
   }
-
+  .i-annc__content-wrap{
+    margin: 0.5em;
+  }
   .i-annc__img-wrap {
     overflow: hidden;
-    height: 12.5em;
-    margin: 0 0 1em 0;
+    height: 13.5em;
+    margin: 1em 0.5em;
     img {
       @media (max-width:767px) {
        transform: scale(1) !important;
@@ -1980,12 +2302,9 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl
     font-family: $main-font;
   }
   .i-annc__list > .i-annc__item {
-    width: calc( 100%/4 - 1.5em );
-    margin-bottom: 1em;
-    margin-right: 0.5em;
-    margin-left: 0.5em;
+    width: calc( 100%/4);
     @media (max-width:767px) {
-      width: calc( 100%/2 - 1.25em );
+      width: calc( 100%/2);
       min-height: unset;
       margin: 0;
             margin-bottom: 1em;
@@ -2002,8 +2321,8 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl
 
   .i-annc__img-wrap {
     overflow: hidden;
-    height: 12.5em;
-    margin: 0 0 1em 0;
+    height: 13.5em;
+    margin: 1em 0.5em;
     img {
       @media (max-width:767px) {
        transform: scale(1) !important;
@@ -2250,7 +2569,6 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl
 
   .i-annc__status {
     @extend .i-title;
-    display: inline-block;
   }
 }
 // Index-21
@@ -2740,7 +3058,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl
   .i-annc__img-wrap {
     overflow: hidden;
     height: 14.5em;
-    margin: 0 0 1em 0;
+    margin: 1em 0.5em;
     @media (max-width:$screen-xs) {
       height: 7em;
     }
@@ -2760,223 +3078,3 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl
     padding: 0;
   }
 }
-.video_data-widget-1{
-  .video_info{
-      margin:0.5em 0;
-  }
-}
-.video_title {
-    clear: both;
-}
-.video_data{
-  list-style: none;
-}
-.video_tag{
-  display: flex;
-  float: left;
-}
-.view_info{
-      margin-bottom: 1em;
-}
-.video_group_time{
-  clear: both;
-}
-.video_group_time{
-  color: $theme-color-main!important;
-}
-.video_tag{
-  color: #fff!important;
-  background: #626262;
-  padding: 4px 8px;
-  border-radius: 5px;
-  margin: 0.5em 0.5em 0.5em 0;
-}
-.video_title {
-    clear: both;
-    height: 3em;
-}
-.video_data_wrap{
-  padding-right: 0.4375em;
-  padding-left: 0.4375em;
-}
-.imglst_desc{
-  margin: 1em 0;
-}
-.category_box {
-    padding: 0;
-    border: 1px solid #6868688f;
-    border-radius: 0.5em 0 0 0.5em;
-    overflow: hidden;
-}
-.search_box{
-  padding: 0;
-  border-radius: 0 0.5em 0.5em 0;
-  overflow: hidden;
-  border: 1px solid #6868688f;
-}
-.video_linkwrapper{
-  position:relative;
-  height: 12em;
-  overflow:hidden;
-  width: 100%;
-  border-radius: 1em;
-  img{
-    transform:scale(1.3) translatey(-6px);
-    width: 100%;
-  }
-  @media(max-width: 1025px)and(min-width: 821px){
-      height: 11.5em;
-    img{
-      transform:scale(1.6) translatey(-3px);
-    }
-  }
-  @media(max-width: 821px)and(min-width: 769px){
-      height:8em;
-    img{
-      transform:scale(1.6) translatey(-3px);
-    }
-  }
-  @media(max-width:768px)and(min-width: 600px){
-      height: 22.5em;
-    img{
-      transform:scale(1.3) translatey(-45px);
-      width: 100%;
-    }
-  }
-}
-.video_desc {
-    display: -webkit-box;
-    -webkit-line-clamp: 2;
-    -webkit-box-orient: vertical;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: normal;
-    padding-bottom: 0;
-    @media(min-width: 769px){
-    height: 3em;
-    }
-
-}
-
-.video_linkwrapper2{
-  position:relative;
-  height: 17.5em;
-  overflow:hidden;
-  width: 100%;
-  border-radius: 1em;
-  img{
-    transform:scale(1.3) translatey(-41px);
-          width: 100%;
-  }
-  @media(max-width: 1025px)and(min-width: 821px){
-      height:16.5em;
-    img{
-      transform:scale(1.3) translatey(-8px);
-    }
-  }
-  @media(max-width: 821px)and(min-width: 769px){
-      height:11.5em;
-    img{
-      transform:scale(1.3) translatey(-13px);
-    }
-  }
-  @media(max-width:768px)and(min-width: 600px){
-      height: 22.5em;
-    img{
-      transform:scale(1.3) translatey(-48px);
-      width: 100%;
-    }
-  }
-  @media(max-width: $screen-xs){
-      height: 12.5em;
-      img{
-        transform:scale(1.3) translatey(-22px);
-              width: 100%;
-      }
-  }
-}
-.video_linkwrapper3{
-  position:relative;
-  height: 12em;
-  overflow:hidden;
-  img{
-    transform:scale(1.6) translatey(5px);
-  }
-  @media(max-width: 1025px)and(min-width: 821px){
-      height:9.5em;
-    img{
-      transform:scale(1.6) translatey(6px);
-    }
-  }
-  @media(max-width: 821px)and(min-width: 769px){
-      height:7.5em;
-    img{
-      transform:scale(1.6) translatey(6px);
-    }
-  }
-  @media(max-width:768px)and(min-width: 600px){
-      height: 22.5em;
-    img{
-      transform:scale(1.3) translatey(-48px);
-      width: 100%;
-    }
-  }
-  @media(max-width: $screen-xs){
-      height: 12.5em;
-      img{
-        transform:scale(1.3) translatey(-3px);
-        width: 100%;
-      }
-  }
-}
-.video_data{
-  @media(max-width: 768px){
-    width: 100%;
-  }
-}
-.video_data:hover, .video_data.hover-class{
-  @media(min-width: 1025px){
-    .video_snapshot{
-          box-shadow: 4px 4px 5px 1px rgba(0, 0, 0, 0.3);
-          -webkit-transform: scale(1.35) translateY(-6px);
-          -ms-transform: scale(1.35) translateY(-6px);
-          transform: scale(1.35) translateY(-6px);
-          -webkit-transition: all .3s ease;
-          -moz-transition: all .3s ease;
-          -ms-transition: all .3s ease;
-          -o-transition: all .3s ease;
-          transition: all .3s ease;
-    }
-    .video_linkwrapper3{
-      .video_snapshot{
-            -webkit-transform: scale(1.95) translateY(-6px)!important;
-            -ms-transform: scale(1.95) translateY(-6px)!important;
-            transform: scale(1.95) translateY(-6px)!important;
-      }
-    }
-  }
-}
-.index-publications-3{
-  @media(min-width:$screen-xs){
-    .i-annc__img{
-      width: auto;
-    max-width: unset;
-    height: 20em;
-    }
-  }
-}
-.index-publications-3 .i-annc__img-wrap{
-  overflow: hidden;
-  margin: 0 0 1em 0;
-      text-align: center;
-}
-// .index-publications-3 .i-annc__content-wrap{
-//   height: 6em;
-// }
-.wordcloud2{
-  span{
-    font-size: 1.5em !important;
-    height: 2em !important;
-    position: relative !important;
-  }
-}
diff --git a/assets/stylesheets/template/modules/archives.scss b/assets/stylesheets/template/modules/archives.scss
index b29069d..8f823f5 100644
--- a/assets/stylesheets/template/modules/archives.scss
+++ b/assets/stylesheets/template/modules/archives.scss
@@ -550,6 +550,7 @@
     font-family: $main-font;
     display: flex;
     flex-wrap: wrap;
+    align-items:center;
     a {
       @media(min-width: 769px){
         max-width: 80%;
diff --git a/assets/stylesheets/template/modules/calendar.scss b/assets/stylesheets/template/modules/calendar.scss
index af7ff62..2957fd1 100644
--- a/assets/stylesheets/template/modules/calendar.scss
+++ b/assets/stylesheets/template/modules/calendar.scss
@@ -1,17 +1,7 @@
 @charset "utf-8";
 
 @import "../initial";
-.widget-calendar-2{
- .w-calendar-title{
-    background:$theme-color-second!important;
-  }
-  .day{
-    color:$theme-color-second!important;
-  }
-  .w-calendar-toggle div{
-        background:$theme-color-second!important;
-  }
-}
+
 .w-calendar {
   width: 100%;
   position: relative;
@@ -66,7 +56,10 @@
   }
 }
 #orbit_calendar{
+  position: relative;
+  margin-top: 1em;
   width: 100%!important;
+  z-index: 0;
   table th{
     background-color: #fff;
     color: #333;
@@ -82,22 +75,95 @@
 .fc-daygrid-event-dot{
     display: none!important;
 }
+
 .fc-daygrid-event-harness{
   .mybooking{
-      background-color:#ff7a00 !important;
-      color: #fff !important;
-      border:0!important;
- .fc-event-main{
-      color: #333 !important;
-      }
+        box-shadow: 0 1px 2px 1px #000000;
+      // background-color:#ff7a00 !important;
+      // color: #fff !important;
+      // border:0!important;
+      // .fc-event-time,.fc-event-title-container{
+      //   color: #fff !important;
+      // }
+      // .fc-event-main-frame{
+      //   color: #fff !important;
+      // }
   }
 }
 .fc .fc-daygrid-event{
       margin-top: 4px;
 }
+.fc-timegrid-event-harness{
+  .mybooking{
+        box-shadow: 0 1px 2px 1px #000000;
+      // background-color:#ff7a00 !important;
+      // border:0!important;
+      // .fc-event-main-frame{
+      //   color: #fff !important;
+      // }
+  }
+}
+.fc-timegrid-slot-label-cushion{
+      font-size:small;
+}
+.fc .fc-timegrid-slot-label{
+  border:0;
+}
+.fc .fc-timegrid-slot{
+      height: 0.5em !important;
+}
+.fc-direction-ltr .fc-timegrid-slot-label-frame{
+  text-align:center!important;
+}
+.fc .fc-timegrid-axis-cushion, .fc .fc-timegrid-slot-label-cushion{
+  padding: 0;
+}
+.fc .fc-timegrid-axis-frame{
+  justify-content: center!important;
+}
+// .fc-timeGridWeek-view{
+//   .fc-event-time{
+//     display: none;
+//   }
+// }
+  .fc-v-event .fc-event-main-frame{
+    padding: 5px;
+    color: #fff;
+  }
+  // .fc-timeGridWeek-view{
+  //  .fc-scrollgrid-sync-table{
+  //       display: none;
+  //   }
+  // }
+  // td.fc-timegrid-axis.fc-scrollgrid-shrink{
+  //       display: none;
+  // }
+// .fc .fc-timegrid-axis-frame{
+//     display: none;
+//   }
+  // .fc .fc-timegrid-slot-label{
+  //     display: none;
+  // }
+
+.fc-timegrid-event-harness{
+  position:relative!important;
+  inset: unset !important;
+}
+.fc-timegrid-event-harness > .fc-timegrid-event{
+  position:relative!important;
+  inset: unset !important;
+  width: 100%;
+  border: 0;
+}
+#hire_form label.col-sm-4.control-label{
+  @media(max-width: $screen-xs){
+        padding-left:0.9375em!important;
+  }
+}
 .modal-content{
   box-shadow: 0 24px 38px 3px #00000024, 0 9px 46px 8px #0000001f, 0 11px 15px -7px #00000033;
   border-radius: 8px;
+  behavior: url("/assets/ie_support/PIE2/PIE.htc");
   border: 0;
 }
 .fc .fc-daygrid-day.fc-day-today{
@@ -106,6 +172,8 @@
     color: #fff;
     background-color: #858585;
     border-radius: 0.65em;
+    min-width: 2em;
+    text-align: center;
   }
 }
 .calendar-modal .event_summary{
@@ -120,18 +188,18 @@
 }
 .fc .fc-daygrid-day-number{
       margin-top: 0.3em;
+          color: inherit;
+}
+.fc .fc-col-header-cell-cushion{
+            color: inherit;
 }
 .fc-daygrid-dot-event{
   display:block !important;
 }
 .fc-daygrid-event-harness .fc-daygrid-event{
-    background-color: #d3d3d3;
-    font-size: 1em;
     padding: 5px;
 }
-.fc .fc-daygrid-more-link{
-  font-size: 1em;
-}
+
 .fc-timegrid-axis{
   min-width: 10em;
 }
@@ -146,7 +214,7 @@
     @media(max-width: 768px){
       white-space: normal;
       text-align: justify;
-      font-size: xx-small;
+      font-size: small;
       display: unset !important;
       padding: 0 !important;
     }
@@ -168,16 +236,9 @@
   .fc-daygrid-day-number{
         font-size: small;
   }
-    // .form-group{
-    //   .col-sm-4{
-    //     float: left;
-    //     width: 33.33333333%;
-    //   }
-    //   .col-sm-8{
-    //     float: left;
-    //     width: 66.66666667%;
-    //   }
-    // }
+}
+.has_event{
+  background-color: $theme-color-second!important;
 }
 .createbooking{
   cursor: pointer;
@@ -195,92 +256,28 @@
     height: 2em;
     position: relative;
     border-radius: 2em;
+    behavior: url("/assets/ie_support/PIE2/PIE.htc");
     display: block;
     border: 1px solid #fff;
   }
   position: absolute;
   top: 5em;
   right: 103%;
-  // padding-left: 0.65em;
-  // a{
-  //   margin-top: -5.2em;
-  //   margin-left: 5em;
-  //   z-index: 100;
-  //   position: relative;
-  // }
   @media(max-width:820px){
     display: none!important;
   }
 }
-#hire_form{
-  @media(min-width: 821px){
-    min-width: 500px;
-    height:-webkit-fill-available;
-    transform: translateX(100%);
-    -webkit-transition-timing-function: ease;
-    -o-transition-timing-function: ease;
-    transition-timing-function: ease;
-    -webkit-transition-duration: .35s;
-    -o-transition-duration: .35s;
-    transition-duration: .35s;
-    -webkit-transition-property: transform;
-    -o-transition-property: transform;
-    transition-property: transform;
-    position: relative;
-    float: right;
-    display: none;
-    z-index: 999;
-
-    .form-group{
-      margin-bottom: 0.5em;
-    }
+.form-horizontal{
+  @media(min-width:769px){
+    margin: auto;
+    width: 60%;
   }
+}
   .control-label{
     @media(max-width: 820px){
       padding-left:0.9375em!important;
     }
   }
-  // #pick_start_date{
-  //   @media(min-width: 821px){
-  //     margin-left: 0!important;
-  //     margin-top: 1em;
-  //   }
-  // }
-  // #pick_end_date{
-  //   @media(min-width: 821px){
-  //     margin-left: 0!important;
-  //     margin-top: 1em;
-  //   }
-  // }
-
-}
-.hire-ken-click2{
-  padding-top: 4em;
-  top: 0;
-  background: #fff;
-  right: 0;
-  width: 40%;
-  transform: translateX(0%)!important;
-  display:block!important;
-}
-.shadowblock{
-  overflow-y: scroll !important;
-  padding: 0;
-  position: fixed;
-  background: #333333b8;
-  width: 100%;
-  height: -webkit-fill-available;
-  top: 0;
-  z-index: 999;
-  left: 0;
-  #hire_form{
-    @media(min-width: 821px){
-      max-width: 580px;
-      padding-right: 2em;
-      padding-left: 2em;
-    }
-  }
-}
 .fc-popover-header{
   padding: 6px 12px!important;
   .fc-popover-close{
@@ -304,3 +301,281 @@
 .fc .fc-timegrid-slot-minor{
   border-top: 0;
 }
+.fc-view-harness{
+  height: auto!important;
+}
+.fc-timeGridDay-view{
+  position: relative!important;
+  span.fc-timegrid-axis-cushion.fc-scrollgrid-shrink-cushion.fc-scrollgrid-sync-inner{
+    display: none;
+  }
+  .fc-timegrid-axis-frame{
+    display: none;
+  }
+  .fc-scrollgrid-section-liquid{
+    display: none;
+  }
+  .fc-timegrid-slot{
+    border:0!important;
+  }
+  .fc-timegrid-slot:empty:before{
+    position: absolute;
+  }
+  .fc-scroller-liquid-absolute{
+    position: relative!important;
+    @media(min-width:$screen-xs){
+      overflow: unset !important;
+    }
+  }
+    .fc-daygrid-day-frame{
+      @media(min-width: $screen-xs){
+          min-height: 7em!important;
+      }
+      @media(max-width: $screen-xs){
+        min-height:24em !important;
+      }
+  }
+  .fc-scrollgrid-section-liquid{
+    display: none!important;
+  }
+    span.fc-timegrid-axis-cushion.fc-scrollgrid-shrink-cushion.fc-scrollgrid-sync-inner{
+    display: none;
+  }
+  .fc-timegrid-axis-frame{
+    display: none;
+  }
+  th.fc-timegrid-axis{
+     display: none;
+  }
+  td.fc-timegrid-axis.fc-scrollgrid-shrink{
+    display: none;
+  }
+}
+.fc-timeGridWeek-view{
+/*   table th{
+    display: table-cell;
+   }*/
+/*  .fc-col-header {
+    display: none;
+  }*/
+/*  .fc-timegrid-axis{
+    display: none;
+  }*/
+  .fc-daygrid-day-frame{
+      @media(min-width: $screen-xs){
+          min-height: 7em!important;
+      }
+      @media(max-width: $screen-xs){
+        min-height:24em !important;
+      }
+  }
+  .fc-event-title{
+      @media(max-width: $screen-xs){
+        -webkit-line-clamp: 4!important;
+      }
+  }
+/*  span.fc-timegrid-axis-cushion.fc-scrollgrid-shrink-cushion.fc-scrollgrid-sync-inner{
+    display: none;
+  }*/
+/*  .fc-timegrid-axis-frame{
+    display: none;
+  }*/
+  .fc-scrollgrid-section-liquid{
+    display: none!important;
+  }
+      position: relative!important;
+      .fc-timegrid-slot{
+        border:0!important;
+      }
+      .fc-timegrid-slot:empty:before{
+        position: absolute;
+      }
+  .fc-scroller-liquid-absolute{
+    position: relative!important;
+    @media(min-width:$screen-xs){
+      overflow: unset !important;
+    }
+  }
+.fc-timegrid-slot:empty:before{
+  // @media(max-width: $screen-xs){
+    height: 0.8em;
+    position: relative;
+    display: block;
+  // }
+  }
+}
+.fc-dayGridMonth-view{
+  position: relative!important;
+  .fc-scroller-liquid-absolute{
+  position: relative!important;
+  }
+  .fc-scrollgrid-sync-table{
+        height: 600px!important;
+  }
+}
+.ui-widget-header{
+  background: #000000!important;
+  border-color: #000000!important;
+  color: #fff !important;
+}
+.ui-state-default{
+  background: #fff !important;
+    border: 0 !important;
+    text-align: center !important;
+}
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight{
+  border: 0 !important;
+  background: silver !important;
+}
+.ui-widget-header a{
+  color: #fff!important;
+}
+.ui-widget-header .ui-icon{
+  filter: brightness(500%);
+}
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active, a.ui-button:active, .ui-button:active, .ui-button.ui-state-active:hover, .ui-button.ui-state-active.hover-class{
+  border: 0 !important;
+  background: silver !important;
+  color:#000!important;
+}
+.hidden_timepickerbtn{
+  margin-left:0.5em;
+  @media(max-width:$screen-xs){
+    margin-left: 0;
+    margin-top: 0.5em;
+  }
+
+}
+#confirm_date{
+  background: #000000;
+  border-color: #000000;
+  &:hover{
+    opacity: .8;
+  }
+}
+#cancel_date{
+  background: #000000;
+  border-color: #000000;
+  &:hover{
+    opacity: .8;
+  }
+}
+  #hidden_timepicker{
+    background: #f1f1f1;
+    padding: 1.2em 0 0 0;
+    border-radius: 0.5em;
+
+  }
+    .hidden_timepicker{
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      @media(max-width:$screen-xs){
+        display: grid;
+        padding: 0 1em;
+        justify-content: flex-start;
+      }
+    }
+    .property_title{
+      font-size: 1.2em;
+      font-weight: bold;
+    }
+    .modal-header{
+      .close{
+        font-size: 2em;
+        position: absolute;
+        right: 0.5em;
+      }
+    }
+@media(max-width: $screen-xs){
+/*  .fc-theme-standard td, .fc-theme-standard th{
+    border:0!important;
+  }*/
+  .fc-timeGridWeek-view{
+   .fc-scrollgrid-sync-table{
+
+    }
+  }
+/*  .fc .fc-timegrid-axis-frame{
+    display: none!important;
+  }*/
+  .fc .fc-timegrid-slot-label{
+      display:none!important;
+  }
+}
+#property-selector{
+    @media(max-width:$screen-xs){
+      .fc .fc-daygrid-body-natural .fc-daygrid-day-events{
+        display: none!important;
+      }
+    .fc .fc-timegrid .fc-daygrid-body{
+      display: none!important;
+    }
+    .fc-daygrid-day-events{
+      display: none!important;
+    }
+    td.fc-timegrid-axis.fc-scrollgrid-shrink{
+      display: none;
+    }
+  }
+}
+.fc-daygrid-day-bottom{
+  a{
+      color:$theme-color-main;
+  }
+}
+.fc-daygrid-event-harness{
+  a{
+      color:$theme-color-main;
+  }
+}
+table.fc-col-header{
+  width:100%!important;
+}
+a.fc-daygrid-more-link.fc-more-link{
+  display: block;
+  padding: 0.5em;
+  border-radius: 1em;
+  box-shadow: 0 2px 6px #00000026;
+  border: 0.0625em solid #00000033;
+  @media(max-width: 768px){
+    padding: 0.3em;
+    font-size: .85em;
+  }
+}
+.fc .fc-daygrid-more-link{
+  font-size: 1.2em;
+  font-weight: bold;
+}
+.fc-h-event .fc-event-title{
+  display:-webkit-box!important;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  min-height: 3em;
+}
+.mybooking{
+  &:after{
+    content:"\f2bd"!important;
+    position: relative!important;
+    background: none!important;
+    display: block;
+    font-family: FontAwesome;
+    font-style: normal;
+    font-weight: normal;
+    color: #fff;
+/*    @media(min-width: $screen-xs){
+      position: absolute;
+      top: 2em;
+      right: 1em;
+    }*/
+  }
+}
+.mybookinga{
+      margin-bottom: 0.5em;
+      a{
+            font-size: 1em;
+             font-weight: bold;
+      }
+}
diff --git a/assets/stylesheets/template/modules/epaper.scss b/assets/stylesheets/template/modules/epaper.scss
index e939ae0..5c1ff0e 100644
--- a/assets/stylesheets/template/modules/epaper.scss
+++ b/assets/stylesheets/template/modules/epaper.scss
@@ -163,21 +163,15 @@
 // epaper-index2
 
 .epaper-index2-container{
-	border-style: solid;
-    border-color: #ccc;
-    border-width: 0 1px 1px;
+	// border-style: solid;
+    // border-color: #ccc;
+    // border-width: 0 1px 1px;
 	h1,h2,h3,h4{
 		border-bottom: 1px solid #ccc;//#e1e1e1;
 		margin: 0;
 		padding: 10px 0 10px 10px;
 		span{
-			float:right;
-			margin-right:10px;
-			color: #0e5c92;
-			border: 1px solid #d1d1d1;
-			background: #f0f0f0;
-			padding: 4px 6px;
-			margin-top:-3px;
+
 		}
 	}
     margin-top: 15px;
@@ -228,9 +222,6 @@ background:#fff;
 
     }
 }
-.epaper-description a:visited{
-	color: #777575;
-}
 .epaper-description a:hover{
 	text-decoration-color: #333;
     text-decoration-line: underline;
diff --git a/assets/stylesheets/template/modules/event_news.scss b/assets/stylesheets/template/modules/event_news.scss
index 3442224..93caf47 100644
--- a/assets/stylesheets/template/modules/event_news.scss
+++ b/assets/stylesheets/template/modules/event_news.scss
@@ -1,6 +1,9 @@
 @charset "utf-8";
 
 @import "../initial";
+.w-annc__list{
+  clear: both;
+}
 .i-annc__table{
       // border: 0.0625em solid #ddd !important;
   .i-annc__th{
@@ -174,9 +177,9 @@
        width: 356px!important;
      }
      @media (max-width: $screen-xs) {
-       width: 94vw !important;
-       margin-left: 0 !important;
-       margin-right: 0 !important;
+      width: 93.5vw !important;
+      margin-left: 0 !important;
+      margin-right: 1em !important;
      }
      &:hover{
       -webkit-transition: all .3s ease;
@@ -242,16 +245,6 @@
       font-size: 1.2em;
     }
   }
-  .w-annc__img-wrap {
-    img{
-      height: 100% !important;
-      width: auto!important;
-      max-width: unset;
-      position: relative !important;
-      margin: 0 !important;
-      // transform: translateX(-7%);
-    }
-  }
   .w-annc__item{
     padding: 0;
     margin-right: 0.5em;
@@ -317,13 +310,7 @@
     }
 }
 .event-news-22{
-  .w-annc__img{
-    @media(max-width: 768px){
-      height: 100% !important;
-      width: auto!important;
-      max-width: unset;
-    }
-  }
+
   .w-annc__content-wrap{
     width:50%!important;
   }
@@ -477,6 +464,9 @@
 
 // Index-5
 .index-eventnews-5{
+.i-annc__item{
+  width:100% ;
+  }
   .i-annc__content-wrap{
     @media(max-width: 768px){
       padding-top: 0.5em;
@@ -854,3 +844,6 @@
     display: inline-block;
   }
 }
+.widget-event-news-calendar-2.w-calendar .w-calendar-title{
+  background:$theme-color-second;
+}
\ No newline at end of file
diff --git a/assets/stylesheets/template/modules/gallery.scss b/assets/stylesheets/template/modules/gallery.scss
index 4303853..f57d89b 100644
--- a/assets/stylesheets/template/modules/gallery.scss
+++ b/assets/stylesheets/template/modules/gallery.scss
@@ -241,6 +241,7 @@
       overflow: hidden;
       text-overflow: ellipsis;
       margin-bottom: 0;
+      height: 2.5em;
     }
 
     .index-img-description {
diff --git a/assets/stylesheets/template/modules/member.scss b/assets/stylesheets/template/modules/member.scss
index a87c275..18bdd34 100644
--- a/assets/stylesheets/template/modules/member.scss
+++ b/assets/stylesheets/template/modules/member.scss
@@ -67,6 +67,7 @@
 
   .i-member-pic {
     width: 100%;
+    padding: 0;
   }
 
   .i-member-profile-list {
@@ -280,6 +281,82 @@
   .i-member-profile-list {
     @include list-reset;
     word-break: break-all;
+    text-align: center;
+  }
+
+  .i-member-profile-item {
+    font-size: 1em;
+    line-height: 1.3;
+    padding-top: 0.5em;
+    letter-spacing: 1px;
+  }
+  .i-member-title { display: none; }
+  .i-member-item:nth-child(4n+1) {
+    clear: both;
+  }
+
+  .i-member-pic-wrap {
+    padding: 0;
+  }
+}
+//index 7
+.index-member-7 {
+  .i-member-section {
+    margin: auto;
+  }
+  .i-member-list {
+    display: flex;
+    flex-flow: row wrap;
+    margin: 0;
+  }
+  .i-member-item {
+    float: none;
+    padding: 15px;
+
+    @media (max-width:1280px) {
+      width: calc( 100% / 3 );
+    }
+    @media (max-width:767px) {
+      width: calc( 100% / 2 );
+    }
+    @media (max-width:580px) {
+      width: 100%;
+    }
+  }
+  .i-member-item-inner {
+    height: auto !important;
+  }
+
+  .i-member-status-title {
+    @extend .unity-title;
+  }
+
+  .i-member-item-inner {
+    background: none;
+  }
+
+  .i-member-pic-wrap {
+    height: auto;
+    margin-bottom: 16px;
+
+    @media(max-width:580px) {
+      overflow: hidden;
+      border-radius: 50%;
+      behavior: url("/assets/ie_support/PIE2/PIE.htc");
+      height: 14em;
+      width: 14em;
+      margin: 1.5em auto 1em auto;
+    }
+  }
+
+  .i-member-pic {
+    width: 100%;
+  }
+
+  .i-member-profile-list {
+    @include list-reset;
+    word-break: break-all;
+    text-align: center;
   }
 
   .i-member-profile-item {
diff --git a/assets/stylesheets/template/modules/text_marquee.scss b/assets/stylesheets/template/modules/text_marquee.scss
index e5081a9..0b4c888 100644
--- a/assets/stylesheets/template/modules/text_marquee.scss
+++ b/assets/stylesheets/template/modules/text_marquee.scss
@@ -1,12 +1,29 @@
 @import "../initial";
 .marquee {
-  background: rgba(255,255,255,0.1);
-  border: 1px solid rgba(0,0,0,0.1);
-  border-radius: 0.3125em;
+  background:#ff0000;
   font-size: 0.938em;
-  list-style: outside none none;
-  margin: 0 0 1.875em;
+  list-style:none;
+  margin: 0;
   min-height: 1.875em;
   overflow: hidden;
-  padding: 0.9375em;
+  padding: 0.75em;
+  color: #fff;
+  li{
+      list-style:none;
+  }
+  a{
+    color: #fff;
+  }
+    &:before{
+  content: "\f0a1";
+    font-family: FontAwesome;
+    color: #FFEB3B;
+    font-size: 18px;
+    padding-right: 0.5em;
+    float: left;
+    }
 }
+.text_marqueewrapper{
+  z-index:1 ;
+  position: relative;
+}
\ No newline at end of file
diff --git a/assets/stylesheets/template/modules/universal-table.scss b/assets/stylesheets/template/modules/universal-table.scss
index 38406bf..c354621 100644
--- a/assets/stylesheets/template/modules/universal-table.scss
+++ b/assets/stylesheets/template/modules/universal-table.scss
@@ -1,6 +1,25 @@
 @charset "utf-8";
 
 @import "../initial";
+.universal-table-index tbody{
+  width:100% ;
+}
+.universal-table-show{
+  .view_count > i:before{
+    content: "\f019"!important;
+    margin: 0.5em;
+    padding: 0.5em;
+    border-radius: 1em;
+  }
+}
+.universal-table-index{
+  .view_count > i:before{
+    content: "\f019"!important;
+    margin: 0.5em;
+    padding: 0.5em;
+    border-radius: 1em;
+  }
+}
 .universal-table-index{
   tr{
       background-color: #fff!important;
@@ -193,10 +212,10 @@
   }
 }
 .column_entry_files{
-    padding-left: 1em;
+    padding-left:0;
 }
 .column_entry_file{
-    list-style: disc;
+    list-style: none;
 }
 .ken-click2{
   margin-top:-3em;
diff --git a/assets/stylesheets/template/modules/video.scss b/assets/stylesheets/template/modules/video.scss
new file mode 100644
index 0000000..0173c0e
--- /dev/null
+++ b/assets/stylesheets/template/modules/video.scss
@@ -0,0 +1,963 @@
+@charset "utf-8";
+
+@import "../initial";
+.video_desc{
+  cite{
+    display: none;
+  }
+}
+.video_tag .video_tags2{
+  display: none;
+  &:first-child{
+    display: block!important;
+  }
+}
+.Video__Player{
+  display: flex;
+      -webkit-box-align: center;
+      align-items: center;
+      -webkit-box-pack: center;
+      justify-content: center;
+      width: 100%;
+      height: 100%;
+      .Video__PlayerButton{
+        display: inline-block;
+        padding-bottom: 0px;
+        padding-top: 0px;
+        border-radius: 50%;
+        border: 0px;
+        background-color: $theme-color-second;
+        background: url(/assets/btn-play.svg) no-repeat;
+        background-size: 100%;
+        background-repeat: no-repeat;
+        background-position: center center;
+        transition: 0.5s;
+        width: 60px;
+        height: 60px;
+        &:hover{
+          width: 80px;
+          height: 80px;
+        }
+      }
+}
+.view_info{
+  max-height: 100%;
+  border-radius: 2px;
+  font-size: 0.875rem;
+  font-weight: normal;
+  letter-spacing: 0.3px;
+  text-align: center;
+  display: flex;
+  -webkit-box-align: center;
+  align-items: center;
+  position: absolute;
+  padding: 0px 8px;
+  background-color: #000000cc;
+  color: rgb(255, 255, 255);
+  z-index: 10;
+  top: 10px;
+  left: 10px;
+  border: 1px solid transparent;
+  line-height: 1.45;
+  span{
+    color:#fff;
+  }
+  &:before{
+    content: "";
+    display: inline-block;
+    margin-right: 5px;
+    width: 14px;
+    height: 10px;
+    background: url(/assets/icon-view@2x.png) no-repeat;
+    position: relative;
+    background-size: contain;
+  }
+}
+.w-video_data{
+  padding-bottom: 1em;
+  position: relative;
+  .video_keyword{
+    display: none;
+  }
+  .video_tag{
+    top:10px;
+    max-height: 100%;
+    border: 0;
+    border-radius: 2px;
+    background-color: transparent;
+    font-size: 0.875rem;
+    font-family: "Noto Sans TC", PingFangTC, 微軟正黑體, "Microsoft JhengHei", sans-serif;
+    font-weight: normal;
+    letter-spacing: 0.3px;
+    text-align: center;
+    display: flex;
+    -webkit-box-align: center;
+    align-items: center;
+    position: absolute;
+    padding: 0px 8px;
+    color: #fff;
+    z-index: 5;
+    .video_tags2 {
+      &:first-child{
+        border:1px #fff solid;
+        border-radius: 2px;
+        background-color: #1515154d;
+      }
+      float: left;
+      padding: 0 0.5em;
+
+    }
+  }
+}
+.view_info{
+  img{
+    width: 30px!important;
+  }
+}
+.videohover{
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  transition: 0.3s;
+  top: 0;
+  opacity: 0;
+}
+.video_data{
+  z-index: 1!important;
+  position: relative!important;
+  &:hover{
+    .video_title{
+      .video_link{
+        color: $theme-color-second;
+        text-decoration: underline;
+      }
+    }
+
+    .videohover{
+      position: absolute;
+      width: 100%;
+      height: 100%;
+      transition: 0.3s;
+      z-index: 2;
+      opacity: 1;
+    }
+  }
+  &:hover{
+    @media(min-width: 1025px){
+      .video_snapshot{
+            box-shadow: 4px 4px 5px 1px rgba(0, 0, 0, 0.3);
+            -webkit-transform: scale(1.1) ;
+            -ms-transform: scale(1.1) ;
+            transform: scale(1.1) ;
+            -webkit-transition: all .3s ease;
+            -moz-transition: all .3s ease;
+            -ms-transition: all .3s ease;
+            -o-transition: all .3s ease;
+            transition: all .3s ease;
+      }
+      .video_linkwrapper2{
+        .video_snapshot{
+              -webkit-transform: scale(1.1) !important;
+              -ms-transform: scale(1.1) !important;
+              transform: scale(1.1) !important;
+        }
+      }
+    }
+    .video_tag{
+      display: none;
+    }
+    
+  }
+  img{
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+  }
+
+  @media(max-width: 768px){
+    width: 100%;
+  }
+}
+
+.video_data-widget-1{
+  .video_info{
+      margin:0.5em 0;
+  }
+}
+.video_data-widget-2{
+
+  cite{
+    display: none;
+  }
+  .col-sm-4{
+    @media(min-width:768px){
+      width: 33.33333333%;
+      float: left;
+    }
+  }
+  .video_data_wrap{
+    @media(min-width:$screen-xs){
+      display: flex;
+      flex-wrap: wrap;
+    }
+  }
+
+  .video_desc{
+    display: none;
+  }
+  .video_info{
+      margin:0.5em 0;
+  }
+  .video_link{
+    display: -webkit-box;
+    -webkit-line-clamp: 3;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: normal;
+  }
+  .video_keyword{
+    display: none;
+  }
+  .video_data{
+    &:first-child{
+      .video_tags2{
+        display: block!important;
+       }
+      .video_linkwrapper2{
+
+        @media(min-width:$screen-xs)and(max-width:768px){
+          height: 24em;
+        }
+      }
+      width: 100% ;
+      margin-bottom: 2em;
+      @media(max-width:1024px){
+        width: 100%!important;
+      }
+      @media(max-width:$screen-xs){
+        width: 100.5vw !important;
+        margin-left: -6vw;
+      }
+      .video_desc{
+        .video_link{
+          &:hover{
+            &:before{
+              background-color: #c21000!important;
+            }
+          }
+          &:before{
+            content: " ▶ 觀看節目"; /* Font Awesome 播放圖示 + 文字 */
+            font-weight: 900; 
+            position: absolute;
+            display: inline-flex;
+            align-items: center;
+            gap: 5px; 
+            display: inline-flex;
+                -webkit-box-pack: center;
+                justify-content: center;
+                -webkit-box-align: center;
+                align-items: center;
+                padding: 0px 15px;
+                height: 44px;
+                border-radius: 22px;
+                line-height: 42px;
+                border: 1px solid transparent;
+                background-color: $theme-color-second;
+                color: rgb(255, 255, 255);
+                font-size: 1.25rem;
+                letter-spacing: 0.3px;
+                font-weight: normal;
+                white-space: nowrap;
+                transition: 0.3s;
+                bottom: 3em;
+          }
+        }
+      }
+
+      .videohover{
+        display: none!important;
+      }
+      .video_tag{
+        position: absolute;
+        left: 6em;
+        bottom: 8em;
+        top: auto;
+        display: block!important;
+        background-color:transparent;
+        border:0;
+      }
+      .video_desc{
+        display: block;
+        height: 4.1em;
+        overflow: hidden;
+        margin-bottom: 8em;
+
+      }
+
+      .video_group_time{
+        color: #fff!important;
+        position: absolute;
+        bottom: 4.5em;
+        margin-left: 10.5em;
+      }
+      .view_info{
+        display: none;
+      }
+
+      @media(min-width:767px){
+
+        &:before{
+          content: '';
+          position: absolute;
+          bottom: 0;
+          background-image: linear-gradient(to right, rgba(0, 0, 0, 0.6) 0%, rgba(0, 0, 0, 0.6) 30%, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0) 100%);
+          top: 0;
+          z-index: 1;
+          width: 100%;
+          height: 100%;
+        }
+      }
+      .video_info{
+        position: absolute;
+        z-index: 2;
+        bottom: 0;
+        color: #fff;
+        a{
+          color: #fff;
+        }
+        @media(min-width:767px){
+          padding: 2em 5em;
+          width: 55%;
+        }
+        @media(max-width:820px)and(min-width:767px){
+          .video_title h5{
+            font-size: 1.6em;
+          }
+        }
+        @media(max-width:767px){
+          margin: 0;
+          padding: 1em;
+          background-color: #444;
+          position: relative;
+          padding-bottom: 4em;
+          padding-top: 3em;
+          .video_title h5{
+            font-size: 1.2em;
+            text-align: center;
+          }
+          .video_tag{
+            left: 12%;
+            bottom: 10.5em;
+            flex-wrap: wrap;
+            justify-content: center;
+            display: flex!important;
+            width: 75%;
+            .video_keyword{
+              margin-top: 0.5em;
+            }
+          }
+          .video_link:before{
+            bottom: 4em;
+            left: 32vw;
+          }
+          .video_group_time{
+            margin-left: 0;
+            width: 100%;
+            text-align: center;
+            left: 0;
+            bottom:2.5em;
+          }
+        }
+
+      }
+
+
+      .video_linkwrapper2{
+          @media(min-width:1025px){
+            height: 40.6em;
+          }
+          @media(min-width:769px)and(max-width:1024px){
+            height: 32.6em!important;
+          }
+          @media(max-width: 821px)and(min-width: 769px){
+            height: 25.6em!important;
+          }
+          @media(max-width:$screen-xs){
+            height: 14.5em!important;
+          }
+      }
+
+    }
+
+  }
+}
+.video_data-widget-3{
+  @media(max-width:768px){
+      margin-bottom: 3em;
+  }
+  .btnwrapper{
+    @media(max-width:768px)and(min-width:$screen-xs){
+      top:100%!important;
+      width: 14%!important;
+      left: 44%!important;
+    }
+    @media(max-width:$screen-xs){
+      top: 100%!important;
+      width: 24% !important;
+      left: 38% !important;
+    }
+  }
+  .video_data_wrap{
+    @media(min-width:$screen-xs){
+      display: flex;
+      flex-wrap: wrap;
+    }
+  }
+  .video_data{
+    @media(max-width:821px)and(min-width:$screen-xs){
+      width: 48vw !important;
+      float: none;
+    }
+    @media(max-width:$screen-xs){
+      width: 92.5vw !important;
+      margin-left: 0 !important;
+      margin-right: 1em !important;
+      float: none;
+    }
+  }
+  .video_desc{
+    display: -webkit-box;
+    -webkit-line-clamp: 3; 
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    max-height: 4.5em;
+    line-height: 1.5em; 
+    min-height: 4.5em;
+  }
+  .video_info{
+      margin:0.5em 0;
+  }
+  .video_link{
+    display: -webkit-box;
+    -webkit-line-clamp: 3;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: normal;
+  }
+}
+.video_data-widget-5{
+  margin-bottom: 1em!important;
+  .video_data{
+    .video_group_time{
+      display: none;
+    }
+    .video_desc{
+      display: none;
+    }
+  }
+  span.video-date {
+    display: block;
+    font-size: 0.875rem;
+    font-family: "Noto Sans TC", PingFangTC, 微軟正黑體, "Microsoft JhengHei", sans-serif;
+    font-weight: normal;
+    letter-spacing: 0.3px;
+    color: #8f8f8f;
+    line-height: 1.6;
+    cursor: pointer;
+}
+  margin-bottom: 1em;
+  .cycle-pager{
+    font-size: 1.25rem;
+    font-family: "Noto Serif TC", serif;
+    font-weight: bold;
+    h5{
+      font-size: 1.25rem;
+      border-bottom: 1px solid #ccc;
+      padding: 0.5em 0;
+      margin-top: 0;
+    }
+  }
+  
+    .video_title h5{
+      @extend .i-title;
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    .view_info{
+      float: right;
+    }
+    .view_info img{
+      margin-right: 5px;
+    }
+    .Video__Player{
+      display: flex;
+          -webkit-box-align: center;
+          align-items: center;
+          -webkit-box-pack: center;
+          justify-content: center;
+          width: 100%;
+          height: 100%;
+          .Video__PlayerButton{
+            display: inline-block;
+            padding-bottom: 0px;
+            padding-top: 0px;
+            border-radius: 50%;
+            border: 0px;
+            background-color: $theme-color-second;
+            background: url(/assets/btn-play.svg) no-repeat;
+            background-size: 100%;
+            background-repeat: no-repeat;
+            background-position: center center;
+            transition: 0.5s;
+            width: 60px;
+            height: 60px;
+            &:hover{
+              width: 80px;
+              height: 80px;
+            }
+          }
+    }
+    .view_info{
+      max-height: 100%;
+      border-radius: 2px;
+      font-size: 0.875rem;
+      font-weight: normal;
+      letter-spacing: 0.3px;
+      text-align: center;
+      display: flex;
+      -webkit-box-align: center;
+      align-items: center;
+      position: absolute;
+      padding: 0px 8px;
+      background-color: #000000cc;
+      color: rgb(255, 255, 255);
+      z-index: 10;
+      top: 10px;
+      left: 10px;
+      border: 1px solid transparent;
+      line-height: 1.45;
+      span{
+        color:#fff;
+      }
+      &:before{
+        content: "";
+        display: inline-block;
+        margin-right: 5px;
+        width: 14px;
+        height: 10px;
+        background: url(/assets/icon-view@2x.png) no-repeat;
+        position: relative;
+        background-size: contain;
+      }
+    }
+  .cycle-sentinel {
+    display: none !important;
+}
+  .pager-controls{
+    position: absolute;
+    right: 1em;
+    bottom: 1em;
+    .prev-btn,.next-btn{
+      color: #909090;
+      background: #fff;
+      border-radius: 50%;
+      border: none;
+      height: 2.5em;
+      width: 2.5em;
+      transition: .3s;
+      &:hover{
+        filter: drop-shadow(rgb(214, 214, 214) 0px 0px 0.1rem);
+      }
+    }
+    @media(max-width:768px){
+      position: relative;
+      float: right;
+      right: 0;
+      bottom: 0;
+    }
+  }
+  .video_data_wrap{
+    @media(min-width:$screen-xs){
+      display: flex;
+      flex-wrap: wrap;
+    }
+  }
+  .video_data{
+    @media(max-width:$screen-xs){
+      width: 88.5vw !important;
+      margin-left: 0 !important;
+      margin-right: 1em !important;
+      float: none;
+    }
+  }
+  .video_desc{
+    display: -webkit-box;
+    -webkit-line-clamp: 3; 
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    max-height: 4.5em;
+    line-height: 1.5em; 
+  }
+  .video_info{
+      margin:0.5em 0;
+  }
+  .video_link{
+    display: -webkit-box;
+    -webkit-line-clamp: 3;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: normal;
+  }
+}
+.video_detail{
+  @media(max-width:820px){
+    .video_box_wrap{
+      width: 100vw!important;
+      left: -1em!important;
+      margin: 0;
+    }
+  }
+
+  h3{
+    margin-top: 0.5em;
+  }
+}
+.movie_desc{
+  clear: both;
+  letter-spacing: 0.3px;
+  color: #8f8f8f;
+  line-height: 1.8;
+}
+.video_title {
+    clear: both;
+}
+.video_data{
+  list-style: none;
+}
+.video_tag{
+  display: flex;
+  float: left;
+}
+.view_info{
+      margin-bottom: 1em;
+}
+.video_group_time{
+  clear: both;
+}
+.video_group_time{
+  color: #8f8f8f!important;
+}
+.movietitle{
+  margin-bottom: 15px;
+  width: 100%;
+  border-bottom: 1px solid #ccc;
+  clear: both;
+  font-family: "Noto Serif TC", serif;
+  font-weight: bold;
+  h4{
+    width: 100px;
+    border-bottom: 2px solid #141414;
+    padding-bottom: 0.5em;
+    margin-bottom: 0;
+  }
+}
+.imglst_desc{
+  .cite{
+    font-style: normal !important;
+  }
+  .video_tag{
+    background-color: transparent;
+    color: $theme-color-second;
+    font-weight: normal;
+    letter-spacing: 0.3px;
+    text-align: center;
+    display: inline-block;
+    padding: 0px 7px;
+    max-height: 100%;
+    border-radius: 2px;
+    margin-bottom: 1em;
+    &:first-child{
+      border: 1px solid;
+    }
+  }
+}
+.video_title {
+    clear: both;
+    @extend .i-title;
+}
+.video_data_wrap{
+  padding-right: 0.4375em;
+  padding-left: 0.4375em;
+}
+.imglst_desc{
+  margin: 1em 0;
+}
+.category_box {
+    padding: 0;
+    border: 1px solid #6868688f;
+    border-radius: 0.5em 0 0 0.5em;
+    overflow: hidden;
+}
+.search_box{
+  padding: 0;
+  border-radius: 0 0.5em 0.5em 0;
+  overflow: hidden;
+  border: 1px solid #6868688f;
+}
+.video_linkwrapper{
+  position:relative;
+  height: 12em;
+  overflow:hidden;
+  width: 100%;
+  img{
+    width: 100%;
+  }
+
+}
+.video_desc {
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: normal;
+    padding-bottom: 0;
+
+}
+.video_data-widget-10{
+  padding-top: 2em;
+  .video_info{
+      margin:0.5em 0;
+  }
+  .video_data{
+    @media(max-width:820px)and(min-width: $screen-xs){
+      width: 50%!important;
+  }
+  }
+}
+.video_linkwrapper10{
+  position: relative;
+  overflow: hidden;
+  height: 9.5em;
+  @media(max-width: 1025px)and(min-width: 821px){
+      height:7.5em;
+  }
+  @media(max-width: 821px)and(min-width: 769px){
+      height:13em;
+  }
+  @media(max-width:768px)and(min-width: 600px){
+    height: 12em;
+  }
+  @media(max-width: $screen-xs){
+      height:13em;
+  }
+}
+.video_linkwrapper{
+  @media(max-width: 1025px)and(min-width: 821px){
+      height:10.5em;
+  }
+  @media(max-width: 821px)and(min-width: 769px){
+      height:8em;
+  }
+  @media(max-width:768px)and(min-width: 600px){
+      height: 23.5em;
+  }
+  @media(max-width: $screen-xs){
+      height: 12em;
+  }
+}
+.video_linkwrapper2{
+  position:relative;
+  height: 13.5em;
+  overflow:hidden;
+
+  @media(max-width: 1025px)and(min-width: 769px){
+      height:10em;
+
+  }
+  @media(max-width: 821px)and(min-width: 768px){
+    height:7.5em;
+
+  }
+  @media(max-width:767px)and(min-width:$screen-xs){
+      height: 22.5em;
+  }
+  @media(max-width:$screen-xs){
+      height: 12em;
+  }
+}
+.video_linkwrapper3{
+  position:relative;
+  height: 13.5em;
+  overflow:hidden;
+
+  @media(max-width: 1025px)and(min-width: 821px){
+    height:10em;
+
+  }
+@media(max-width: 821px)and(min-width: 769px){
+  height: 7.8em;
+
+
+}
+@media(max-width:768px)and(min-width:$screen-xs){
+    height: 12em;
+
+}
+@media(max-width: $screen-xs){
+    height:12em;
+}
+}
+.video_linkwrapper5{
+
+  position:relative;
+  height: 27em;
+  overflow:hidden;
+
+  @media(max-width: 1025px)and(min-width: 821px){
+    height:21.5em;
+
+  }
+@media(max-width: 821px)and(min-width: 769px){
+  height: 7.8em;
+
+
+}
+@media(max-width:768px)and(min-width:$screen-xs){
+  height: 25em;
+
+}
+@media(max-width: $screen-xs){
+    height:12em;
+
+}
+}
+.video_group_time{
+  q{
+    margin-left: 0.5em;
+  }
+  q::before {
+    display: none!important;
+  }
+  q::after {
+    display: none!important;
+  }
+}
+
+.video_data-modal-view .play_icon{
+  height: 55px;
+}
+.video_box_wrap{
+  box-shadow: #15151580 0px 2px 10px 0px;
+  margin-bottom: 1em;
+}
+.video_data-index-1{
+  .view_info{
+    position: relative;
+  }
+}
+.video_data-post-agency-1{
+  .view_info{
+    position: relative;
+  }
+}
+.video_data-index-2{
+  .video_tag{
+    display: block!important;
+  }
+}
+.video_data-index-4{
+
+  .i-annc__page-title{
+    display: none;
+  }
+  .category_box{
+    border:0;
+    display: flex;
+    justify-content: center;
+  }
+  button.category-btn{
+    margin: 0.5em;
+    display: inline-flex;
+        -webkit-box-pack: center;
+        justify-content: center;
+        -webkit-box-align: center;
+        align-items: center;
+        padding: 0px 15px;
+        height: 36px;
+        border-radius: 18px;
+        line-height: 34px;
+        border: 1px solid rgb(204, 204, 204);
+        background-color: rgb(255, 255, 255);
+        color: rgb(20, 20, 20);
+        font-size: 1rem;
+        font-family: "Noto Sans TC", PingFangTC, 微軟正黑體, "Microsoft JhengHei", sans-serif;
+        letter-spacing: 0.3px;
+        font-weight: normal;
+        white-space: nowrap;
+        transition: 0.3s;
+        &:hover{
+          background-color: $theme-color-second;
+          color: #ffffff;
+        }
+        &:active{
+          background-color: $theme-color-second;
+          color: #ffffff;
+        }
+  }
+  // .video_linkwrapper2{
+  //   height: 9.5em;
+  // }
+    .video_desc{
+      letter-spacing: 0.3px;
+      color: #8f8f8f;
+      line-height: 1.6;
+      max-height: 5em;
+    }
+    .video_info{
+        margin:0.5em 0;
+    }
+    .video_link{
+      display: -webkit-box;
+      -webkit-line-clamp: 3;
+      -webkit-box-orient: vertical;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: normal;
+    }
+    .video_tag{
+      top:5px;
+      left: 10px;
+      max-height: 100%;
+      border: 0;
+      border-radius: 2px;
+      background-color: transparent;
+      font-size: 0.875rem;
+      font-family: "Noto Sans TC", PingFangTC, 微軟正黑體, "Microsoft JhengHei", sans-serif;
+      font-weight: normal;
+      letter-spacing: 0.3px;
+      text-align: center;
+      display: flex;
+      -webkit-box-align: center;
+      align-items: center;
+      position: absolute;
+      padding: 0px 8px;
+      color: #fff;
+      z-index: 5;
+      .video_tags2 {
+        float: left;
+        min-width: 5em;
+        border: 1px solid;
+        border-radius: 2px;
+        background-color: #1515154d;
+      }
+    }
+}
\ No newline at end of file
diff --git a/assets/stylesheets/template/modules/web_resource.scss b/assets/stylesheets/template/modules/web_resource.scss
index adfeeba..0c881c4 100644
--- a/assets/stylesheets/template/modules/web_resource.scss
+++ b/assets/stylesheets/template/modules/web_resource.scss
@@ -3,6 +3,28 @@
 @import "../initial";
 
 // Link MODULES
+.morebken{
+  font-size: 1.2em;
+  font-weight: normal;
+  color: #333;
+  padding: 0.5em 1em;
+  width: fit-content;
+  float: right;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  &:hover{
+    color: $theme-color-second;
+  }
+  i{
+    font-size: 0.8em;
+    padding-left: 5px;
+  }
+}
+.rotate {
+    -webkit-transform: rotate(-180deg);
+    transform: rotate(-180deg);
+}
 .widget-link_wrapper{
   z-index: 1;
 }
@@ -36,7 +58,7 @@
       align-items: normal;
     }
     .liWrapper{
-      margin: 0.5em;
+      margin:0 0.5em;
       overflow: hidden;
     }
   }
@@ -46,7 +68,7 @@
 
   &.widget1 {
     img{
-      width: 32%;
+      // width: 32%;
     }
     .widget-content {
       text-align: center;
@@ -56,7 +78,6 @@
       }
 
       .widget-content-title {
-        display: inline-block;
         padding-top: 0.5em;
         @extend .i-subtitle;
       }
@@ -70,6 +91,17 @@
       }
     }
   }
+  &.widget2{
+      .list-unstyled{
+        display: flex;
+        justify-content: center;
+        flex-wrap: wrap;
+        overflow: hidden;
+        li:nth-child(n+5){
+          display: none;
+        }
+      }
+  }
   &.widget-3 {
     ul{
       @media(max-width: $screen-xs){
@@ -108,10 +140,10 @@
         padding: 0.5em !important;
       }
       .link-img-wrap{
-        border-radius: 50%;
+        border-radius:10em;
         overflow: hidden;
         &:hover{
-          border-radius: 20%;
+          border-radius:2em;
           -webkit-transition: .3s all ease;
           -o-transition: .3s all ease;
           transition: .3s all ease;
@@ -169,6 +201,7 @@
 
 // Link INDEX
 .index-link {
+  clear: both;
   .index-title {
     @extend .unity-title;
   }
diff --git a/modules/ad_banner/_ad_banner_widget0.html.erb b/modules/ad_banner/_ad_banner_widget0.html.erb
index 67a7f26..1d99635 100644
--- a/modules/ad_banner/_ad_banner_widget0.html.erb
+++ b/modules/ad_banner/_ad_banner_widget0.html.erb
@@ -29,7 +29,10 @@
   <div class="w-ad-banner__pager-1 w-ba-banner__caption banner-pager banner_caption_{{subpart-id}}" data-list="images" data-level="0">
     <li><button title="Slide {{slide_number}}"><span style="display: none;">Slide {{slide_number}}</span></button></li>
   </div>
-  <ul class="controlplay"><a role="button" href="javascript:;" class="resume-slide active" title="<%= I18n.t("ad_banner.resume") %>"><i aria-hidden="true" aria-label="<%= I18n.t("ad_banner.resume") %>"></i><p style="display: none;"><%= I18n.t("ad_banner.resume") %></p></a><a href="javascript:;" class="pause-slide" title="<%= I18n.t("ad_banner.pause") %>"><i aria-hidden="true" aria-label="<%= I18n.t("ad_banner.pause") %>"></i><p style="display: none;"><%= I18n.t("ad_banner.pause") %></p></a></ul>
+  <ul class="controlplay">
+    <a role="button" class="resume-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "繼續播放" : "resume" %>"><i></i></a>
+    <a class="pause-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "暫停播放" : "pause"%>"><i></i></a>
+  </ul>
   <ul class="button-mid">
     <i class="fa fa-angle-left prev-button" aria-label="<%= I18n.t("ad_banner.prev") %>"></i>
     <i class="fa fa-angle-right next-button" aria-label="<%= I18n.t("ad_banner.next") %>"></i>
diff --git a/modules/ad_banner/_ad_banner_widget1.html.erb b/modules/ad_banner/_ad_banner_widget1.html.erb
index 69c96c5..0a19702 100644
--- a/modules/ad_banner/_ad_banner_widget1.html.erb
+++ b/modules/ad_banner/_ad_banner_widget1.html.erb
@@ -32,7 +32,10 @@
   <div class="w-ad-banner__pager-1 w-ba-banner__caption banner-pager banner_caption_{{subpart-id}}" data-list="images" data-level="0">
     <li><button title="Slide {{slide_number}}"><span style="display: none;">Slide {{slide_number}}</span></button></li>
   </div>
-  <ul class="controlplay"><a role="button" href="javascript:;" class="resume-slide active" title="<%= I18n.t("ad_banner.resume") %>"><i aria-hidden="true" aria-label="<%= I18n.t("ad_banner.resume") %>"></i><p style="display: none;"><%= I18n.t("ad_banner.resume") %></p></a><a href="javascript:;" class="pause-slide" title="<%= I18n.t("ad_banner.pause") %>"><i aria-hidden="true" aria-label="<%= I18n.t("ad_banner.pause") %>"></i><p style="display: none;"><%= I18n.t("ad_banner.pause") %></p></a></ul>
+  <ul class="controlplay">
+    <a role="button" class="resume-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "繼續播放" : "resume" %>"><i></i></a>
+    <a class="pause-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "暫停播放" : "pause"%>"><i></i></a>
+  </ul>
   <ul class="button-mid">
     <i class="fa fa-angle-left prev-button" aria-label="<%= I18n.t("ad_banner.prev") %>"></i>
     <i class="fa fa-angle-right next-button" aria-label="<%= I18n.t("ad_banner.next") %>"></i>
diff --git a/modules/ad_banner/_ad_banner_widget2_video.html.erb b/modules/ad_banner/_ad_banner_widget2_video.html.erb
index c0d483d..d9be7d3 100644
--- a/modules/ad_banner/_ad_banner_widget2_video.html.erb
+++ b/modules/ad_banner/_ad_banner_widget2_video.html.erb
@@ -26,7 +26,10 @@
   </div>
   <div class="ad-overlay w-ad-banner__overlay_{{subpart-id}}"></div>
   <div class="w-ba-banner__caption w-ad-banner__pager-2 banner-pager banner_caption_{{subpart-id}}"></div>
-  <ul class="controlplay"><a role="button" href="javascript:;" class="resume-slide active" title="<%= I18n.t("ad_banner.resume") %>"><i aria-hidden="true" aria-label="<%= I18n.t("ad_banner.resume") %>"></i><p style="display: none;"><%= I18n.t("ad_banner.resume") %></p></a><a href="javascript:;" class="pause-slide" title="<%= I18n.t("ad_banner.pause") %>"><i aria-hidden="true" aria-label="<%= I18n.t("ad_banner.pause") %>"></i><p style="display: none;"><%= I18n.t("ad_banner.pause") %></p></a></ul>
+  <ul class="controlplay">
+    <a role="button" class="resume-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "繼續播放" : "resume" %>"><i></i></a>
+    <a class="pause-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "暫停播放" : "pause"%>"><i></i></a>
+  </ul>
   <ul class="button-mid">
     <i class="fa fa-angle-left prev-button" aria-label="<%= I18n.t("ad_banner.prev") %>"></i>
     <i class="fa fa-angle-right next-button" aria-label="<%= I18n.t("ad_banner.next") %>"></i>
diff --git a/modules/ad_banner/_ad_banner_widget3.html.erb b/modules/ad_banner/_ad_banner_widget3.html.erb
index f2618ed..005de15 100644
--- a/modules/ad_banner/_ad_banner_widget3.html.erb
+++ b/modules/ad_banner/_ad_banner_widget3.html.erb
@@ -27,7 +27,10 @@
     </div>
   </div>
   <ul class="w-ba-banner__pager-3 banner-pager banner_caption_{{subpart-id}}"></ul>
-	<ul class="controlplay"><a role="button" class="resume-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "繼續播放" : "resume" %>"><i></i></a><a class="pause-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "暫停播放" : "pause"%>"><i></i></a></ul>
+  <ul class="controlplay">
+    <a role="button" class="resume-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "繼續播放" : "resume" %>"><i></i></a>
+    <a class="pause-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "暫停播放" : "pause"%>"><i></i></a>
+  </ul>
 	<ul class="button-mid">
 		<button class="prev-button" title = "<%= (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" %>"></button>
 		<button class="next-button" title = "<%= (I18n.locale.to_s =="zh_tw") ? "下一張" : "next" %>"></button>
diff --git a/modules/ad_banner/_ad_banner_widget5.html.erb b/modules/ad_banner/_ad_banner_widget5.html.erb
index a64c20d..ecc06bb 100644
--- a/modules/ad_banner/_ad_banner_widget5.html.erb
+++ b/modules/ad_banner/_ad_banner_widget5.html.erb
@@ -34,7 +34,10 @@
     </div>
   </div>
     <div class="w-ba-banner__caption banner-pager banner_caption_{{subpart-id}}"></div>
-    <ul class="controlplay"><a role="button" class="resume-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "繼續播放" : "resume" %>"><i></i></a><a class="pause-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "暫停播放" : "pause"%>"><i></i></a></ul>
+  <ul class="controlplay">
+    <a role="button" class="resume-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "繼續播放" : "resume" %>"><i></i></a>
+    <a class="pause-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "暫停播放" : "pause"%>"><i></i></a>
+  </ul>
 	<ul class="button-mid">
     <i class="fa fa-angle-left prev-button" aria-hidden="true" title = "<%= (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" %>"></i>
     <i class="fa fa-angle-right next-button" aria-hidden="true" title = "<%= (I18n.locale.to_s =="zh_tw") ? "下一張" : "next" %>"></i>
diff --git a/modules/ad_banner/_ad_banner_widget6.html .erb b/modules/ad_banner/_ad_banner_widget6.html .erb
index c42a9f4..96dbcf0 100644
--- a/modules/ad_banner/_ad_banner_widget6.html .erb	
+++ b/modules/ad_banner/_ad_banner_widget6.html .erb	
@@ -32,7 +32,10 @@
     <div class="w-ba-banner__caption banner-pager banner_caption_{{subpart-id}}" data-list="images" data-level="0">
       <li><button title="Slide {{slide_number}}"><span style="display: none;">Slide {{slide_number}}</span></button></li>
     </div>
-    <ul class="controlplay"><a role="button" class="resume-slide active" title = "<%= (I18n.locale.to_s =="zh_tw") ? "繼續播放" : "resume" %>"><i></i></a><a class="pause-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "暫停播放" : "pause"%>"><i></i></a></ul>
+  <ul class="controlplay">
+    <a role="button" class="resume-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "繼續播放" : "resume" %>"><i></i></a>
+    <a class="pause-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "暫停播放" : "pause"%>"><i></i></a>
+  </ul>
   <ul class="button-mid">
     <i class="fa fa-angle-left prev-button" aria-hidden="true" title = "<%= (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" %>"></i>
     <i class="fa fa-angle-right next-button" aria-hidden="true" title = "<%= (I18n.locale.to_s =="zh_tw") ? "下一張" : "next" %>"></i>
diff --git a/modules/ad_banner/_ad_banner_widget7.html.erb b/modules/ad_banner/_ad_banner_widget7.html.erb
index 91bfaed..d4449b9 100644
--- a/modules/ad_banner/_ad_banner_widget7.html.erb
+++ b/modules/ad_banner/_ad_banner_widget7.html.erb
@@ -32,7 +32,10 @@
     <div class="w-ad-banner__pager-1 w-ba-banner__caption banner-pager banner_caption_{{subpart-id}}" data-list="images" data-level="0">
       <li><button title="Slide {{slide_number}}"><span style="display: none;">Slide {{slide_number}}</span></button></li>
     </div>
-    <ul class="controlplay"><a role="button" href="javascript:;" class="resume-slide active" title="<%= I18n.t("ad_banner.resume") %>"><i aria-hidden="true" aria-label="<%= I18n.t("ad_banner.resume") %>"></i></a><a href="javascript:;" class="pause-slide" title="<%= I18n.t("ad_banner.pause") %>"><i aria-hidden="true" aria-label="<%= I18n.t("ad_banner.pause") %>"></i></a></ul>
+  <ul class="controlplay">
+    <a role="button" class="resume-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "繼續播放" : "resume" %>"><i></i></a>
+    <a class="pause-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "暫停播放" : "pause"%>"><i></i></a>
+  </ul>
   <ul class="button-mid">
     <i class="fa fa-angle-left prev-button" aria-label="<%= I18n.t("ad_banner.prev") %>"></i>
     <i class="fa fa-angle-right next-button" aria-label="<%= I18n.t("ad_banner.next") %>"></i>
@@ -69,13 +72,6 @@
   .w-ba-banner .controlplay{
     width: auto;
   }
-  .w-ba-banner .button-mid{
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    top: 0;
-    left: 0;
-  }
   .next-button,.prev-button{
     cursor: pointer;
   }
diff --git a/modules/ad_banner/_ad_banner_widget8_video.html.erb b/modules/ad_banner/_ad_banner_widget8_video.html.erb
index d7b2f79..aace0fb 100644
--- a/modules/ad_banner/_ad_banner_widget8_video.html.erb
+++ b/modules/ad_banner/_ad_banner_widget8_video.html.erb
@@ -29,7 +29,10 @@
   </div>
   <div class="ad-overlay w-ad-banner__overlay_{{subpart-id}}"></div>
   <div class="w-ba-banner__caption w-ad-banner__pager-2 banner-pager banner_caption_{{subpart-id}}"></div>
-  <ul class="controlplay"><a role="button" href="javascript:;" class="resume-slide active" title="<%= I18n.t("ad_banner.resume") %>"><i aria-hidden="true" aria-label="<%= I18n.t("ad_banner.resume") %>"></i><p style="display: none;"><%= I18n.t("ad_banner.resume") %></p></a><a href="javascript:;" class="pause-slide" title="<%= I18n.t("ad_banner.pause") %>"><i aria-hidden="true" aria-label="<%= I18n.t("ad_banner.pause") %>"></i><p style="display: none;"><%= I18n.t("ad_banner.pause") %></p></a></ul>
+  <ul class="controlplay">
+    <a role="button" class="resume-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "繼續播放" : "resume" %>"><i></i></a>
+    <a class="pause-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "暫停播放" : "pause"%>"><i></i></a>
+  </ul>
   <ul class="button-mid">
     <i class="fa fa-angle-left prev-button" aria-label="<%= I18n.t("ad_banner.prev") %>"></i>
     <i class="fa fa-angle-right next-button" aria-label="<%= I18n.t("ad_banner.next") %>"></i>
diff --git a/modules/announcement/_annc_widget1.html.erb b/modules/announcement/_annc_widget1.html.erb
index 9301bdf..37a44d2 100644
--- a/modules/announcement/_annc_widget1.html.erb
+++ b/modules/announcement/_annc_widget1.html.erb
@@ -6,7 +6,7 @@
     <li class="w-annc__item">
 
       <div class="w-annc__img-wrap ">
-        <a  href="{{link_to_show}}">
+        <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}}">
         </a>
       </div>
diff --git a/modules/announcement/_annc_widget15.html.erb b/modules/announcement/_annc_widget15.html.erb
index 29333cc..b0b0939 100644
--- a/modules/announcement/_annc_widget15.html.erb
+++ b/modules/announcement/_annc_widget15.html.erb
@@ -26,7 +26,7 @@
     data-cycle-slides=".w-annc__item" >
     <li class="w-annc__item " >
     <div class="w-annc__img-wrap bullseye" style="position:relative">
-      <a  href="{{link_to_show}}" style="">
+	<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}}">
       <div class="transitionfade"></div>
     </a>
diff --git a/modules/announcement/_annc_widget16.html.erb b/modules/announcement/_annc_widget16.html.erb
index c72fa98..fdbd314 100644
--- a/modules/announcement/_annc_widget16.html.erb
+++ b/modules/announcement/_annc_widget16.html.erb
@@ -5,8 +5,8 @@
   </h3>
   
   <div class="slide-button">
-  <button class="cycle-prev btn btn-warning"> <i class="fa fa-angle-left"></i></button>
-  <button class="cycle-next btn btn-warning"> <i class="fa fa-angle-right"></i></button>
+  <button class="cycle-prev btn btn-warning" title="上一張" aria-label="上一張"> <i class="fa fa-angle-left"></i></button>
+  <button class="cycle-next btn btn-warning" title="下一張" aria-label="下一張"> <i class="fa fa-angle-right"></i></button>
   <a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}"><%= (I18n.locale.to_s =="zh_tw") ? "更多+" : "More NEWS" %></a>
   </div>
   
diff --git a/modules/announcement/_annc_widget18.html.erb b/modules/announcement/_annc_widget18.html.erb
index 5289549..fc7c154 100644
--- a/modules/announcement/_annc_widget18.html.erb
+++ b/modules/announcement/_annc_widget18.html.erb
@@ -6,11 +6,11 @@
     <a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}"><%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %></a>
   </div>
   <ul class="w-annc__list  row" data-level="0" data-list="announcements">
-    <li class="w-annc__item  col-md-4">
+    <li class="w-annc__item  col-sm-4">
 	    <div class="w-annc__img-wrap">
-	    	<a href="{{link_to_show}}" title="{{title}}">
+      <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}}">
-	      	</a>
+	      </a>
 	    </div>
 	    <div class="w-annc__content-wrap">
 	      <h4 class="w-annc__entry-title">
diff --git a/modules/announcement/_annc_widget19.html.erb b/modules/announcement/_annc_widget19.html.erb
index 1fc8ade..cfd29dd 100644
--- a/modules/announcement/_annc_widget19.html.erb
+++ b/modules/announcement/_annc_widget19.html.erb
@@ -26,7 +26,7 @@
     data-cycle-slides=".w-annc__item" >
     <li class="w-annc__item ">
     <div class="w-annc__content-wrap" style="position:relative">
-      <a href="{{link_to_show}}" style="">
+	<a href="{{link_to_show}}" aria-label="前往{{widget-title}}" title="{{widget-title}}">
       <div class="w-annc__meta">
         <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
           <span class="w-annc__status label {{status-class}}">{{status}}</span>
diff --git a/modules/announcement/_annc_widget2.html.erb b/modules/announcement/_annc_widget2.html.erb
index 33dc4f4..fcd093f 100644
--- a/modules/announcement/_annc_widget2.html.erb
+++ b/modules/announcement/_annc_widget2.html.erb
@@ -5,7 +5,7 @@
   <ul class="w-annc__list" data-level="0" data-list="announcements">
     <li class="w-annc__item row">
       <div class="w-annc__img-wrap col-sm-4 bullseye">
-        <a  href="{{link_to_show}}">
+      <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}}">
       </a>
       </div>
diff --git a/modules/announcement/_annc_widget20.html.erb b/modules/announcement/_annc_widget20.html.erb
index 88000ed..dbb32c2 100644
--- a/modules/announcement/_annc_widget20.html.erb
+++ b/modules/announcement/_annc_widget20.html.erb
@@ -8,7 +8,7 @@
   <ul class="w-annc__list  row" data-level="0" data-list="announcements">
     <li class="w-annc__item  col-md-4">
     <div class="w-annc__img-wrap bullseye" >
-      <a  href="{{link_to_show}}" >
+	<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}}">
       <div class="transitionfade"></div>
       </a>
diff --git a/modules/announcement/_annc_widget21.html.erb b/modules/announcement/_annc_widget21.html.erb
index 090d1a6..80c9b2f 100644
--- a/modules/announcement/_annc_widget21.html.erb
+++ b/modules/announcement/_annc_widget21.html.erb
@@ -26,7 +26,7 @@
     data-cycle-slides=".w-annc__item" >
       <li class="w-annc__item">
         <div class="w-annc__img-wrap bullseye" >
-          <a  href="{{link_to_show}}" >
+        <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}}">
           <div class="transitionfade"></div>
           </a>
diff --git a/modules/announcement/_annc_widget23.html.erb b/modules/announcement/_annc_widget23.html.erb
new file mode 100644
index 0000000..33e64c3
--- /dev/null
+++ b/modules/announcement/_annc_widget23.html.erb
@@ -0,0 +1,33 @@
+<div class="w-annc  widget-announcement-23">
+  <h3 class="w-annc__widget-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  <ul class="w-annc__list" data-level="0" data-list="announcements">
+    <li class="w-annc__item">
+
+      <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}}">
+        </a>
+      </div>
+      <div class="w-annc__meta">
+        <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
+          <span class="w-annc__status label status {{status-class}}">{{status}}</span>
+        </span>
+        <span class="w-annc__postdate-wrap" date-format="%Y-%m-%d">
+          <span class="w-annc__postdate">{{postdate}}</span>
+        </span>
+        <span class="w-annc__category-wrap">
+          <span class="w-annc__category">{{category}}</span>
+        </span>
+      </div>
+      <h4 class="w-annc__entry-title">
+        <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
+      </h4>
+      <p class="w-annc__subtitle"><a  href="{{link_to_show}}">{{subtitle}}</a></p>
+    </li>
+  </ul>
+  <div class="w-annc__more-wrap clearfix">
+    <a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}"><%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %></a>
+  </div>
+</div>
diff --git a/modules/announcement/_annc_widget24.html.erb b/modules/announcement/_annc_widget24.html.erb
new file mode 100644
index 0000000..6dc75ab
--- /dev/null
+++ b/modules/announcement/_annc_widget24.html.erb
@@ -0,0 +1,111 @@
+<div class="w-annc  widget-announcement-24">
+  <div class="w-annc__more-wrap clearfix">
+    <h3 class="w-annc__widget-title">
+      <span>{{widget-title}}</span>
+    </h3>
+    <a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}"><%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %></a>
+  </div>
+  <ul class="w-annc__list  row" data-level="0" data-list="announcements">
+    <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}}">
+      <div class="transitionfade"></div>
+      </a>
+    </div>
+    <div class="w-annc__content-wrap card">
+      <div class="w-annc__meta">
+        <span class="w-annc__status-wrap" data-list="statuses" data-level="1">
+          <span class="w-annc__status label {{status-class}}">{{status}}</span>
+        </span>
+        <span class="w-annc__postdate-wrap" date-format="%Y-%m-%d">
+          <i class="fa fa-calendar-o"></i>
+          <span class="w-annc__postdate">{{postdate}}</span>
+        </span>
+        <span class="w-annc__category-wrap">
+          <i class="fa fa-tasks"></i>
+          <span class="w-annc__category">{{category}}</span>
+          </span>
+      </div>
+      <h4 class="w-annc__entry-title">
+        <a class="w-annc__title" href="{{link_to_show}}">{{title}}</a>
+      </h4>
+      <p class="w-annc__subtitle">{{subtitle}}</p>
+    </div>
+    </li>
+  </ul>
+</div>
+<style type="text/css">
+	[data-subpart-id="{{subpart-id}}"] .bullseye{
+		overflow: hidden;
+	}
+</style>
+<script>
+	function combineul_{{subpart-id}}(){
+		var parents = $('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list').parent();
+		parents.each(function(i,v){
+			for(var i=1;i<$(v).find('ul.w-annc__list').length;i++)
+				$(v).find('ul.w-annc__list').eq(0).find('>li').eq(-1).after($(v).find('ul.w-annc__list').eq(i).html());
+			var ullength = $(v).find('ul.w-annc__list').length;
+			for(var i = 1;i < ullength;i++)
+				$(v).find('ul.w-annc__list').eq(-1).remove();
+		})
+	};
+	var num;
+	var lilength = $('[data-subpart-id=\"{{subpart-id}}\"] li.w-annc__item').length;
+	function reorganize_{{subpart-id}}(num){
+		combineul_{{subpart-id}}();
+		var parents = $('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list').parent();
+		parents.each(function(i,v){
+			var lilength = $(v).find('li.w-annc__item').length;
+			var ul_length = Math.ceil(lilength/num);
+			for(var ii=1;ii< ul_length;ii++){
+				var clone_ul = $(v).find('ul.w-annc__list').eq(-1).clone();
+				clone_ul.empty();
+				clone_ul.removeClass("active");
+				clone_ul.css("display","");
+				$(v).find('ul.w-annc__list').eq(-1).after(clone_ul.prop("outerHTML"));
+				var lihtml="";
+				if(ii != (ul_length-1)){
+					for(var j=0;j<num;j++){
+						lihtml += $(v).find('li.w-annc__item').eq(ii*num+j).prop("outerHTML");
+					};
+				}else{
+					for(var j=0;j< lilength - num *(ul_length-1) ;j++){
+						lihtml += $(v).find('li.w-annc__item').eq(ii*num+j).prop("outerHTML");
+					};
+				};
+				$(v).find('ul.w-annc__list').eq(-1).html(lihtml);
+			}
+			if(ul_length != 1 )
+				for(var i=0;i< lilength -num ; i++)
+					$(v).find('ul.w-annc__list').eq(0).find("li.w-annc__item").eq(num).remove();
+		})
+		$('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list >li').css('width','calc('+100/num+'% - '+20/20+'em)'); //20px=>li的margin
+		$('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list >li').css("float","left");
+	};
+	$(window).resize(function(){
+		if($(window).width()>1024){
+			reorganize_{{subpart-id}}(4);
+			num=3;
+		}else if($(window).width()>576){
+			reorganize_{{subpart-id}}(4);
+			num=2;
+		}else{
+			reorganize_{{subpart-id}}(4);
+			num=1;
+		}
+	})
+	$(document).ready(function(){
+		if($(window).width()>1024){
+			reorganize_{{subpart-id}}(4);
+			num=3;
+		}else if($(window).width()>576){
+			reorganize_{{subpart-id}}(4);
+			num=2;
+		}else{
+			reorganize_{{subpart-id}}(4);
+			num=1;
+		}
+	})
+</script>
diff --git a/modules/announcement/_annc_widget4.html.erb b/modules/announcement/_annc_widget4.html.erb
index d9bc928..5fb4743 100644
--- a/modules/announcement/_annc_widget4.html.erb
+++ b/modules/announcement/_annc_widget4.html.erb
@@ -8,7 +8,7 @@
   <ul class="w-annc__list  row" data-level="0" data-list="announcements">
     <li class="w-annc__item  col-md-4">
       <div class="w-annc__img-wrap bullseye" style="position:relative">
-        <a  href="{{link_to_show}}" style="">
+	  <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}}">
         <div class="transitionfade"></div>
       </a>
diff --git a/modules/announcement/annc_index20.html.erb b/modules/announcement/annc_index20.html.erb
index 590bae5..26d1d38 100644
--- a/modules/announcement/annc_index20.html.erb
+++ b/modules/announcement/annc_index20.html.erb
@@ -24,6 +24,12 @@
     </li>
 </div>
 {{pagination_goes_here}}
+<style>
+.i-annc__postdate{
+  display:flex;
+}
+
+</style>
 <script>
   function transdate(){
     var n=document.getElementsByClassName('i-annc__postdate').length;
@@ -94,4 +100,4 @@
     };
   });
 
-</script>
+</script>
\ No newline at end of file
diff --git a/modules/announcement/annc_index21.html.erb b/modules/announcement/annc_index21.html.erb
index 62a4c5b..2a45524 100644
--- a/modules/announcement/annc_index21.html.erb
+++ b/modules/announcement/annc_index21.html.erb
@@ -31,7 +31,7 @@ function postdate() {
   var date = $('.i-annc__postdate');
 
   for (let i=0; i<len; i++) {
-    newDate = date[i].innerText.slice(9,10)
+    newDate = date[i].innerText.slice(8,10)
     newYear = date[i].innerText.slice(0,7 )
     date[i].innerHTML= '';
     date[i].append(newYear)
@@ -44,4 +44,4 @@ function postdate() {
 }
 
 postdate();
-</script>
+</script>
\ No newline at end of file
diff --git a/modules/announcement/info.json b/modules/announcement/info.json
index d19b7e6..282a109 100644
--- a/modules/announcement/info.json
+++ b/modules/announcement/info.json
@@ -346,6 +346,22 @@
         "en": "18. 3-Column Standard Image + Text Lite (widget-title, title, subtitle(only display 15 words))"
       },
       "thumbnail": "annc_widget18_thumbs.png"
+    },
+    {
+      "filename": "annc_widget23",
+      "name": {
+        "zh_tw": "23.二四欄圖文型態 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
+        "en": "23. 2-4-Column Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)"
+      },
+      "thumbnail": "annc_widget23_thumbs.png"
+    },
+    {
+      "filename": "annc_widget24",
+      "name": {
+        "zh_tw": "24. 長短兩欄圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
+        "en": "24. longshort2-Column Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)"
+      },
+      "thumbnail": "annc_widget24_thumbs.png"
     }
   ]
 }
diff --git a/modules/announcement/show.html.erb b/modules/announcement/show.html.erb
index 1fce32e..8a3b869 100644
--- a/modules/announcement/show.html.erb
+++ b/modules/announcement/show.html.erb
@@ -19,7 +19,7 @@
   }
 </style>
 <article class="s-annc show-announcement">
-  <h1 class="s-annc__show-title">{{title}}</h1>
+  <h3 class="s-annc__show-title annc-title" aria-label="內頁公告標題">{{title}}</h3>
 
   <ul class="s-annc__meta-wrap list-unstyled no-print">
     <li class="s-annc__date-wrap s-annc__meta--item">
diff --git a/modules/announcement/thumbs/annc_widget23_thumbs.png b/modules/announcement/thumbs/annc_widget23_thumbs.png
new file mode 100644
index 0000000000000000000000000000000000000000..eefe6b235a56d69b70267252f662357bb0595009
GIT binary patch
literal 12280
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

literal 0
HcmV?d00001

diff --git a/modules/announcement/thumbs/annc_widget24_thumbs.png b/modules/announcement/thumbs/annc_widget24_thumbs.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ff5d086ead303320e2a0d87bac74fe2ac994d15
GIT binary patch
literal 13396
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

literal 0
HcmV?d00001

diff --git a/modules/archive/archive_index16.html.erb b/modules/archive/archive_index16.html.erb
index 38b02d6..faacba8 100644
--- a/modules/archive/archive_index16.html.erb
+++ b/modules/archive/archive_index16.html.erb
@@ -40,3 +40,6 @@
     }
   </style>
 </div>
+<script>
+
+</script>
diff --git a/modules/calendar/index.html.erb b/modules/calendar/index.html.erb
index 14d7ab8..f6b7688 100644
--- a/modules/calendar/index.html.erb
+++ b/modules/calendar/index.html.erb
@@ -3,13 +3,13 @@
     <div class="btn-toolbar" id="navigation">
       <div id="calendar-nav">
         <div class="btn-group">
-          <button class="btn btn-default btn-sm" id="prev_month_btn">
+          <button class="btn btn-default btn-sm" id="prev_month_btn" aria-label="上一個月">
             <i class="icon-chevron-left"></i>
           </button>
-          <button class="btn btn-default btn-sm" id="next_month_btn">
+          <button class="btn btn-default btn-sm" id="next_month_btn" aria-label="下一個月">
             <i class="icon-chevron-right"></i>
           </button>
-          <button class="btn btn-default btn-sm" id="today_btn"><%=t('calendar.today')%></button>
+          <button class="btn btn-default btn-sm" id="today_btn" aria-label="今天"><%=t('calendar.today')%></button>
         </div>
       </div>
     </div>
@@ -18,10 +18,10 @@
   <div id='sec3' class="btn-toolbar">
     <div class="btn-group calendar_mode">
       <div data-list="modes_info" data-level="0">
-        <button class="btn btn-default mode_switch btn-sm {{active_class}}" data-mode="{{mode}}" >{{trans}}</button>
+        <button class="btn btn-default mode_switch btn-sm {{active_class}}" data-mode="{{mode}}" aria-label="模式轉換">{{trans}}</button>
       </div>
     </div>
-    <button id="refresh_btn" class="btn btn-default btn-sm">
+    <button id="refresh_btn" class="btn btn-default btn-sm" aria-label="重新整理">
       <i class="icons-cycle"></i>
     </button>
   </div>
diff --git a/modules/e_paper/epaper_index1.html.erb b/modules/e_paper/epaper_index1.html.erb
index 0c4d026..d8510ab 100644
--- a/modules/e_paper/epaper_index1.html.erb
+++ b/modules/e_paper/epaper_index1.html.erb
@@ -1,6 +1,6 @@
 <!-- <div class="latest_slider" data-list="categories" data-level="0">
   <div class="category_title" data-list="topics" data-level="1">
-      <h3><a href="{{category_link}}">{{category_title}}</a></h3>
+      <h3><a href="{{category_link}}" class="btn btn-primary pull-right">{{category_title}}</a></h3>
     <div>
   </div>
 </div> -->
@@ -13,7 +13,7 @@
 			<img src="{{img_url_thumb}}" alt="{{title}}">
 		</div>
 		<div class="epaper-rightContent col-lg-7 col-xs-12" >
-			<h4><a href="{{link_to_show}}">{{title}}</a></h4>
+			<h4><a href="{{link_to_show}}" aria-label="前往{{title}}" title="{{title}}" class="btn btn-primary pull-right">{{title}}</a></h4>
 			<div class="epaper-description">{{description}}</div>
 		</div>
 
diff --git a/modules/e_paper/epaper_index2.html.erb b/modules/e_paper/epaper_index2.html.erb
index 960781e..443132b 100644
--- a/modules/e_paper/epaper_index2.html.erb
+++ b/modules/e_paper/epaper_index2.html.erb
@@ -1,6 +1,6 @@
 <!-- <div class="latest_slider" data-list="categories" data-level="0">
   <div class="category_title" data-list="topics" data-level="1">
-      <h3><a href="{{category_link}}">{{category_title}}</a></h3>
+      <h3><a href="{{category_link}}" class="btn btn-primary pull-right">{{category_title}}</a></h3>
     <div>
   </div>
 </div> -->
@@ -9,14 +9,14 @@
 <div class="epaper-index2" data-list="topics" data-level="0">
 	<!-- <div class="banner-Container "> </div> -->
 	<div class="epaper-index2-container row">
-		<h4><a href="{{link_to_show}}">{{title}}</a>
-			<a href="{{link_to_show}}"><span>{{category_title}}</span></a>
+		<h4><a href="{{link_to_show}}" aria-label="前往{{title}}" title="{{title}}">{{title}}</a>
+			<a href="{{link_to_show}}" aria-label="前往{{title}}" title="{{title}}"><span>{{category_title}}</span></a>
 		</h4>
 		<div class="epaper-leftimg col-lg-5 col-xs-12">
 			<img src="{{img_url_thumb}}" alt="{{title}}">
 		</div>
 		<div class="epaper-rightContent col-lg-7 col-xs-12" >
-			<div class="epaper-description"><a href="{{link_to_show}}">{{description}}</a></div>
+			<div class="epaper-description"><a href="{{link_to_show}} aria-label="前往{{title}}" title="{{title}}""  class="btn btn-primary pull-right">{{description}}</a></div>
 		</div>
 	</div>
 </div>
diff --git a/modules/event_news_mod/_event_news_widget1.html.erb b/modules/event_news_mod/_event_news_widget1.html.erb
index 9ea150b..23ae321 100644
--- a/modules/event_news_mod/_event_news_widget1.html.erb
+++ b/modules/event_news_mod/_event_news_widget1.html.erb
@@ -5,7 +5,7 @@
   <ul class="w-annc__list" data-level="0" data-list="event_news">
     <li class="w-annc__item">
       <div class="w-annc__img-wrap bullseye">
-        <a href="{{link_to_show}}">
+      <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}}">
       </a>
       </div>
diff --git a/modules/event_news_mod/_event_news_widget15.html.erb b/modules/event_news_mod/_event_news_widget15.html.erb
index 584095a..1f13ed4 100644
--- a/modules/event_news_mod/_event_news_widget15.html.erb
+++ b/modules/event_news_mod/_event_news_widget15.html.erb
@@ -1,10 +1,7 @@
 <div class="w-annc  widget-announcement-4 widget-announcement-15 event-news-15" style="position:relative;">
-  <div class="w-annc__more-wrap clearfix">
-    <h3 class="w-annc__widget-title">
-      <span>{{widget-title}}</span>
-    </h3>
-    <a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}"><%= t("event_news.more") %></a>
-  </div>
+	<h3 class="w-annc__widget-title">
+	<span>{{widget-title}}</span>
+	</h3>
   <div style="position: absolute;top: 58%;width:100%;z-index:101;">
     <div style="">
       <button id="prev-{{subpart-id}}" class="btn-left" title = "<%= (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" %>" style="float: left;height: 2.5em; width: 2.5em;background: border: 0;background-size: contain;position: absolute;transition:.3s; left: 0.6%;color: #ffffff;
@@ -26,7 +23,7 @@
 		data-cycle-slides=".w-annc__item" >
     <li class="w-annc__item">
       <div class="w-annc__img-wrap bullseye" style="position:relative">
-        <a  href="{{link_to_show}}" alt="{{img_description}}" title="{{img_description}}">
+	  <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}}">
         <div class="transitionfade"></div>
       </a>
@@ -52,6 +49,10 @@
     </div>
     </li>
   </ul>
+  <div class="w-annc__more-wrap clearfix">
+
+  <a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}"><%= t("event_news.more") %></a>
+</div>
 </div>
 <!-- <script src="//code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
 <script>
diff --git a/modules/event_news_mod/_event_news_widget2.html.erb b/modules/event_news_mod/_event_news_widget2.html.erb
index cbea813..4058529 100644
--- a/modules/event_news_mod/_event_news_widget2.html.erb
+++ b/modules/event_news_mod/_event_news_widget2.html.erb
@@ -5,7 +5,9 @@
   <ul class="w-annc__list" data-level="0" data-list="event_news">
     <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}}">
+        </a>
       </div>
       <div class="w-annc__content-wrap col-sm-8">
         <div class="w-annc__meta">
diff --git a/modules/event_news_mod/_event_news_widget20.html.erb b/modules/event_news_mod/_event_news_widget20.html.erb
index c3278c1..e3313ca 100644
--- a/modules/event_news_mod/_event_news_widget20.html.erb
+++ b/modules/event_news_mod/_event_news_widget20.html.erb
@@ -1,14 +1,11 @@
 <div class="w-annc  widget-announcement-20">
-  <div class="w-annc__more-wrap clearfix">
-    <h3 class="w-annc__widget-title">
-      <span>{{widget-title}}</span>
-    </h3>
-    <a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}"><%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %></a>
-  </div>
+	<h3 class="w-annc__widget-title">
+	<span>{{widget-title}}</span>
+	</h3>
   <ul class="w-annc__list  row" data-level="0" data-list="event_news">
     <li class="w-annc__item  col-md-4">
     <div class="w-annc__img-wrap bullseye" >
-      <a  href="{{link_to_show}}" >
+	<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}}">
       <div class="transitionfade"></div>
       </a>
@@ -34,6 +31,10 @@
     </div>
     </li>
   </ul>
+  <div class="w-annc__more-wrap clearfix">
+
+  <a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}"><%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %></a>
+</div>
 </div>
 <script>
 	function combineul_{{subpart-id}}(){
diff --git a/modules/event_news_mod/_event_news_widget21.html.erb b/modules/event_news_mod/_event_news_widget21.html.erb
index 92334e0..847beef 100644
--- a/modules/event_news_mod/_event_news_widget21.html.erb
+++ b/modules/event_news_mod/_event_news_widget21.html.erb
@@ -1,10 +1,7 @@
 <div class="w-annc  widget-announcement-4 w-annc  event-news-21">
-  <div class="w-annc__more-wrap clearfix">
-    <h3 class="w-annc__widget-title">
-      <span>{{widget-title}}</span>
-    </h3>
-    <a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}"><%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %></a>
-  </div>
+<h3 class="w-annc__widget-title">
+<span>{{widget-title}}</span>
+</h3>
   <div style="position: absolute;top: 62%;width:100%;    z-index: 101;">
     <div style="">
       <button id="prev-{{subpart-id}}" class="btn-left" title = "<%= (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" %>" style="float: left;height: 2.5em; width: 2.5em;background: border: 0;background-size: contain;position: absolute;transition:.3s; left: 0.6%;color: #ffffff;
@@ -26,7 +23,7 @@
     data-cycle-slides=".w-annc__item" >
       <li class="w-annc__item">
         <div class="w-annc__img-wrap bullseye" >
-          <a  href="{{link_to_show}}" >
+        <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}}">
           <div class="transitionfade"></div>
           </a>
@@ -52,4 +49,7 @@
       </div>
       </li>
     </ul>
+    <div class="w-annc__more-wrap clearfix">
+    <a class="w-annc__more btn btn-primary pull-right" href="{{more_url}}"><%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %></a>
+  </div>
 </div>
diff --git a/modules/event_news_mod/_event_news_widget22.html.erb b/modules/event_news_mod/_event_news_widget22.html.erb
index fd8cd00..3968a36 100644
--- a/modules/event_news_mod/_event_news_widget22.html.erb
+++ b/modules/event_news_mod/_event_news_widget22.html.erb
@@ -20,7 +20,7 @@
   <ul class="w-annc__list  row" data-level="0" data-list="event_news">
     <li class="w-annc__item  col-md-4">
     <div class="w-annc__img-wrap bullseye">
-      <a href="{{link_to_show}}">
+	<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}}">
     </a>
     </div>
diff --git a/modules/event_news_mod/_event_news_widget4.html.erb b/modules/event_news_mod/_event_news_widget4.html.erb
index ce09942..07ff39b 100644
--- a/modules/event_news_mod/_event_news_widget4.html.erb
+++ b/modules/event_news_mod/_event_news_widget4.html.erb
@@ -8,7 +8,7 @@
   <ul class="w-annc__list  row" data-level="0" data-list="event_news">
     <li class="w-annc__item  col-md-4">
       <div class="w-annc__img-wrap bullseye" style="position:relative">
-        <a  href="{{link_to_show}}" style="">
+	  <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}}">
         <div class="transitionfade"></div>
       </a>
diff --git a/modules/event_news_mod/show.html.erb b/modules/event_news_mod/show.html.erb
index e969748..03499ef 100644
--- a/modules/event_news_mod/show.html.erb
+++ b/modules/event_news_mod/show.html.erb
@@ -1,5 +1,5 @@
 <article class="s-annc show-annc">
-  <h3 class="s-annc__show-title s-annc-title">{{title}}</h3>
+  <h3 class="s-annc__show-title event-annc-title" aria-label="內頁活動公告標題">{{title}}</h3>
 
   <ul class="s-annc__meta-wrap list-unstyled no-print">
     <li class="s-annc__date-wrap s-annc__meta--item">
diff --git a/modules/event_news_mod/show2.html.erb b/modules/event_news_mod/show2.html.erb
index f71c04f..6d402f0 100644
--- a/modules/event_news_mod/show2.html.erb
+++ b/modules/event_news_mod/show2.html.erb
@@ -1,5 +1,5 @@
 <article class="s-annc show-annc2">
-  <h3 class="s-annc__show-title">{{title}}</h3>
+  <h3 class="s-annc__show-title event-annc-title" aria-label="內頁活動公告標題">{{title}}</h3>
 
   <ul class="s-annc__meta-wrap list-unstyled no-print">
     <li class="s-annc__tag-wrap s-annc__meta--item ">
diff --git a/modules/faq/faq_index2.html.erb b/modules/faq/faq_index2.html.erb
index 9d1a740..8a8bf2e 100644
--- a/modules/faq/faq_index2.html.erb
+++ b/modules/faq/faq_index2.html.erb
@@ -35,7 +35,7 @@ $('.index-faqs.index2 .index-content .index-content-title-wrap').click(function(
      $(".index-content-title-wrap").attr("aria-expanded","true");
   }
   else {
-          $(".fa-chevron-right").removeClass("rotate");
+    $(".fa-chevron-right").removeClass("rotate");
     $(".index-content-title-wrap").attr("aria-expanded","false");
   }
 })
diff --git a/modules/gallery/gallery_index1.html.erb b/modules/gallery/gallery_index1.html.erb
index 71945ca..e7c011e 100644
--- a/modules/gallery/gallery_index1.html.erb
+++ b/modules/gallery/gallery_index1.html.erb
@@ -4,19 +4,20 @@
   </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}}">
+      <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">
       <div class="index-content-inner">
         <div class="index-pic">
           <img class="img-thumbnail" src="{{thumb-src}}" alt="{{alt_title}}">
         </div>
-        <section class="index-part">
+        </a>
+        <div class="index-part">
           <h4 class="index-content-title">
-            <a href="{{link_to_show}}">{{album-name}}</a>
+            <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">{{album-name}}</a>
           </h4>
           <div class="index-img-description">{{album-description}}</div>
-        </section>
+        </div>
       </div>
-    </a>
+
     </div>
   </div>
 </div>
diff --git a/modules/gallery/gallery_index2.html.erb b/modules/gallery/gallery_index2.html.erb
index a951139..75f9c36 100644
--- a/modules/gallery/gallery_index2.html.erb
+++ b/modules/gallery/gallery_index2.html.erb
@@ -5,17 +5,18 @@
   <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}}">
+       <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">
         <div class="index-pic col-xs-5 col-sm-2">
           <img class="index-img" src="{{thumb-src}}" alt="{{alt_title}}">
         </div>
-        <section class="index-part col-xs-7 col-sm-10">
+        </a>
+        <div class="index-part col-xs-7 col-sm-10">
           <h4 class="index-content-title">
-            <a href="{{link_to_show}}">{{album-name}}</a>
+           <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">{{album-name}}</a>
           </h4>
           <div class="index-img-description">{{album-description}}</div>
-        </section>
-      </a>
+        </div>
+
       </div>
     </div>
   </div>
diff --git a/modules/gallery/gallery_index3.html.erb b/modules/gallery/gallery_index3.html.erb
index 2a59fef..9571f1a 100644
--- a/modules/gallery/gallery_index3.html.erb
+++ b/modules/gallery/gallery_index3.html.erb
@@ -4,18 +4,19 @@
   </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}}">
+      <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">
         <div class="index-content-inner">
           <div class="index-pic">
             <img class="img-thumbnail" src="{{thumb-src}}" alt="{{alt_title}}">
           </div>
-          <section class="index-part">
+      </a>
+        <div class="index-part">
             <h4 class="index-content-title">
-              <a href="{{link_to_show}}">{{album-name}}</a>
+              <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">{{album-name}}</a>
             </h4>
-          </section>
         </div>
-    </a>
+    </div>
+
     </div>
   </div>
 </div>
diff --git a/modules/gallery/gallery_index4.html.erb b/modules/gallery/gallery_index4.html.erb
index 02201f2..0067a40 100644
--- a/modules/gallery/gallery_index4.html.erb
+++ b/modules/gallery/gallery_index4.html.erb
@@ -5,16 +5,17 @@
   <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}}">
+        <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">
           <div class="index-pic col-xs-5 col-sm-2">
             <img class="index-img" src="{{thumb-src}}" alt="{{alt_title}}">
           </div>
-          <section class="index-part col-xs-7 col-sm-10">
-            <h4 class="index-content-title">
-              <a href="{{link_to_show}}">{{album-name}}</a>
-            </h4>
-          </section>
         </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>
+            </h4>
+        </div>
+
       </div>
     </div>
   </div>
diff --git a/modules/gallery/gallery_index5.html.erb b/modules/gallery/gallery_index5.html.erb
index c42e605..7ac894a 100644
--- a/modules/gallery/gallery_index5.html.erb
+++ b/modules/gallery/gallery_index5.html.erb
@@ -5,29 +5,31 @@
   <link rel="stylesheet" type="text/css" href="/assets/gallery_card.css">
   <div class="row" data-level="0" data-list="albums">
     <div class="card card-flip h-100">
-      <a href="{{link_to_show}}">
-      <div class="card-front">
-        <div class="card-body" style="padding:0;">
-          <img
-            src="{{thumb-src}}"
-            alt="{{alt_title}}"
-          >
-          <div class="card-footer">
-            <h3 class="card-title">{{album-name}}</h3>
+
+        <div class="card-front">
+          <div class="card-body" style="padding:0;">
+          <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">
+            <img src="{{thumb-src}}"alt="{{alt_title}}">
+            </a>
+            <div class="card-footer">
+            <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">
+              <h3 class="card-title">{{album-name}}</h3>
+            </a>
+            </div>
           </div>
         </div>
-      </div>
+
       <div class="card-back">
         <div class="card-body" style="background-color: {{album_color}};color: {{album_card_text_color}};">
           <h3 class="card-title">{{album-name}}</h3>
           <div class="card-button-group">
-            <a href="{{link_to_show}}" class="btn btn-secondary view ">
+            <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}" class="btn btn-secondary view ">
               <i class="fa fa-link" aria-hidden="true"></i>
             </a>
           </div>
         </div>
       </div>
-    </a>
+
     </div>
   </div>
 </div>
diff --git a/modules/gallery/gallery_index6.html.erb b/modules/gallery/gallery_index6.html.erb
index 03fd598..9d21410 100644
--- a/modules/gallery/gallery_index6.html.erb
+++ b/modules/gallery/gallery_index6.html.erb
@@ -4,18 +4,20 @@
   </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}}">
+
         <div class="index-content-inner">
+          <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">
           <div class="index-pic">
             <img class="img-thumbnail" src="{{thumb-src}}" alt="{{alt_title}}">
           </div>
+          </a>
           <section class="index-part">
             <h4 class="index-content-title">
-              <a href="{{link_to_show}}">{{album-name}}</a>
+              <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">{{album-name}}</a>
             </h4>
           </section>
         </div>
-    </a>
+
     </div>
   </div>
 </div>
diff --git a/modules/member/info.json b/modules/member/info.json
index 28f7734..dcf305e 100644
--- a/modules/member/info.json
+++ b/modules/member/info.json
@@ -47,6 +47,14 @@
                 "en" : "6. Search Table List (category title and customized profile data)"
                 },
             "thumbnail" : "member_index1_thumb.png"
+        },
+        {
+            "filename" : "member_index7",
+            "name" : {
+                "zh_tw" : "7. 三欄名片式 ( 類別標題, 個人照片, 個人資料等自訂欄位 )",
+                "en" : "7. three Columns (category title, photo and customized profile data)"
+                },
+            "thumbnail" : "member_index5_thumb.png"
         }
     ]
 }
\ No newline at end of file
diff --git a/modules/member/member_index2.html.erb b/modules/member/member_index2.html.erb
index 6062e09..fbb8b70 100644
--- a/modules/member/member_index2.html.erb
+++ b/modules/member/member_index2.html.erb
@@ -8,7 +8,7 @@
             <div class="i-member-item-inner clearfix">
               <div class="i-member-pic-wrap col-sm-3">
                 <a href="{{link_to_show}}" title="{{name}}">
-				          <img class="i-member-pic img-thumbnail" src="{{image}}" alt="{{name}}" title="{{name}}">
+				          <img class="i-member-pic img-thumbnail" src="{{image}}" title="{{name}}">
                 </a>
               </div>
               <div class="i-member-profile-data-wrap col-sm-9">
diff --git a/modules/member/member_index3.html.erb b/modules/member/member_index3.html.erb
index 5964980..9ce87f1 100644
--- a/modules/member/member_index3.html.erb
+++ b/modules/member/member_index3.html.erb
@@ -8,7 +8,7 @@
             <div class="i-member-item-inner clearfix">
               <div class="i-member-pic-wrap col-sm-4 col-xs-4">
                 <a href="{{link_to_show}}" title="{{name}}">
-                 <img class="i-member-pic" src="{{image}}" alt="{{name}}" title="{{name}}">
+                 <img class="i-member-pic" src="{{image}}" title="{{name}}">
                 </a>
               </div>
               <div class="i-member-profile-data-wrap col-sm-8 col-xs-8">
diff --git a/modules/member/member_index5.html.erb b/modules/member/member_index5.html.erb
index 09f8059..9512f41 100644
--- a/modules/member/member_index5.html.erb
+++ b/modules/member/member_index5.html.erb
@@ -8,7 +8,7 @@
             <div class="i-member-item-inner clearfix">
               <div class="i-member-pic-wrap">
                 <a href="{{link_to_show}}" title="{{name}}">
-                 <img class="i-member-pic" src="{{image}}" alt="{{name}}" title="{{name}}">
+                 <img class="i-member-pic" src="{{image}}" title="{{name}}">
                 </a>
               </div>
               <div class="i-member-profile-data-wrap">
diff --git a/modules/member/member_index7.html.erb b/modules/member/member_index7.html.erb
new file mode 100644
index 0000000..1afd16a
--- /dev/null
+++ b/modules/member/member_index7.html.erb
@@ -0,0 +1,38 @@
+<div class="i-member index-member-5">
+  <div data-list="roles" data-level="0">
+    <div class="i-member-section">
+      <div data-level="1" data-list="status-list">
+        <h3 class="i-member-status-title">{{status-title}}</h3>
+        <div class="i-member-list row" data-level="2" data-list="members">
+          <div class="i-member-item col-sm-4" href="{{link_to_show}}">
+            <div class="i-member-item-inner clearfix">
+              <div class="i-member-pic-wrap">
+                <a href="{{link_to_show}}" title="{{name}}">
+                 <img class="i-member-pic" src="{{image}}" title="{{name}}">
+                </a>
+              </div>
+              <div class="i-member-profile-data-wrap">
+                  <ul class="i-member-profile-list" data-list="profile_data" data-level="3">
+                    <li class="i-member-profile-item">
+                        <span class="i-member-title {{title_class}}">{{title}}</span>
+                        <span class="i-member-value {{value_class}}">{{value}}</span>
+                    </li>
+                  </ul>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+{{pagination_goes_here}}
+<script>
+	for(var i = 0;i < $('.i-member img').length ; i++){
+		if($('.i-member img').eq(i).attr('alt')=="" ){
+			$('.i-member img').eq(i).attr('alt','noname');
+			$('.i-member img').eq(i).attr('title','noname');
+      $('.i-member img').eq(i).parent().attr('title','noname');
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/modules/member/thumbs/member_index4_thumb.png b/modules/member/thumbs/member_index4_thumb.png
new file mode 100644
index 0000000000000000000000000000000000000000..422c32230c1e4c77963409b256da79441a86de9e
GIT binary patch
literal 7101
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
R;64s?<e-P^GndeB{|>+X(24*6

literal 0
HcmV?d00001

diff --git a/modules/member/thumbs/member_index5_thumb.png b/modules/member/thumbs/member_index5_thumb.png
new file mode 100644
index 0000000000000000000000000000000000000000..83008b8c59cf75f0cd45f4ad19efffbb2125d2b3
GIT binary patch
literal 6136
zcmeHLdpz6c8vmh_-p5%NiZ(0jX*H%URWdX+Md_JtRmC*oQnaE)+!GO7*J+oDs%l3h
z>Z7fdlB#A}Bs!y}p{WvaDO%UMgc3p$N%o^7<Mf=f^V!+?%OCmYm*;(-@AEw0=kh)m
zK67^1uvTj=000{t4<0xI0LtCqZ)mkD_$Bm?G57&k6ME1i8~_aU=6*^sH;_>PppoZz
zz~*R7Ccgs}LKz^`gbg)d4Y*gd%do{!Vc%|uEVcQh5wK}*TxHX+$tHpC?Vv6G`^Uj8
zcbH^D_>bHzYYiZXox;$4-tO-mgw$d$L9Tr|;_i6D;fmd%6vRc7Q%*%%DW%n2c0&S0
z_Re*^)f9OZ+N=Cjl9^VL762Hz_mIs2U_DI@0we(2HUfasCpsYNuPp#z)#@++Sgi&c
zq4q(Q67a$P^D4mp1chL#>+`;e$B!pjA<}x*Fp)JT_M-&@z}j&c%YSxc8(S<Hg&!i3
zJRMM_Ti$Zh{_U{l+uR@`kI+|{gO)i?Pmwe#?hYj8-n?nW1At9Fcs!ni{1DsoD3Qn@
zqViz`tD-SaVr&zmU41FoypJ7bYdYMZP(!}x=L;94xlI7Df3uJnA4X(1M{(5U<E#*b
z18CMaDGKziRK56Y$+zK^N`U4u$i0zsc`)+ZVE)eFKkS(m!GBAf75A*T=bx&{3Mu~2
zq)5$)dD<1<^Toh0TG}YTXUOA?sk$9FwH0C7;n5II6dxU)sLieL678zjMOPUdSzCNi
zU)7AX{f^#Zldzv?x-9fWnT14$C0J^EQjs&sL}}#kghi*&gcPR^9;nm3q1j|`<so^o
zooLp&xRi74cJDPW@kF93iY3QdW@che<8Efi_tfb!TacvG)b|**gBP60*&f$50#c6X
z3@o|eU-zTGoI&45Jaw=ogcna)oard###%*>21l`2)2)G7_{^Tvvcqz{<jm2yv60r|
z0(N?1E^=BBstFqKy`7T}6meeBTwXL?-X^SdfJH+qgta@Ykr#!YJ|#%hSR7qCH7gQO
z$Ed_f_Kt}eY|P^6^_Gim_~9*m+mk&)drX70oEz!hQ9=j`xEUE6Agpt=dOo{x;mF{*
zd4+fM_I=&l+^kyqN+^wG)W<LTd)}LKcqUt$oA+y2zmoXH%;VKR2YNqhuI)c0&lqV{
z$i=4u1C2<qX<U-Zq5y<uy+GQzJ0gN`d5l+<?d>WaaT3{!Ypq74>*;gG|Au9G=-$O_
zynsi^w+>R1ELBhu5?LwFXrHn1(VFC;MHT1;3>P)EwefeJ7D?z?TGOh<Gm`0&zzv!1
zi}qYy>R;o%vKMBJ)#peBY;9hMm3tgF<jW+23{>&3)*m`&-KKz)_}FG(-axes3I+3#
z_{k&tz;Q4V^vN&lo=^wlI#|dS&Kv53-25H$Gc!!80s>*>TU<r$Ud5e5-LFBW8<8$o
z8elaS0IOM=N?!b|Rg7*UM8-9_b@1B<S*K@o7XTxchE%T`jC=tE+f>4AD^YQvZYw^R
zF^}<Vi(=Yw{&cf?l6}r4$Pq3-6g%%)(30K{7F3?U&x|j-1bN1y3UZyPleSJ-i?Gy|
z66m(1ppe0!q*+}Q^8XRd<eOQV<9*5cQsX%rz+C^u=Z#v+ZrkoN%ubJ!lK00Si5uc=
zdA4Sw43^|214BhJ3HZWD1d>=NV7i!^=0qkS_Poh?Bhn;Wk@BHIPBx<*?F9BM3I8^w
zWZ!AjnMhFMN&Zv>9V3>tdks8^za?OrhL?pTCne(v<|B)!b*!|(>C@Z6>I5E>A6bLJ
zV5sjr_v$){+B?eMR3Q`Q%e7HufL}hW#4vE+Nd(IriR=>Lf^fKNnBLHZTTFJ&`{&L0
z>f)k$O{$cfe9X-<`p0;=%GR9g(kRrl->?ifDoeEA$_&jGSi`h78x-GX8}z4FqXLXM
z2BRjV&155RB5qNKB}@|q?akES4yI*y@?<ooVuIyK4Ao%?CFtE@xAfR^!m$BiS3T-X
zNo94u-z=e}lEq+1G=Ctb*FuO#Y(<czUStQdU&YlPWB1=-R1B$#k~TB24)Q{qI0Mm>
zYi?dla>u)hYWzn=cEx@FVYdJCg5KCo?}}TCb1l(brHsv}b$yo7Um`F`rn$LrbpD&l
z4kme6X0f~SJT;9jS$6N9tv037<x&kg!_a)+R2~K5Or;IQNk_8c@YAHCp?5EO^pf6`
zhU#kpMXMA(d+46iU@^foq~9KSkaDBij<X#A^!#G|{W-QCUmUlZSYxV?{a;P=Mu^7{
zrWc)8NPHcy1ozR*q-4>l6eQ6AZbq7%&!U6+<Zx)J{oX1%T5?S|!Irz{hn#-@j@CET
z(OEKQz6i$pY%r)^R|-~+ZV1QP6W@>TqDPp4g{gcp2gbcZ!v$R@cl<)jz)lUgNg>W0
znS@A0;fIsVcUgymQhNf&nbDnvlP&3X;_-a>EZr%v=)rr2m4h{KI;#z*Zti4nQbjrZ
ztbS@r`B<e9Zdl%VJD6KvQC_Dj#f?#;;g(SWDLFr2p_JU5^P%FYW^Jx?3+k(s_2c6H
z0Hu5YNI08x;yhATWgcYO*!a%vuYD$G`gZK{WO(%M%z!!PJ+5?vnUW^?<2wx9qQDa9
z@OhuX74H)qb>d*PhBVQc!;;nzkBT5RpuQh)(7=FzAY_azmh+A^=812(OZG0%23Kp+
zc1_G4EeEeh;A4`e4Tj60`=^fMlIy}|N=Wk%1%z%p2sK3I5d@xHA763Ju){SxA4e2c
z1cNo%V$|b!JU@~HNyKIr$GEfMaC|)WR9M)^4<(3abI(~<3$ofY#q2H5*JTv{UT5lT
zytEC%m@^%o9Z@4CDc9*H{?;pUgxY59U?7L5aC{B<1cwm~RsrQ>KO3EtX^H#ks6w&Z
zbBY}<@_2E}cQiK{Kdo(w>&jV^=nK`i3x}d{<JEqW4K4b5_@HlJXS+=m6tsa6`T{>j
zErDA{?UqmG2Bgq*cm``>I4-TapPoa1#?3;5G`fx;xe-O|$AQMDKeR0ueYgfDX3UC*
z)3%iL7baH(zvAJ?$~{|)Oi4P`6Bw?PSR_&w^ovUe&a#doK)*Jqq2b=|ug|Z?G4G~X
zPS4FE2@~I)IB$OVRS50SD(U?=5!S!v^vnEYkU>#r;#qgk@-ppq`atu`KXRshPRUBK
zb|@FU{M##T<+*i?8@Vi()-XzXx-n_eKN^}ZNjQ#yX5pJtZ8&+f>TtmTri)NoD(7Ia
z$7O9}uCkwA-b<0Xxnvw}dLRlf5D<80It{$-E{{G=gBPq0Q9YCf1~7=@%cY4rr!niU
z8m8NAEI^RzAKYpaAmg%y^*gfmkaU~`V|{Qpn$CmOAzE`ZVWsq?rCFQby>~yRw|y0m
zaKr%2d5_v>-Q6vpU+p)?C@<MjEDQ4T3FK{+_AjrD%l9ZN7#D`fx2~C1+_U1Im2JU)
zx0?M^Ib-C}fGUhax3;!EcuFAn`c{Uo10H_X(%Kr^V&azXRi>C|75Tc~71lhPI11;1
zlg`^Wxh7|x&%E|wi#@m)#<HRHXe4>2D+=u)ebqBa;K_r#IJ;x+DgisIrU>l&;*0*$
zNbaHKXTCGj+EB9v095M~4~@UDx_dtjVzkLspuJ~rioyzV!BsxsXy<&O@DuN^eg&4p
BW9$F`

literal 0
HcmV?d00001

diff --git a/modules/member/thumbs/member_index7_thumb.png b/modules/member/thumbs/member_index7_thumb.png
new file mode 100644
index 0000000000000000000000000000000000000000..fede574566fdd82667ce1311ae38d5400356d7b4
GIT binary patch
literal 6149
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

literal 0
HcmV?d00001

diff --git a/modules/property_hire/index_calendar.html.erb b/modules/property_hire/index_calendar.html.erb
index 1d79562..e9b92d4 100644
--- a/modules/property_hire/index_calendar.html.erb
+++ b/modules/property_hire/index_calendar.html.erb
@@ -6,7 +6,7 @@
     <div class="btn-toolbar" id="navigation">
       <div id="calendar-nav">
         <div class="btn-group">
-          <button class="btn btn-default btn-sm" id="today_btn">{{today}}</button>
+          <button class="btn btn-default btn-sm" id="today_btn" aria-label="今天" title="今天">{{today}}</button>
         </div>
       </div>
     </div>
@@ -14,19 +14,19 @@
   </div>
   <div id='sec3' class="btn-toolbar">
     <div class="btn-group calendar_mode">
-      <button class="btn btn-default mode_switch btn-sm" data-mode="timeGridDay" >{{day}}</button>
-      <button class="btn btn-default mode_switch btn-sm" data-mode="timeGridWeek" >{{week}}</button>
-      <button class="btn btn-default active mode_switch btn-sm" data-mode="dayGridMonth" >{{month}}</button>
+      <button class="btn btn-default mode_switch btn-sm" data-mode="timeGridDay" aria-label="日模式" title="日模式">{{day}}</button>
+      <button class="btn btn-default mode_switch btn-sm" data-mode="timeGridWeek" aria-label="周模式" title="周模式">{{week}}</button>
+      <button class="btn btn-default active mode_switch btn-sm" data-mode="dayGridMonth" aria-label="月模式" title="月模式">{{month}}</button>
     </div>
     <button id="refresh_btn" class="btn btn-default btn-sm">
       <i class="icons-cycle"></i>
     </button>
   </div>
   <div class="pull-right">
-    <button class="btn btn-default btn-sm" id="prev_month_btn">
+    <button class="btn btn-default btn-sm" id="prev_month_btn" aria-label="上一個月" title="上一個月">
       <i class="icon-chevron-left"></i>
     </button>
-    <button class="btn btn-default btn-sm" id="next_month_btn">
+    <button class="btn btn-default btn-sm" id="next_month_btn" aria-label="下一個月" title="下一個月">
       <i class="icon-chevron-right"></i>
     </button>
   </div>
diff --git a/modules/publication/publications_index2.html.erb b/modules/publication/publications_index2.html.erb
index 13db0c4..77028d8 100644
--- a/modules/publication/publications_index2.html.erb
+++ b/modules/publication/publications_index2.html.erb
@@ -3,7 +3,7 @@
   <ul class="i-annc__list" data-level="0" data-list="publications">
     <li class="i-annc__item row">
       <div class="i-annc__img-wrap col-sm-4">
-      <a href="{{link_to_show}}">
+      <a href="{{link_to_show}}" aria-label="前往{{title}}" title="{{title}}">
         <img class="i-annc__img" src="{{cover}}" alt="{{cover_description}}" title="{{cover_description}}">
       </a>
       </div>
diff --git a/modules/publication/publications_index3.html.erb b/modules/publication/publications_index3.html.erb
index b12ef30..2b09968 100644
--- a/modules/publication/publications_index3.html.erb
+++ b/modules/publication/publications_index3.html.erb
@@ -2,7 +2,7 @@
   <h3 class="i-annc__page-title">{{page-title}}</h3>
   <ul class="i-annc__list  row" data-level="0" data-list="publications">
     <li class="i-annc__item  col-md-4">
-      <a  href="{{link_to_show}}">
+      <a  href="{{link_to_show}}" aria-label="前往{{title}}" title="{{title}}">
     <div class="i-annc__img-wrap">
       <img class="i-annc__img" src="{{cover}}" alt="{{cover_description}}" title="{{cover_description}}">
     </div>
diff --git a/modules/universal_table/index.html.erb b/modules/universal_table/index.html.erb
index acf60e8..6ce315e 100644
--- a/modules/universal_table/index.html.erb
+++ b/modules/universal_table/index.html.erb
@@ -94,9 +94,9 @@
   <thead>
     <tr data-list="head-columns" data-level="0">
       <th class="col-ken">
-        <a href="{{sort-url}}" class="{{sort}}"><i class="universal-th-icon fa fa-{{sort-class}}"></i></a>
+        <a href="{{sort-url}}" class="{{sort}}" title="前往分類連結"><i class="universal-th-icon fa fa-{{sort-class}}"></i><span class="sr-only">前往分類連結</span></a>
         <div class="dropdown universal-dropdown {{search}}">
-          <button class="btn btn-sm" id="dLabel" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          <button class="btn btn-sm" id="dLabel" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="搜尋" title="搜尋" role="button">
             <i class="fa fa-search"></i>
             <span class="caret"></span>
           </button>
diff --git a/modules/universal_table/index2.html.erb b/modules/universal_table/index2.html.erb
index d384584..039d006 100644
--- a/modules/universal_table/index2.html.erb
+++ b/modules/universal_table/index2.html.erb
@@ -72,9 +72,9 @@
   <thead>
     <tr data-list="head-columns" data-level="0">
       <th class="col-ken">
-        <a href="{{sort-url}}" class="{{sort}}"><i class="universal-th-icon fa fa-{{sort-class}}"></i></a>
+        <a href="{{sort-url}}" class="{{sort}}" title="前往分類連結"><i class="universal-th-icon fa fa-{{sort-class}}"></i><span class="sr-only">前往分類連結</span></a>
         <div class="dropdown universal-dropdown {{search}}">
-          <button class="btn btn-sm" id="dLabel" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          <button class="btn btn-sm" id="dLabel" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" aria-label="搜尋" title="搜尋" role="button">
             <i class="fa fa-search"></i>
             <span class="caret"></span>
           </button>
diff --git a/modules/video_pro/_video_pro_widget1.html.erb b/modules/video_pro/_video_pro_widget1.html.erb
index 800169a..cc2a433 100644
--- a/modules/video_pro/_video_pro_widget1.html.erb
+++ b/modules/video_pro/_video_pro_widget1.html.erb
@@ -1,29 +1,31 @@
 <div class="w-video_data video_data-widget-1">
+<h3 class="widget-title"><span>{{widget-title}}</span></h3>
   <ul class="video_data_wrap col-sm-12" data-list="videos" data-level="0">
     <li class="video_data col-xs-12 col-sm-4" data-video-url="{{video_url}}" data-video-webm-url="{{video_webm_url}}" data-type="{{video_type}}">
       <a class="video_link" href="{{video_show_url}}" title="{{video_title_escape}}">
-        <div class="video_linkwrapper3">
-          <img class="video_snapshot" src="{{snapshot_url}}"/>
-        </div>
-        <div class="video_info">
-          <div class="video_group_time">{{video_post_agency}} | {{video_postdate}}</div>
-          <div data-list="video_tags" data-level="1" class="video_tag"><div>{{video_tag}}</div></div>
-          <div class="video_title"><h5>{{video_title}}</h5></div>
-          <div class="video_desc">{{video_desc}}</div>
+      <div class="video_linkwrapper">
+        <div class="videohover">
           <div class="view_info">
-            <!-- <span><img src="{{hd_icon_url}}" alt="HD"></span> -->
-            <span><img src="{{view_icon_url}}" alt="{{view_count_trans}}>">x {{view_count}}</span>
+            <span>{{view_count}}</span>
           </div>
+          <div class="Video__Player"><button class="Video__PlayerButton"></button></div>
+          <div class="videoduration"></div>
+        </div>
+        <img class="video_snapshot" src="{{snapshot_url}}"/>
+      </div>
+        <div class="video_info">
+          <div class="video_length">{{video_duration}}</div>
+          <div data-list="video_tags" data-level="1" class="video_tag"><div class="video_tags2">{{video_tag}}</div></div>
+          <div class="video_keyword">{{video_keyword}}</div>
+          <div class="video_group_time">{{video_postdate}}</div>
+          <div class="video_title"><a class="video_link" href="{{video_show_url}}" title="{{video_title_escape}}"><h5>{{video_title}}</h5></a></div>
+          <div class="video_desc"><a class="video_link" href="{{video_show_url}}" title="{{video_title_escape}}">{{video_desc}}</a></div>
         </div>
       </a>
     </li>
   </ul>
   <div class="clearfix"></div>
   <style>
-    .video_data_wrap{
-      display: flex;
-      flex-wrap: wrap;
-    }
     .video_title h5{
       @extend .i-title;
       display: -webkit-box;
@@ -40,3 +42,6 @@
     }
   </style>
 </div>
+<script>
+
+</script>
\ No newline at end of file
diff --git a/modules/video_pro/_video_pro_widget2.html.erb b/modules/video_pro/_video_pro_widget2.html.erb
new file mode 100644
index 0000000..66b0402
--- /dev/null
+++ b/modules/video_pro/_video_pro_widget2.html.erb
@@ -0,0 +1,59 @@
+<div class="w-video_data video_data-widget-2">
+<h3 class="widget-title"><span>{{widget-title}}</span></h3>
+  <ul class="video_data_wrap col-sm-12" data-list="videos" data-level="0">
+    <li class="video_data col-xs-12 col-sm-4" data-video-url="{{video_url}}" data-video-webm-url="{{video_webm_url}}" data-type="{{video_type}}" >
+      <a  href="{{video_show_url}}" title="{{video_title_escape}}">
+        <div class="video_linkwrapper2">
+          <div class="videohover">
+            <div class="view_info">
+              <span>{{view_count}}</span>
+            </div>
+            <div class="Video__Player"><button class="Video__PlayerButton"></button></div>
+            <div class="videoduration"></div>
+          </div>
+          <img class="video_snapshot" src="{{snapshot_url}}"/>
+        </div>
+        </a>
+        
+        <div class="video_info">
+          <div class="video_length">{{video_duration}}</div>
+          <div data-list="video_tags" data-level="1" class="video_tag"><div class="video_tags2">{{video_tag}}</div></div>
+          <div class="video_keyword">{{video_keyword}}</div>
+          <div class="video_group_time">{{video_postdate}}</div>
+          <div class="video_title"><a class="video_link" href="{{video_show_url}}" title="{{video_title_escape}}"><h5>{{video_title}}</h5></a></div>
+          <div class="video_desc"><a class="video_link" href="{{video_show_url}}" title="{{video_title_escape}}">{{video_desc}}</a></div>
+        </div>
+    </li>
+  </ul>
+  <div class="clearfix"></div>
+</div>
+<style>
+
+.video_title h5{
+  @extend .i-title;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.view_info{
+  float: right;
+}
+.view_info img{
+  margin-right: 5px;
+}
+
+
+</style>
+<script>
+# $(document).ready(function () {
+#   $(".video_keyword").each(function () {
+#     $(this).insertAfter($(this).siblings(".video_tag").find(".video_tags2"));
+#   });
+# });
+
+
+
+
+</script>
\ No newline at end of file
diff --git a/modules/video_pro/_video_pro_widget3.html.erb b/modules/video_pro/_video_pro_widget3.html.erb
new file mode 100644
index 0000000..85bcf07
--- /dev/null
+++ b/modules/video_pro/_video_pro_widget3.html.erb
@@ -0,0 +1,129 @@
+<div class="w-video_data video_data-widget-3">
+<h3 class="widget-title"><span>{{widget-title}}</span></h3>
+<div class="btnwrapper" style="position: absolute;top: 50%;width:100%;    z-index: 101;">
+  <button id="prev-{{subpart-id}}" class="btn-left" title = "<%= (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" %>" style="float: left;height: 2.5em; width: 2.5em;background: border: 0;background-size: contain;position: absolute;transition:.3s; left: 0.6%;
+    color: #909090;
+    background: #fff;
+    border-radius: 50%;
+    border: none; z-index: 2;"><i class="fa fa-angle-left prev-button" aria-hidden="true" style="font-size: 1.5rem;"></i><span style="display: none;"><%= (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" %></span></button>
+  <button id="next-{{subpart-id}}" class="btn-right" title = "<%= (I18n.locale.to_s =="zh_tw") ? "下一張" : "next" %>" style="float: right;;height: 2.5em; width: 2.5em;background-size: contain;border: 0;position: absolute;transition:.3s;right: 0.6%;
+    color: #909090;
+    background: #fff;
+    border-radius: 50%;
+    border: none; z-index: 2;"><i class="fa fa-angle-right next-button" aria-hidden="true" style="font-size: 1.5rem;"></i><span style="display: none;"><%= (I18n.locale.to_s =="zh_tw") ? "下一張" : "next" %></span></button>
+</div>
+  <ul class="video_data_wrap col-sm-12 cycle-slideshow" data-list="videos" data-level="0" data-cycle-fx="carousel"
+  data-cycle-timeout="0"
+  data-cycle-carousel-visible="3"
+  data-cycle-carousel-fluid="true"
+  data-cycle-next="#next-{{subpart-id}}"
+  data-cycle-prev="#prev-{{subpart-id}}"
+  data-cycle-slides=".video_data"
+  >
+  <li class="video_data col-xs-12 col-sm-4" data-video-url="{{video_url}}" data-video-webm-url="{{video_webm_url}}" data-type="{{video_type}}" >
+  <a  href="{{video_show_url}}" title="{{video_title_escape}}">
+    <div class="video_linkwrapper3">
+      <div class="videohover">
+        <div class="view_info">
+          <span>{{view_count}}</span>
+        </div>
+        <div class="Video__Player"><button class="Video__PlayerButton"></button></div>
+        <div class="videoduration"></div>
+      </div>
+      <img class="video_snapshot" src="{{snapshot_url}}"/>
+    </div>
+    </a>
+    
+    <div class="video_info">
+      <div class="video_length">{{video_duration}}</div>
+      <div data-list="video_tags" data-level="1" class="video_tag"><div class="video_tags2">{{video_tag}}</div></div>
+      <div class="video_keyword">{{video_keyword}}</div>
+      <div class="video_group_time">{{video_postdate}}</div>
+      <div class="video_title"><a class="video_link" href="{{video_show_url}}" title="{{video_title_escape}}"><h5>{{video_title}}</h5></a></div>
+      <div class="video_desc"><a class="video_link" href="{{video_show_url}}" title="{{video_title_escape}}">{{video_desc}}</a></div>
+    </div>
+</li>
+  </ul>
+  <div class="clearfix"></div>
+<style>
+
+  .video_title h5{
+    @extend .i-title;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  .view_info{
+    float: right;
+  }
+  .view_info img{
+    margin-right: 5px;
+  }
+  .Video__Player{
+    display: flex;
+        -webkit-box-align: center;
+        align-items: center;
+        -webkit-box-pack: center;
+        justify-content: center;
+        width: 100%;
+        height: 100%;
+        .Video__PlayerButton{
+          display: inline-block;
+          padding-bottom: 0px;
+          padding-top: 0px;
+          border-radius: 50%;
+          border: 0px;
+          background-color: rgb(255, 81, 0);
+          background: url(/assets/btn-play.svg) no-repeat;
+          background-size: 100%;
+          background-repeat: no-repeat;
+          background-position: center center;
+          transition: 0.5s;
+          width: 60px;
+          height: 60px;
+          &:hover{
+            width: 80px;
+            height: 80px;
+          }
+        }
+  }
+  .view_info{
+    max-height: 100%;
+    border-radius: 2px;
+    font-size: 0.875rem;
+    font-weight: normal;
+    letter-spacing: 0.3px;
+    text-align: center;
+    display: flex;
+    -webkit-box-align: center;
+    align-items: center;
+    position: absolute;
+    padding: 0px 8px;
+    background-color: #000000cc;
+    color: rgb(255, 255, 255);
+    z-index: 10;
+    top: 10px;
+    left: 10px;
+    border: 1px solid transparent;
+    line-height: 1.45;
+    span{
+      color:#fff;
+    }
+    &:before{
+      content: "";
+      display: inline-block;
+      margin-right: 5px;
+      width: 14px;
+      height: 10px;
+      background: url(/assets/icon-view@2x.png) no-repeat;
+      position: relative;
+      background-size: contain;
+    }
+  }
+</style>
+</div>
+<script>
+
+</script>
\ No newline at end of file
diff --git a/modules/video_pro/_video_pro_widget4.html.erb b/modules/video_pro/_video_pro_widget4.html.erb
new file mode 100644
index 0000000..9f92019
--- /dev/null
+++ b/modules/video_pro/_video_pro_widget4.html.erb
@@ -0,0 +1,47 @@
+<div class="w-video_data video_data-widget-4" style="    background: #f0f0f0;">
+<h3 class="widget-title"><span>{{widget-title}}</span></h3>
+  <ul class="video_data_wrap row container" data-list="videos" data-level="0">
+    <li class="video_data col-xs-12 col-sm-3" data-video-url="{{video_url}}" data-video-webm-url="{{video_webm_url}}" data-type="{{video_type}}">
+      <a class="video_link" href="{{video_show_url}}" title="{{video_title_escape}}">
+      <div class="video_linkwrapper10">
+        <div class="videohover">
+          <div class="view_info">
+            <span>{{view_count}}</span>
+          </div>
+          <div class="Video__Player"><button class="Video__PlayerButton"></button></div>
+          <div class="videoduration"></div>
+        </div>
+        <img class="video_snapshot" src="{{snapshot_url}}"/>
+      </div>
+        <div class="video_info">
+          <div class="video_length">{{video_duration}}</div>
+          <div data-list="video_tags" data-level="1" class="video_tag"><div class="video_tags2">{{video_tag}}</div></div>
+          <div class="video_keyword">{{video_keyword}}</div>
+          <div class="video_group_time">{{video_postdate}}</div>
+          <div class="video_title"><a class="video_link" href="{{video_show_url}}" title="{{video_title_escape}}"><h5>{{video_title}}</h5></a></div>
+          <div class="video_desc"><a class="video_link" href="{{video_show_url}}" title="{{video_title_escape}}">{{video_desc}}</a></div>
+        </div>
+      </a>
+    </li>
+  </ul>
+  <div class="clearfix"></div>
+  <style>
+    .video_title h5{
+      @extend .i-title;
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    .view_info{
+      float: right;
+    }
+    .view_info img{
+      margin-right: 5px;
+    }
+  </style>
+</div>
+<script>
+
+</script>
\ No newline at end of file
diff --git a/modules/video_pro/_video_pro_widget5.html.erb b/modules/video_pro/_video_pro_widget5.html.erb
new file mode 100644
index 0000000..0e1af48
--- /dev/null
+++ b/modules/video_pro/_video_pro_widget5.html.erb
@@ -0,0 +1,176 @@
+<div class="w-video_data video_data-widget-5 row">
+<h3 class="widget-title"><span>{{widget-title}}</span></h3>
+<ul class="video_data_wrap col-sm-8 cycle-slideshow"
+  data-list="videos"
+  data-level="0"
+  data-cycle-fx="scrollHorz"
+  data-cycle-timeout="0"
+  data-cycle-slides=".video_data"
+  data-cycle-pager="#pager-{{subpart-id}}"
+  data-cycle-next="#next-{{subpart-id}}"
+  data-cycle-prev="#prev-{{subpart-id}}"
+  data-cycle-pager-template="<a href='#' class='pager-item' data-slide-num=''><h5></h5></a>">
+ <li class="video_data col-xs-12 col-sm-12" data-video-url="{{video_url}}" data-video-webm-url="{{video_webm_url}}" data-type="{{video_type}}" data-title="{{video_title}}">
+   <a  href="{{video_show_url}}" title="{{video_title_escape}}">
+    <div class="video_linkwrapper5">
+      <div class="videohover">
+        <div class="view_info">
+          <span>{{view_count}}</span>
+        </div>
+        <div class="Video__Player"><button class="Video__PlayerButton"></button></div>
+        <div class="videoduration"></div>
+      </div>
+      <img class="video_snapshot" src="{{snapshot_url}}"/>
+    </div>
+    </a>
+    <div class="video_group_time">{{video_postdate}}</div>
+    <div class="video_info">
+      <div class="video_length">{{video_duration}}</div>
+      <div data-list="video_tags" data-level="1" class="video_tag"><div class="video_tags2">{{video_tag}}</div></div>
+      <div class="video_desc"><a class="video_link" href="{{video_show_url}}" title="{{video_title_escape}}">{{video_desc}}</a></div>
+   </div>
+</li>
+</ul>
+  <div id="pager-{{subpart-id}}" class="cycle-pager col-sm-4"></div>
+  <div class="clearfix"></div>
+</div>
+<script>
+$(document).ready(function () {
+  setTimeout(function () {
+    $(".w-video_data").each(function () {
+      var $container = $(this);
+      var videoDataItems = $container.find(".video_data").not(".cycle-sentinel"); // 過濾 Cycle2 產生的複製元素
+
+      var videoData = videoDataItems.map(function () {
+        return {
+          title: $(this).attr("data-title"),
+          date: $(this).find(".video_group_time").text().trim() // 取得日期
+        };
+      }).get();
+
+      // 只影響「當前」輪播的 Pager Items
+      $container.find(".cycle-pager .pager-item").slice(0, videoData.length).each(function (index) {
+        var { title, date } = videoData[index];
+
+        $(this).attr("data-slide-num", index);
+
+        // 先移除舊的日期標籤，避免重複
+        $(this).find(".video-date").remove();
+
+        // 插入日期作為獨立的 <span>，放在 h5 之前
+        if (date) {
+          $("<span class='video-date'></span>").text(date + " ").prependTo(this);
+        }
+
+        $(this).find("h5").text(title);
+      });
+
+      // 只讓「當前」的 Pager 綁定點擊事件
+      $container.find(".cycle-pager").on("click", ".pager-item", function (e) {
+        e.preventDefault();
+        var index = $(this).attr("data-slide-num");
+
+        // 只影響「當前」輪播的 .cycle-slideshow
+        $container.find(".cycle-slideshow").cycle("goto", index);
+      });
+    });
+  }, 300);  // 延長時間確保 DOM 生成
+  setTimeout(function () {
+    $(".w-video_data.video_data-widget-5").each(function () { //限制只影響 .video_data-widget-5
+      var $container = $(this);
+      var $items = $container.find(".video_data").not(".cycle-sentinel"); // 過濾 Cycle2 產生的元素
+      var $pager = $container.find(".cycle-pager"); // 取得 Pager 容器
+      var totalItems = $items.length;
+      var itemsPerPage = 5; 
+      var currentIndex = 0;
+
+      // 取得所有 video_data 的標題與日期
+      var videoData = $items.map(function () {
+        return {
+          title: $(this).attr("data-title"),
+          date: $(this).find(".video_group_time").text().trim()
+        };
+      }).get();
+
+      // 生成對應的 .pager-item
+      var pagerHTML = "";
+      videoData.forEach(function ({ title, date }, index) {
+        pagerHTML += `<a href="#" class="pager-item" data-slide-num="${index}">`;
+        if (date) {
+          pagerHTML += `<span class="video-date">${date} </span>`;
+        }
+        pagerHTML += `<h5>${title}</h5></a>`;
+      });
+
+      $pager.html(pagerHTML); // 插入新的 Pager
+      var $pagerItems = $pager.find(".pager-item"); // 重新抓取 .pager-item
+      $pagerItems.hide(); // 先全部隱藏
+
+      // 插入按鈕（確保不會重複）
+      if ($pager.next(".pager-controls").length === 0) {
+        $pager.after(`
+          <div class="pager-controls">
+            <button class="prev-btn"><i class="fa fa-angle-left prev-button" aria-hidden="true" style="font-size: 1.5rem;"></i></button>
+            <button class="next-btn"><i class="fa fa-angle-right next-button" aria-hidden="true" style="font-size: 1.5rem;"></i></button>
+          </div>
+        `);
+      }
+
+      var $prevBtn = $pager.next(".pager-controls").find(".prev-btn");
+      var $nextBtn = $pager.next(".pager-controls").find(".next-btn");
+
+      // 更新顯示的 pager-item 和 video_data
+      function updateVisibleItems() {
+        var firstVisibleIndex = currentIndex; // 取得當前顯示的第一個 Index
+        var lastVisibleIndex = Math.min(currentIndex + itemsPerPage, totalItems);
+
+        // 隱藏所有
+        $items.hide().removeClass("cycle-slide-active");
+        $pagerItems.hide().removeClass("cycle-pager-active");
+
+        // 顯示當前的 3 個 pager-item
+        var visiblePagerItems = $pagerItems.slice(firstVisibleIndex, lastVisibleIndex).show();
+        
+        // 加上 `cycle-pager-active` 到第一個
+        var firstPagerItem = visiblePagerItems.first().addClass("cycle-pager-active");
+
+        // 取得對應的 video_data
+        var firstPagerIndex = firstPagerItem.data("slide-num");
+        var $firstVideoItem = $items.eq(firstPagerIndex).show().addClass("cycle-slide-active");
+      }
+
+      // 綁定 Pager 點擊事件
+      $pager.on("click", ".pager-item", function (e) {
+        e.preventDefault();
+        var index = $(this).data("slide-num"); // 獲取對應 index
+
+        $pagerItems.removeClass("cycle-pager-active");
+        $(this).addClass("cycle-pager-active");
+
+        $items.hide().removeClass("cycle-slide-active").eq(index).show().addClass("cycle-slide-active");
+      });
+
+      // 綁定上一頁按鈕
+      $prevBtn.off("click").on("click", function () {
+        if (currentIndex > 0) {
+          currentIndex -= itemsPerPage;
+          updateVisibleItems();
+        }
+      });
+
+      // 綁定下一頁按鈕
+      $nextBtn.off("click").on("click", function () {
+        if (currentIndex + itemsPerPage < totalItems) {
+          currentIndex += itemsPerPage;
+          updateVisibleItems();
+        }
+      });
+
+      // 初始化顯示
+      updateVisibleItems();
+    });
+  }, 300); // 延長時間確保 DOM 生成
+});
+
+
+</script>
\ No newline at end of file
diff --git a/modules/video_pro/info.json b/modules/video_pro/info.json
index 5c1b39b..c5b202e 100644
--- a/modules/video_pro/info.json
+++ b/modules/video_pro/info.json
@@ -9,6 +9,42 @@
                 },
             "thumbnail" : "thumb.png"
         },
+        {
+            "filename" : "video_pro_widget2",
+            "force_cover": "true",
+            "name" : {
+                "zh_tw" : "2. 影片列表2 ( 縮圖, 影片資訊, 頁面連結)",
+                "en" : "2. Video List 2 ( snapshot, video info, page link)"
+                },
+            "thumbnail" : "thumb.png"
+        },
+        {
+            "filename" : "video_pro_widget3",
+            "force_cover": "true",
+            "name" : {
+                "zh_tw" : "3. 影片列表倫波 ( 縮圖, 影片資訊, 頁面連結)",
+                "en" : "3.carousel-Video List  ( snapshot, video info, page link)"
+                },
+            "thumbnail" : "thumb.png"
+        },
+        {
+                "filename" : "video_pro_widget4",
+                "force_cover": "true",
+                "name" : {
+                    "zh_tw" : "4. 四欄影片列表 ( 縮圖, 影片資訊, 頁面連結)",
+                    "en" : "4. 4col-Video List 1 ( snapshot, video info, page link)"
+                    },
+                "thumbnail" : "thumb.png"
+         },
+        {
+            "filename" : "video_pro_widget5",
+            "force_cover": "true",
+            "name" : {
+                "zh_tw" : "5. 大圖影片列表倫波 ( 縮圖, 影片資訊, 頁面連結)",
+                "en" : "5.bigcarousel-Video List  ( snapshot, video info, page link)"
+                },
+            "thumbnail" : "thumb.png"
+        },
         {
             "filename" : "video_pro_widget_jqcloud1",
             "force_cover": "true",
@@ -51,8 +87,8 @@
             "filename" : "video_pro_index3",
             "force_cover": "true",
             "name" : {
-                "zh_tw" : "3. 影片列表2 + 懸浮框 ( 縮圖, 影片資訊)",
-                "en" : "3. Video List 2 + Modal window ( snapshot, video info)"
+                "zh_tw" : "3. 三欄 影片列表2 + 懸浮框 ( 縮圖, 影片資訊)",
+                "en" : "3. 3col-Video List 2 + Modal window ( snapshot, video info)"
                 },
             "thumbnail" : "thumb.png"
         },
@@ -60,8 +96,17 @@
             "filename" : "video_pro_index_post_agency1",
             "force_cover": "true",
             "name" : {
-                "zh_tw" : "4. 影片列表3 + 發佈單位篩選 ( 縮圖, 影片資訊, 關鍵字, 頁面連結)",
-                "en" : "4. Video List 3 + Post Agency filter ( snapshot, video info, keyword, page link)"
+                "zh_tw" : "4. 三欄 影片列表3 + 發佈單位篩選 ( 縮圖, 影片資訊, 關鍵字, 頁面連結)",
+                "en" : "4. 3col-Video List 3 + Post Agency filter ( snapshot, video info, keyword, page link)"
+                },
+            "thumbnail" : "thumb.png"
+        },
+        {
+            "filename" : "video_pro_index4",
+            "force_cover": "true",
+            "name" : {
+                "zh_tw" : "4. 四欄影片列表1 + 類別 + 搜尋 ( 縮圖, 影片資訊, 頁面連結)",
+                "en" : "4. 4col-Video List 1 + Category filter + Search ( snapshot, video info, page link)"
                 },
             "thumbnail" : "thumb.png"
         }
diff --git a/modules/video_pro/video_pro_index1.html.erb b/modules/video_pro/video_pro_index1.html.erb
index ae360f4..b48457f 100644
--- a/modules/video_pro/video_pro_index1.html.erb
+++ b/modules/video_pro/video_pro_index1.html.erb
@@ -3,17 +3,17 @@
   <ul class="video_data_wrap col-sm-12" data-list="videos" data-level="0">
     <li class="video_data col-sm-12 row" data-video-url="{{video_url}}" data-video-webm-url="{{video_webm_url}}" data-type="{{video_type}}">
       <a class="  video_link" href="{{video_show_url}}" title="{{video_title_escape}}">
-        <div class="video_linkwrapper3 col-sm-3">
+        <div class="video_linkwrapper3 col-sm-4">
           <img class="video_snapshot" src="{{snapshot_url}}"/>
         </div>
-        <div class="col-sm-9 video_info">
+        <div class="col-sm-8 video_info">
           <div class="video_group_time">{{video_post_agency}} | {{video_postdate}}</div>
           <div data-list="video_tags" data-level="1" class="video_tag"><div>{{video_tag}}</div></div>
           <div class="video_title"><h5>{{video_title}}</h5></div>
           <div class="video_desc">{{video_desc}}</div>
           <div class="view_info">
             <!-- <span><img src="{{hd_icon_url}}" alt="HD"></span> -->
-            <span><img src="{{view_icon_url}}" alt="{{view_count_trans}}>">x {{view_count}}</span>
+            <span>x {{view_count}}</span>
           </div>
         </div>
       </a>
@@ -21,6 +21,7 @@
   </ul>
   <div class="clearfix"></div>
   <style>
+  .video_data-index-1{
     .video_desc{
       height:auto!important;
     }
@@ -83,6 +84,8 @@
       border-bottom: 2px solid #1a1b20;
       padding-bottom: 0.5em;
     }
+  }
+
   </style>
 </div>
 {{pagination_goes_here}}
diff --git a/modules/video_pro/video_pro_index2.html.erb b/modules/video_pro/video_pro_index2.html.erb
index 66259ac..d659050 100644
--- a/modules/video_pro/video_pro_index2.html.erb
+++ b/modules/video_pro/video_pro_index2.html.erb
@@ -46,13 +46,7 @@
     }
     .video_data{
       margin-bottom: 1em;
-          padding: 0 0.5em;
-      .video_link{
-        background: #f3f3f3;
-        position: relative;
-        display: block;
-        padding: 1em;
-      }
+      padding: 0 0.5em;
     }
     .video_info {
         margin: 1em 0;
diff --git a/modules/video_pro/video_pro_index2_tag.html.erb b/modules/video_pro/video_pro_index2_tag.html.erb
index 8ba705f..0d0e6bc 100644
--- a/modules/video_pro/video_pro_index2_tag.html.erb
+++ b/modules/video_pro/video_pro_index2_tag.html.erb
@@ -47,12 +47,6 @@
     .video_data{
           padding: 0 0.5em;
       margin-bottom: 1em;
-      .video_link{
-        background: #f3f3f3;
-        position: relative;
-        display: block;
-        padding: 1em;
-      }
     }
     .video_info {
         margin: 1em 0;
diff --git a/modules/video_pro/video_pro_index3.html.erb b/modules/video_pro/video_pro_index3.html.erb
index 83bdd65..948b9fd 100644
--- a/modules/video_pro/video_pro_index3.html.erb
+++ b/modules/video_pro/video_pro_index3.html.erb
@@ -14,7 +14,7 @@
   </div>
   <h3 class="i-annc__page-title">{{page-title}}</h3>
   <ul class="video_data_wrap col-sm-12" data-list="videos" data-level="0">
-    <li class="video_data col-sm-6" data-video-url="{{video_url}}" data-video-webm-url="{{video_webm_url}}" data-type="{{video_type}}">
+    <li class="video_data col-sm-4" data-video-url="{{video_url}}" data-video-webm-url="{{video_webm_url}}" data-type="{{video_type}}">
       <a class="video_link" href="javascript:void(0)" title="{{video_title_escape}}" data-api-url="{{api_url}}">
         <div class="video_snapshot_wrap video_linkwrapper2">
           <img class="video_snapshot" src="{{snapshot_url}}"/>
@@ -32,13 +32,7 @@
   <style>
     .video_data{
       margin-bottom: 1em;
-          padding: 0 0.5em;
-      .video_link{
-        background: #f3f3f3;
-        position: relative;
-        display: block;
-        padding: 1em;
-      }
+      padding: 0 0.5em;
     }
     .video_info{
           margin: 1em 0;
diff --git a/modules/video_pro/video_pro_index4.html.erb b/modules/video_pro/video_pro_index4.html.erb
new file mode 100644
index 0000000..87f4b76
--- /dev/null
+++ b/modules/video_pro/video_pro_index4.html.erb
@@ -0,0 +1,162 @@
+<div class="i-video_data video_data-index-4">
+  <h3 class="i-annc__page-title">{{page-title}}</h3>
+  <ul class="video_data_wrap col-sm-12" data-list="videos" data-level="0">
+    <li class="video_data col-sm-4" data-video-url="{{video_url}}" data-video-webm-url="{{video_webm_url}}" data-type="{{video_type}}">
+      <a class="video_link" href="{{video_show_url}}" title="{{video_title_escape}}">
+      <div class="video_linkwrapper2">
+        <div class="videohover">
+          <div class="view_info">
+            <span>{{view_count}}</span>
+          </div>
+          <div class="Video__Player"><button class="Video__PlayerButton"></button></div>
+          <div class="videoduration"></div>
+        </div>
+        <img class="video_snapshot" src="{{snapshot_url}}"/>
+      </div>
+      <div class="video_info">
+        <div data-list="video_tags" data-level="1" class="video_tag"><div class="video_tags2">{{video_tag}}</div></div>
+        <div class="video_group_time">{{video_postdate}}</div>
+        <div class="video_title"><a class="video_link" href="{{video_show_url}}" title="{{video_title_escape}}"><h5>{{video_title}}</h5></a></div>
+        <div class="video_desc"><a class="video_link" href="{{video_show_url}}" title="{{video_title_escape}}">{{video_desc}}</a></div>
+      </div>
+      </a>
+    </li>
+  </ul>
+  <div class="clearfix"></div>
+  <style>
+    .video_group_time{
+      display: flex;
+      align-items: center;
+    }
+    .video_tag{
+          margin: 0.5em 0.5em 0.5em 0;
+    }
+    .video_data{
+      margin-bottom: 1em;
+      padding: 0 0.5em;
+    }
+    .video_info {
+        margin: 1em 0;
+    }
+    .video_data_wrap{
+      display: flex;
+      flex-wrap: wrap;
+    }
+    .video_filter_area {
+      margin-bottom: 20px;
+    }
+    #filter_category_box {
+      width: 100%;
+      line-height: 50px;
+      height: 50px;
+      max-width: none;
+      border: none;
+      padding: 0 1em;
+    }
+    .category_box {
+      padding: 0;
+    }
+    .search_box {
+      padding-right: 0;
+    }
+    @media (max-width: 767px){
+      .search_box {
+        padding: 0;
+        margin-top: 0.5em;
+      }
+    }
+    .search_keyword {
+      margin-right: 50px;
+    }
+    .search_input input[type=text] {
+      padding: 0 1em;
+      line-height: 50px;
+    }
+    .search_input input {
+      max-width: none;
+      width: 100%;
+      height: 50px;
+      border: none;
+    }
+    .search_submit {
+      position: absolute;
+      right: 0;
+      top: 0;
+      width: 50px;
+      height: 100%;
+    }
+    .search_input input[type=submit] {
+      background: url(/assets/video_pro/search_btn.png) center center no-repeat #c9c9c9;
+      font-size: 0;
+    }
+    .video_tablist {
+      overflow: hidden;
+      letter-spacing: 0.1em;
+      margin-bottom: 15px;
+      padding: 0;
+    }
+    .video_tablist>li, .album_tablist>li {
+      width: 50%;
+      float: left;
+    }
+    .video_tablist li.now_view a {
+      background-color: #c47f27;
+    }
+    .video_tablist a {
+      display: block;
+      padding: 10px 0;
+      text-align: center;
+      background-color: #8d681e;
+      color: #fff;
+      text-decoration: none;
+      font-size: 120%;
+    }
+    .video_title h5 {
+            @extend .i-title;
+            display: -webkit-box;
+            -webkit-line-clamp: 2;
+            -webkit-box-orient: vertical;
+            overflow: hidden;
+            text-overflow: ellipsis;
+    }
+    .view_info {
+      float: right;
+    }
+    .view_info img {
+      margin-right: 5px;
+    }
+  </style>
+  <script>
+
+    $(document).ready(function () {
+      var $select = $("#filter_category_box"); // 取得 select
+      var $categoryBox = $(".category_box"); // 取得分類框
+
+      // 創建按鈕並插入
+      $select.find("option").each(function () {
+        var value = $(this).val();
+        var text = $(this).text();
+
+        // 只處理有值的選項
+        if (value) {
+          var $btn = $('<button class="category-btn" data-value="' + value + '">' + text + '</button>');
+          $categoryBox.append($btn);
+        }
+      });
+
+      // 點擊按鈕時，更新 select 並觸發變更事件
+      $(".category-btn").on("click", function () {
+        var selectedValue = $(this).data("value");
+        $select.val(selectedValue).trigger("change"); // 設定 select 值並觸發變更事件
+      });
+
+      // 隱藏原本的 select
+      $select.hide();
+      $('#filter_category_box').on('change', function(){
+        $(this).prop('form').submit();
+      })
+    });
+
+  </script>
+</div>
+{{pagination_goes_here}}
diff --git a/modules/video_pro/video_pro_index_post_agency1.html.erb b/modules/video_pro/video_pro_index_post_agency1.html.erb
index ac24f8e..d44100f 100644
--- a/modules/video_pro/video_pro_index_post_agency1.html.erb
+++ b/modules/video_pro/video_pro_index_post_agency1.html.erb
@@ -22,7 +22,7 @@
           <div class="video_desc">{{video_desc}}</div>
           <div class="view_info">
             <span><img src="{{hd_icon_url}}" alt="HD"></span>
-            <span><img src="{{view_icon_url}}" alt="{{view_count_trans}}>">x {{view_count}}</span>
+            <span>x {{view_count}}</span>
           </div>
         </div>
       </a>
@@ -32,12 +32,6 @@
   <style>
     .video_data{
       margin-bottom: 1em;
-      .video_link{
-        background: #f3f3f3;
-        position: relative;
-        display: block;
-        padding: 1em;
-      }
     }
     .video_info {
         margin: 1em 0;
diff --git a/modules/web_resource/_web_res_widget2.html.erb b/modules/web_resource/_web_res_widget2.html.erb
index 77312ae..64e70f8 100644
--- a/modules/web_resource/_web_res_widget2.html.erb
+++ b/modules/web_resource/_web_res_widget2.html.erb
@@ -15,6 +15,7 @@
     </a>
     </li>
   </ul>
+        <div class="morebken">more<i class="fa-solid fa-chevron-down"></i></div>
 </div>
 <style type="text/css">
   .widget-content-horizontal{
diff --git a/modules/web_resource/_web_res_widget3.html.erb b/modules/web_resource/_web_res_widget3.html.erb
index ff82776..888bc6c 100644
--- a/modules/web_resource/_web_res_widget3.html.erb
+++ b/modules/web_resource/_web_res_widget3.html.erb
@@ -13,10 +13,6 @@
       </div>
     </li>
   </ul>
-  <div style="position: absolute;top: 55%;bottom: 50%;width:100%;">
-	<button class="btn-left" title = "<%= (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" %>" style="float: left;height: 2.5em; width: 2.5em;background: url(/assets/link-left.png) no-repeat;border: 0;background-size: contain;position: absolute;transition:.3s; left: -1%;"></button>
-	<button class="btn-right" title = "<%= (I18n.locale.to_s =="zh_tw") ? "下一張" : "next" %>" style="float: right;;height: 2.5em; width: 2.5em;background: url(/assets/link-right.png) no-repeat;background-size: contain;border: 0;position: absolute;transition:.3s;right: -2%;"></button>
-  </div>
   <a class="btn-primary widget-link__more btn" href="{{more_url}}"><%= t("web_link.more") %></a>
 </div>