From da471e58d2dcf6e424b8e0f00a01ae079bf30eed Mon Sep 17 00:00:00 2001 From: kenlee Date: Mon, 24 Mar 2025 17:47:50 +0800 Subject: [PATCH] 'refresh' --- assets/javascripts/app.js | 614 ++++++++++++++---- .../stylesheets/template/layout/header.scss | 1 + assets/stylesheets/template/layout/slide.scss | 2 +- 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 | 8 +- .../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 | 7 +- 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 | 66 ++ modules/property_hire/info.json | 10 +- .../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 - 76 files changed, 1593 insertions(+), 288 deletions(-) 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/property_hire/index_calendar.html.erb 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 cf46154..188e56a 100644 --- a/assets/javascripts/app.js +++ b/assets/javascripts/app.js @@ -1,6 +1,7 @@ ;(function($, win, undefined) { // ECMAScript 5 嚴格模式 'use strict'; + //header fixed在上方 function initdata1() { if ( $('.homebanner').length != 0) { @@ -54,14 +55,14 @@ }, // 外掛，所有的外掛都可以放到這個物件裡 - plugins: { - // 自適應圖片裁切，Ray的外掛 - bullEye: function() { - $('.bullseye').bullseye({ - fadeEffect: false - }); - } - }, + // plugins: { + // // 自適應圖片裁切，Ray的外掛 + // bullEye: function() { + // $('.bullseye').bullseye({ + // fadeEffect: false + // }); + // } + // }, // nav: { // 自適應使用的下拉選單 @@ -410,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函數 @@ -464,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('下一張'); + $("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); + // 確保 內沒有文字節點 (避免重複添加) + if ($this.text().trim() === "") { + $this.append('公告圖片'); + } + }); + $(".widget-link__widget-title").each(function () { + if ($(this).text().trim() === "") { + $(this).append('公告標題'); + } + }); + $(".sitemenu-title").each(function () { + if ($(this).text().trim() === "") { + $(this).append('次選單'); + } + }); + $(".annc-title").each(function () { + if ($(this).text().trim() === "") { + $(this).append('內頁公告標題'); + } + }); + $(".event-annc-title").each(function () { + if ($(this).text().trim() === "") { + $(this).append('內頁活動公告標題'); + } + }); + $(".show-title").each(function () { + if ($(this).text().trim() === "") { + $(this).append('內頁活動公告標題'); + } + }); + $(".w-annc__widget-title").each(function () { + if ($(this).text().trim() === "") { + $(this).append('公告標題'); + } + }); + $(".widget-title").each(function () { + if ($(this).text().trim() === "") { + $(this).append('網路資源標題'); + } + }); + $(".widget-title").each(function () { + if ($(this).text().trim() === "") { + $(this).append('網路資源標題'); + } + }); + $('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); + + // 如果 已經有 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 += '在新視窗開啟 '; + } + + // 取得 的文字內容 + var linkText = $this.text().trim(); + if (linkText) { + ariaLabel += linkText; + } else if ($this.children('span').length === 1) { + ariaLabel += $this.children('span').text().trim(); + } + // 如果包含 圖示，標示為 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('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(' 已經有 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('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('=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('' + titleText + ''); + } + }); + // 刪除空的檔案室 + 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(); @@ -548,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', @@ -630,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(); // 取得 裡的文字，去掉前後空格 + var number = text.replace(/\D/g, ""); // 只保留數字部分 + if (number) { + $(this).text(`・觀看次數：${number}次`); // 更新內容格式 + } + }); + $(".movie_desc").before('

單元介紹

'); + $(".movie_desc").each(function () { + var decodedHtml = $("
- +
    "> "> 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 @@ - +
      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 @@ - +
        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 @@ - +
          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 @@ - +
            "> "> @@ -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 @@
            - +
              "> "> 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 @@
            • - + {{img_description}}
              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" >
            • - + {{img_description}}
              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 @@
              - - + + <%= (I18n.locale.to_s =="zh_tw") ? "更多+" : "More NEWS" %>
              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 @@ <%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %>
                -
              • +
              • - + {{img_description}} - +

                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" >
              • - +
                {{status}} 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 @@
                • - + {{img_description}}
                  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 @@
                  • - + {{img_description}}
                    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" >
                  • - + {{img_description}}
                    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 @@ +
                    +

                    + {{widget-title}} +

                    + +
                    + <%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %> +
                    +
                    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 @@ +
                    +
                    +

                    + {{widget-title}} +

                    + <%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %> +
                    +
                      +
                    • +
                      + + {{img_description}} +
                      +                       +
                      +
                      +
                      + + {{status}} + + + + {{postdate}} + + + + {{category}} + +
                      +

                      + {{title}} +

                      +

                      {{subtitle}}

                      +
                      +
                      • +
                    +
                    + + 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 @@
                    • - + {{img_description}}
                      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 @@
                    {{pagination_goes_here}} + + \ 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 + \ 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 81c0099..8a3b869 100644 --- a/modules/announcement/show.html.erb +++ b/modules/announcement/show.html.erb @@ -11,9 +11,15 @@ .s-annc__sub-img.pull-left { margin-right: 2em; } + .show-announcement{ + max-width: 800px; + margin: auto; + z-index: 1; + position: relative; + }
                    -

                    {{title}}

                    +

                    {{title}}

                    • 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 zcmd^`cU)81+V7)`;>ZBb*r__683d#$y#;J2NKpt85TYV2RB53HN3jDVy@O&X2}Mdk zYQRE~PDlcwNeu)O3`qz9Lhi;n=N-m(?m08}zW1;DM?U#vXYI9DdDinh>-$^#k%gI& z@NTi)AP`9S;)SzUK%niDz=yhPCve5*l?reH^sUbY8$S?8@z~~PTM!By2m&1eT|8@O z6_i066$-lM60EdpUUjQI$w|IUfh(nR^yoJ~$g1AcHuym* z4DJL9c)E#FJ_(GPc0?>cpSeQz?bun{Gqz7GhqY&y%DwaigIyxqWMY(jC!d^XP4XDh z?s-VFP9g@KCq5m+I!E9r?E+#7#ayDsQr*TXQODi(=bwN60R&RU9Z2y8fl`paXo5iB z?0L5hbR_bK2ne+8o7*7Jt|JcxKn5T~37~7cfd1_<*dqvv1pQvrz+EBB_qvZyU*&@_ zE!x6(#xh%5NgV{zD)S>N>&K}SAxwEMaHWfb*B*GC`?FdK+SAo6jgh+SClGmPy(g8V zr`M40IYK1PVt0a$9E_0$N06h>F4HAfWAUx*ImfjFW}$N&iguv5s<;<#P)Iw zJY3WIZw|rV7_I+LibfKDG+!O;o0@N2{8aFIw5>Upc~S}l_nt40=?qt-x|+DFXQo@T zP6%hR9doDLdSdRnjrTrpFU|D3zL7DEPkf^7Q?>ixJM*lR3&#XwUp^Bs!oO>ORpAkCJnJI|k+uBVPoy*3l6_-- zDaL=oX#sCpqN}7pJ#JR7V6{i7I1*gz7j!aGz@UAlZ0~$i?*(mNS5u)M7ZTb^cDM)J3I`E(r6AApE)0&71V+f!BRLS7x#}Y(iKLCp^?> zbt%8`)D+{{v$8bsLD2iYs=0Au0$Ilv-{FAtq}o*1drk5CJ;zNsNX`w4bX(yS9Xma0 zQ`5(fZZHmqjqMD`jtZ)n&8-u4y6*!@fqVGthA)M~F1}q`z~|fB?vso1IfA3w3&IQc z7_Mh~uLX*n-)8WAg4vsF{@kdV^!#&Rm`M7evE$p0M}`pY*mi`+u6!iY=JSW8x|%P5 z+H$8_TU?$}^Erzb&%}P0KgPz^sfM@mU(3)!S+B;owbfXvJ+~5+A}_mYFTQ}(NczyB z@2bN~muTN^yIxzz=We8Rw^uc1LOga%x9cHz{~(nb(eJJZjE^VYy$rHY6$QVlc0Q(9 zjE;_$0D`PxX$V z-Bb#!z{cv?xSFB-@}svJh~1(CmVa{VZ*EqKA%Q*@JHF$f{b1xNfi7CJr>K=~gx;I3 zTr!EwjkIk?8^XIswmk9gdgtH#jjgG+a(0ZA))mH(RH(;zhEb*O%;U$yCmhP(xr=sU zio`V2(~=>>1Lc$DKYr!-^(LF@$rUaIllV*t>1^h&=-{j_iudxQ08~arKVY;S(~Qp;>Z@&coUKbrpu?hB5KINtuO=jet$U6xo*!(p)dJpRNQ#T=OeqFJ@PWRQXWx6u zVKWno>=Co(?~6uK;`-_KbwDdk*FMBZ##)UyzrD|PS#Rt>8&npF!AeS8fJTxt|5ZQa zZUxZHXb7}@@0Q?ZYpI!Q>?u?Dm>9noQkety>$%D?s(%z69b>J#GOB}s zjO1MrU5V@dz#GSqI?eeAHDJQI)MKRtnVsxSEf>!C)0EgOjl3;;%9mf?@QRqJ$0t z?W#i`TD-b{5mvy`{mDd*1&)!B0NVLn@67&cH#aw6R$QVu7Y$x+X-aU>g5SKjdBtnO z4eR0)(28>SO>5!KRj#j^BBsiTP+mkvSgyqnQroQ$9> z?A5hQq{#z~2(E8!je(3A+1b7KBo^D*-A*^I-s5g>QPVKfw87h7Jya2D4*XM8yuNtr zV!p|ncgGR>ZQ6pWwq2!F_CIwo;F2CV&ZxQ#VU4vHDb|8MCJU?7G8 z3NUL%Q%Fc?dU%?zccZ>B7&2rO;k({B4jUMAxGn9Dnd3VQYIFMi=^ys*uh!C1xqLf) zLO@W?t0I&%vew3Sy`nVJE!Y(zavTb!EPcuM=enIxS-P^1;6b>yq-XP9W+>)6Y3(TvriQs& z8CMQ>xeRyuG9cyD_%u~;(brjUtY(u0#4q&qqurbc-7wd89iRb7jcp<%d*CJa#+E$S zeRq>?fqzGZakj1P(#k`V_Xad4LVi)&%bkR*EffAFzn=SEupG(Kv<8NU{aOr#g=xi_b8x`f-7L&ISaF4ya~lX+HWWdM0Q@J+&O$9e$F03F7Ezf0 zq&tt<6RCl=hhZdnwU*+AP$Fnasgw@1va~}V6 z;C@b|;;^q_iD2g1k&Pm8#jfV#pyP4N%T@kEkaW2Aq>KJIch}>WQUN(cTc&8dH6UwUpnKz=wu94tnBCewA@k@FcC1f|tgAB5J@35Mhj=6E(uJyNlo||^;)>1|qvw>_;UC%9m zI$W-$KrI*_mKFq_vsQ~M_3l0=!|^6|_LHlWGlwhumvpM@dA0sPdM>Gbb;I;jYirBY zPNAlZO2xEbv@LP;S#9mX2j-v1%sn}`Y77Qb53eP5esuTzz8uOs!L`2uy}F{Y$& zXhTLsFV0MAH!ZIqgL~mk`F{E9}B4NZ_80`w-?^r*Urn^HHkXCGQnRx zIFGSg>~3~F?&5@i*3MvY@mb-cLU4Vfy^at1%e*6wL`U%My4_^ukdEXZ@b|t%19SQZ zBG~EFlTA7Z5tJR070)s~s#{I0s>*{FJEVF=EJa1>Ped$RN}Fb{3>x7b1&w@_)3~?U zN%DAP(6Dq~$;_w=J8WvW@z^U@t@^#KguS*)u3VXPAhGocLk2P4$YbnCHhXM!%y z%h4ucM^!P|vRIOu-!3ICZE+Ml6ldu#EcuR)8|J%^%R-L}9=lPc&wLb1ywz=tnLt?> zF%rlR;i!R_(~Ph%elx4BZ7NC(Q7DNTO6;yfF}<-ZRT}{n=0mr1x*4Gxc7$Q%&Ee(R znEYLV(XsiZ>P_2C&ImH3$B{6R^UXsm-3{1anwbc%Y5ky;TVesLgP@&TDb-1LEq+8#FGm@85hm&C zT|P2*&M&VprlPcJrFqw1JuW^n+%6DnrFW`}HQRY!=Iapn6$tv;rT-gd^v9yYp6@3E zm6Vw`Y4@3zR9%XlZbJ#++A1vJtj5FpB9juD|i+F1cuzO|xjw+w2BrVa1 z_md(r#oOzA+2}XlMbPe>y4_xTA@TGdV;P_${R z{M_2xYq(B^g*3jnYM~Uuc;bHYbCT17cn>kU~87%MMEm}>@Z})!9I3JQXbnr zGfIrh%wFrzI&`imanyePe)764!O;~*Rg2d8zM{9kFO$5AE)B+oG@i?gqj)PuczVwr z8N=4=G)zQ$cQ#*0iN;i4)584d&>nYiT-#>)cufCpo7R9u^iWWCUGUpm1-Y8WP?fPh z{>wKFHd-`HgmKnW4DcYMK zl6Hu#^Q#6bVuNT3HQku7GGB{{$&;o_n}xPRaUy&)PBBbu8#rfkG>mx?mzjwc>Z11B87R~y})V_&d^WEos#K~U6#H8 zKCGXSn~RCfFVb{bf*T~P`6)!<4?ol4HQp*ME~F1b>MBQ&AE$3y>U+y54w{#MjB z-LrpD^3bIR_aFEv{{YG(`-}y?f3J!ZK{ zKMu+B&No?G6T9gk-l&GE+`iGFF>?H#z`mx5zB1PHo^{97Xc(W?elFq15awc|7Ox$) zf!!k#;6u^lpzIv@Ni4QbBY6*g__N`<o!Is>Yb@!Qp-|Nr6m_~uS0pCO#^=Wvq%fbRv zmz?i%%`f2jPUI9bLPan)a@Gg0ps{~LQ(XI@(jwgqxe{8snH#1=_y71I8%ME^O0R(8 zmeuCJbq@h%-PJ>b|A8q}dV0V8Th2o;XNSg1PW_Z=yu3VU8dm6l{20zh)K=n3eM+s} zw#|9->81Urll5?mMr_;!D2~N#)E2bLRAE9!Hv{y&y_f`uk(Gfu8MsCyW(g5$7tovkY2I; zg-9MM?qZo-m7_;r`M9mEy5EU;{dd6XONJq`3{-{r1fR+b-R#OCBINxZ{u z(!;+Nc79zDWx07TUJxf0Z=z9G=Z@NB9qDaqzd5aNk$*ZZ{nCAay5qQsdC$x*F1V*I zl)0I1`-A@Rx7YjM7?i(TwAYq(alB&c<1{};Qcp_%fa`%L+T{MnStz&5M*7BWh1xzp z!@n`Oo!G52Q#3SaKR6|KYmZW<|Kb|)j9aTfD4$)HDM}NS+^ZTt766tHp)C8OWMDP2 z_5;;{W3i3=qLAE0f&JCcW1z-p|(l_@yU37>iA0#1fyO!)`ICquxO{L1f zj(}Uvx8h~SIf<1Biq9yuiK1T)kpz8wDmAK?q0dN0?3-*b1a@n%T3Vf1qXh`1yupo) zz$gkR5biv?Ys3=+SzMNVI?m-v&qloP9Zy^8tun&vjgJ6c0_5VmKDaWCKMn&POa=eivMd!)xWL4a0p77fV}jI5V^XKx7t<@EiD2mD*g-+#3H;-A9< zV{|uGp3*q9VenL$V{UG+xb_ZgL9Sy<6SPQEgLxgmwIQkEXRV7<?bs_@VP= zimvc3bRVqQ3Squvsv+-O3dxO~LW;G@M!9)yQX|VvPx}@`y~40T(S)O}x;B)1^BKn; zZ>3Ma%Y=V}XY|7R-F6zqN~GRSh}Ekqr5=OT_`ZMIdO*o$5+V5U#4W<~yt8F)M>~2H zUpRC2Pk_5>lwRn4XNg&$qi9jR1&T&CZb(VA$)*imi0{ffpKRI1EclZff5$?FnD8S*4+=*8%XJ&JA+6v%4XKsjhZuaoi;CEN0U>z+~|dyM^wT*CaF0ZE7mE zYH9)MYPAyB^!hFADMt;pO#&R~(PF5()Yg4C7P2PmWCOM`g|0%8;xXM*k zYfCP&RkyEMRfQ<%140<39sLOJ25V1(#OGV)y6ya$6ajS6-~-#-dRTO0K~7-5FCy1KgK^|}w&cIpLB zzI)nQuGm##ufdF;ELZHMk70F~!R3ks`XHn2X{)-&Rq&KbvcvN-Cqhx-2SRCKIef@J zk!%KFVhzYlOTtos4;oH}mcyt0ZPfha*n7pcY6iu!S{9z-A0C}d_B^O$b8@Oo&7IU4 zRODnBfJ8X)JmmZetH^9xhAlB9_UU+jB1lqg0 zc@{vwCkzV!Ov--jzQ^rbI`&U0-BVH4*LT?bbtt9eaI6#CQgObMo_(!h_S0H(MZ(%p zQC2&At)(M;yS??|R2W;Ej`SFR+InA9^210V0S!4NWk<$VDo*{vO@PGbb)YZfA=GV3 zP+Z;zv=g52f?p>_(CrChKO<51>OLVFWkGWD<)Ibk|J^(R126+feb)%1B=eM#rCCO& z>lque)>Ih*19hRFTDn5}!rDzr{5+umrT6_}U@p4LD{U7DYZBzlfZ*WSvbuK{vl1|8 zES(51=gZ*(zzDmeecA44F4_ru5=N6JjBHmir^(x>1=SX%>5h89{f8*+MWc8~MD#!) zb*m2a&%q&GtZD2ha_HzT0S1S?yxbXdB9<5bU$otO>P?i;DNc?2R87mt5T}ZWh>NNE zP0#MWJtZYhKBYQUmXwrqI5xm~E;A~m5W+`TN2e)boJ}E>8;iDu=cI#+^^I}X;nOql zMcIG0X_#`+rC=!k7J&|Qfa`CA4cEqIRc!S(?#7u3bt85DHs{5S_gAy!;sEKTUjm%! zH}U2Z?pSQBWO|LK-SE>^0Nm?LmHAfF;r7bRALj4y)?9R}TsT>WV~cIld8>-^{)gjN z(Rs9gV170wxvI%|%VA49Nisosa>LLMgfYu<_~)nLw+5zxcCh>ty{c0nb@?6W8N3r= zdHw@owQwLjZ_E1q&4cMp2J~aYY-VFZLqf$r&N-J}6P>=M|091oXj%CHwz?}AYyVv((mJ<2R*^I>}M zr6F`x67@854V!!JQE z?V)qwrn49QPMDU-xT?lWw}>usz!i<35i>!NH2)cM3-kEHS}!#J(4$n;PnnsgBCa#J z>3;g~9M^JqmlajSfU!lp`#%$-eI?%|m(F!IACJ7yAYR)A1_{fO4C_PR#|?~)B>{<3 z1q1^cEqiSW%>NZJ_R!#Gc@rC6r<{K}XG8rlM`4Vq;i1xgmUf+WDP3) zMAi02->#*BY9~ummlsxos{mlH8pr7{*QnbK{B#0D(x`Fr-RT~F-4&-t)MkQ9Yfmcl zAKP6+8tY3c37x@HPj%P5s$hU~K$RZ<2 z*&#$lOve$zHW0cmpgXSp-1Ft9kfnOr&hU58P3FJ6>W*&_vIek8lhvl&;jmQe-XEV` z^}K}Xixw#ws(iC9p!~L$3C)A?8z=*wmkWrShqq?yJ2t6BVE;G?N-_je#KbCL`h_}a z{m-SbdbRGaOM1RtPxlM0{h7~yoK@mKpTxw!PwwH{n~I1^n?878gr9phHE)u=;q{(I z*cCac9WW+Ki7Fk7tA+aKz0Z6?4SXta_ildp=s1aVk`z9>(UoSSNVU`9j+gZ@ScAQ7 z(+2>M&s4wUdbRk8Exw!{GeBt2{In-o5vI!>Z{NFjKDaa_)cmHfe*VY*InZd}e#~^W?Q=7$nbV*VzA!v) z7Aq;y-uw{2?`dN!raA6p!>2sbZy5aAzbLyTZc)fBjMMO5Yo(%clXUsFE9Eb{k8k3) zOm;-$t8kaq2a* z4X?tEk5Y$&b$K}O(6fz*9!EFQO3)n_%^r}vEyR4W;m26uIR!J(!U z>Ks4ljMy68a~5|*yQKD~fc2$1xc180O$a{4| zz-_#*PvWU_;23XteD52fmsTC%m1a?ty$&2PGdVaaz2}XPGpj`OCBqX|FqBhGlRof9 zXqJCC!^&mxS+1~-r59}1Up>_MAGdZ} z&VQcyhVh>EWK)C%6*vGtn8Z>*ah+tdSXO%XcTkGFH!*xwS5HC6RDS8F?&gP6df~T2 zpSRQjsCHAwxH>cni4S(4zv{Ii9ElS`}-g3u}{^rexny2jGa+ zxYN<8sy297Al}_weQzet7h|K4k`zO)Tv>74c}S_a+<%NUZ^Iw)zP5BPPk0KoCt_0} zv)KcSU@pE)uAjRv@$?=%;dD@8Uh>96bYlPH+kR-ot&=0qkSO^>_8Lg%CHVQ`1USj1 zq&BQP3AhSQ)88cZodMAez2vVrz1AYrBOFjd`#JQnG?1>VAI6?MaPtSG*`h()|gm&!`>fcffHFBQ<`<^)z+k=;Hdq?b>EeWQ#G{gOL8}6xfzz>vz-s8>`^Yi&m=lzZ8|$ zP0?T95Y5w}uUfA%Hht%=$BO{=#m^+`%Z~bYm~O)U-Ql{`JYFl_1Z0fd;g0O&GFHS~(3wwA^+Hb*6>7}nxK z>^KwF|8`hfZsZaU0Q*M(fuNIShs)ep0dHJBgYy6!nF;OqY0UxH{P+-TgTmPl&ohB` z(CaCU5>LO099kVXh`Z9ZBL}W_b`QV1i34DCR}n;B z{_qGr?o_8VG#iv+UKdD*4{`(7PXC2t=YKxn|7IEiZ>dCc1(ZYpeT4vB$bRKz3NW#* z8v&f9(~>SwC=~eBG*r71C!_vp1ZX;LA{du&_p*Us(3oEqq+n_tMX^r?5S)*?vArnN z-oA+0?V$=3V?atTm|w-G1ImD-eDQtUDz;R1K*bBt3u?L0tZX2oRkrh9FCM?pQCBA( zI3_mRm4;kHAQM-W1`{^#k>i!EQ5J)tM};QE$CsUNNaS1}W7Of)Y6i(|Uy{7Apv^3d z_7YdBY|6Jhb54%+&R_QPbe#_W}8Ppw1WD%&X`hoaSF zBd8#dA0w%{{-i%@Mn`7-wT<;xFTK+V|t15(XSgfq7+je&8Br#CrHO+|i6}Pv8b%^8cSEUQtSBt;e zCgfP_O(HefPmH98t6j;Y(v&J5{I?fTT!0r*vQ&zyNg)Ma)5l&Q_}v)W2D+a0f4#5$ i>sG^5K(Y7&frqwRR%1S$0bUaVT|8%Yw&e8nU;Y<$Xq?gj 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 @@ }
                + 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 @@ @@ -18,10 +18,10 @@
                - +
                -
                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 @@ @@ -13,7 +13,7 @@ {{title}}
                -

                {{title}}

                +

                {{title}}

                {{description}}
                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 @@ @@ -9,14 +9,14 @@
                -

                {{title}} - {{category_title}} +

                {{title}} + {{category_title}}

                {{title}}
                -
                {{description}}
                +
                {{description}}
                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 @@
                • - + {{img_description}}
                  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 @@
                  -
                  -

                  - {{widget-title}} -

                  - <%= t("event_news.more") %> -
                  +

                  + {{widget-title}} +

                +
                + + <%= t("event_news.more") %> +

                • - {{view_count_trans}}>x {{view_count}} + {{view_count}} +
                +
                + + + +
                +
                {{video_duration}}
                +
                {{video_tag}}
                +
                {{video_keyword}}
                +
                {{video_postdate}}
                +
                {{video_title}}
                +
                {{video_desc}}
              + \ 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 @@ +
              +

              {{widget-title}}

              + +
              +
              + + \ 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 @@ +
              +

              {{widget-title}}

              +
              + + +
              + +
              + +
              + \ 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 @@ +
              +

              {{widget-title}}

              + +
              + +
              + \ 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 @@ +
              +

              {{widget-title}}

              + +
              +
              +
              + \ 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 @@
              {{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 @@

              {{page-title}}

").html($(this).text()).html(); // 轉換轉義的 HTML + $(this).html(decodedHtml); // 設置為真正的 HTML + }); + $(".video_group_time").each(function () { + var $this = $(this); // 當前 .video_group_time + // 找到對應的 ，並移動到 .video_group_time 內部 + var $q = $this.closest(".imglst_desc").find(".movie_desc q"); + if ($q.length) { + $this.append($q.clone()); // 將 複製並添加到 .video_group_time + $q.remove(); // 移除 .movie_desc 裡的 + } + // 移動 .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) + "日"; + }); + // 找到對應的 ，並複製 + var $q = $this.closest(".video_data").find(".video_desc q").clone(); + // 更新內容並加上 + $this.html(formattedText).append($q); + }); + //常用到的js + // $('.').after($('.')); + // $('.').before($('.')); + // $('.').append($('.')); + // if($('.show-announcement').hasClass('show-announcement')) { + // $('.').css('', ''); + // } + $(".mybooking").append(''); + //內頁dattpp移位 $('.i-annc__page-title').after($('.sitemenu-wrap2')); $('.i-archive-title').after($('.sitemenu-wrap2')); $('.page-module-title').after($('.sitemenu-wrap2')); @@ -653,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); }) @@ -725,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"); @@ -740,6 +1112,7 @@ extendPanelWidget(); headerH(); $(window).resize(function() { if ($(window).width() <769) { + $('.modules-menu-level-0').after($('.header-nav')); }else{ $('.outdropdowns').before($('.header-nav')); @@ -769,8 +1142,11 @@ extendPanelWidget(); // $('.outdropdowns').removeClass('navFixed'); /* 移除選單固定效果 */ // } // }); - $('.navbar-brand h2').replaceWith(function () { - return "

" +$(this).html() + "

"; + $('.navbar-brand h2').replaceWith(function() { + return $("

", { + class: this.className, + html: $(this).html() + }); }); $('#search'). attr('title', '另開新視窗'); $(window).scroll(function() { @@ -830,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 b0603ee..045ccf6 100644 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -25,6 +25,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/layout/slide.scss b/assets/stylesheets/template/layout/slide.scss index 483abab..9ed1c22 100644 --- a/assets/stylesheets/template/layout/slide.scss +++ b/assets/stylesheets/template/layout/slide.scss @@ -5,7 +5,7 @@ .layout-slide { position: relative; overflow: hidden; - z-index: 1; + z-index: 0; .w-ad-banner { margin: auto; } 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 @@ - +
    "> "> 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 @@ - +
      "> "> 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 @@