diff --git a/assets/images/design_thumb.png b/assets/images/design_thumb.png
index 606898d..978f302 100644
Binary files a/assets/images/design_thumb.png and b/assets/images/design_thumb.png differ
diff --git a/assets/images/titlecap.svg b/assets/images/titlecap.svg
new file mode 100644
index 0000000..d4d8e47
--- /dev/null
+++ b/assets/images/titlecap.svg
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/images/故宮剪影-01.svg b/assets/images/故宮剪影-01.svg
new file mode 100644
index 0000000..75989b5
--- /dev/null
+++ b/assets/images/故宮剪影-01.svg
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/images/故宮剪影.svg b/assets/images/故宮剪影.svg
new file mode 100644
index 0000000..84f6f0e
--- /dev/null
+++ b/assets/images/故宮剪影.svg
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/images/花紋1.svg b/assets/images/花紋1.svg
new file mode 100644
index 0000000..e991586
--- /dev/null
+++ b/assets/images/花紋1.svg
@@ -0,0 +1,2686 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/images/花紋2.svg b/assets/images/花紋2.svg
new file mode 100644
index 0000000..f6fcbac
--- /dev/null
+++ b/assets/images/花紋2.svg
@@ -0,0 +1,2665 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js
index f6cddf9..0c84991 100644
--- a/assets/javascripts/app.js
+++ b/assets/javascripts/app.js
@@ -548,7 +548,10 @@
$('show').parent('li').focus();
}
forFreeGo();
-
+ $(document).on('touchstart','a',function(e){
+ e.stopPropagation();
+ $(this).trigger('focus');
+ });
//背景widget設定
if ( location.href.search('editmode=on') != -1 ) {
$('.background').css('z-index','0');
@@ -713,6 +716,7 @@ function transdate(){
// 當文件物件模型(DOM)載入後,執行init函數
$(document).ready(function() {
+ $('.w-annc.tab_nav').before($('.w-annc.w-annc__list'));
$('.group').each(function(){
if ($(this).text().trim()==''){
$(this).css('padding',0);
@@ -836,19 +840,19 @@ function transdate(){
$('.layout-content').css('margin-top',$('.kenjohn').height()-$('#orbit-bar').height());
}
if (parseInt($('.layout-content').css('margin-top')==0)){
- theTop = $('.layout-content-inner.container').offset().top-$(".kenjohn").position().top+10;
+ theTop = $('.twosection').offset().top-$(".kenjohn").position().top+5;
}else{
- theTop = $('.layout-content-inner.container').offset().top-$(".kenjohn").position().top-$(".kenjohn").height()+10;
+ theTop = $('.twosection').offset().top-$(".kenjohn").position().top-$(".kenjohn").height()+5;
}
}else{
- theTop = 10;
+ theTop = 5;
}
console.log(theTop);
$("html, body").animate({
- scrollTop: theTop }, {duration: 500,easing: "swing",complete: function(){
+ scrollTop: theTop }, {duration: 400,easing: "swing",complete: function(){
console.log('finish');
if(!stop){
- move_to_target(true);
+ move_to_target(true);
}
}});
}
@@ -877,13 +881,13 @@ function transdate(){
//$('.modules-menu-level-1').css('calc_menu_flagleft','-'+$('.outdropdowns .dropdowns').offset().left+'px');
calc_menu_pos();
-
+
window.has_hover = false;
if($(window).outerWidth(true) >= 768){
window.has_hover = true;
}
});
-
+
$('#main-nav>li').mouseover(function(){
if (!calc_menu_flag){
calc_menu_pos();
diff --git a/assets/stylesheets/template/RWD.scss b/assets/stylesheets/template/RWD.scss
index 0c564e0..4855849 100644
--- a/assets/stylesheets/template/RWD.scss
+++ b/assets/stylesheets/template/RWD.scss
@@ -16,6 +16,9 @@
.big-title{
font-size: 40px;
}
+ .extra-box{
+ padding: 0!important;
+ }
}
@media(max-width: 769px){
.ad-banner-widget-6{
diff --git a/assets/stylesheets/template/base/_global.scss b/assets/stylesheets/template/base/_global.scss
index 6129e3b..6da9117 100644
--- a/assets/stylesheets/template/base/_global.scss
+++ b/assets/stylesheets/template/base/_global.scss
@@ -13,16 +13,17 @@ body {
margin-top: 2.5em;
overflow: hidden scroll;
background-color: #F8F8F8;
+ letter-spacing: 1px;
}
a:link,
a:visited {
- color: #288E8E;
+ color: $theme-color-second;
}
a:hover,
a:focus {
- color: #1d6666;
+ color: #7d0000;
text-decoration: revert;
}
@@ -52,13 +53,17 @@ td {
a.btn-primary {
color: $theme-white;
- border-color: #288E8E;
- background-color: #288E8E;
+ border-color: $theme-color-second;
+ background-color: $theme-color-second;
font-size: 0.8125rem;
&:hover {
- background-color: darken($theme-color-main, 10%);
- border-color: darken($theme-color-main, 10%);
+ background-color: #7d0000;
+border-color: #7d0000;
+opacity: .7;
+letter-spacing: 3px;
+-webkit-transition: all 0.2s ease-in-out;
+transition: all 0.2s ease-in-out;
}
}
diff --git a/assets/stylesheets/template/base/_go_back_top.scss b/assets/stylesheets/template/base/_go_back_top.scss
index 6dc0f27..0b2e801 100644
--- a/assets/stylesheets/template/base/_go_back_top.scss
+++ b/assets/stylesheets/template/base/_go_back_top.scss
@@ -3,7 +3,7 @@
@import "variables";
.go-back-top {
- background:#288E8E;
+ background: rgba($theme-color-second, 0.9);
text-align: center;
padding: 0.625em 0.75em;
position: fixed;
@@ -16,6 +16,6 @@
border-radius: 0.125em;
z-index: 1050;
&:hover {
- background:#288E8E;
+ background:$theme-color-second;
}
}
diff --git a/assets/stylesheets/template/base/_unity.scss b/assets/stylesheets/template/base/_unity.scss
index 177d175..d98c2b4 100644
--- a/assets/stylesheets/template/base/_unity.scss
+++ b/assets/stylesheets/template/base/_unity.scss
@@ -7,11 +7,14 @@
margin: 0.5em 0;
line-height: 1.5;
font-family: $main-font;
- font-size: $font-h3;
+ font-size: $font-h2;
color: $theme-color-main;
text-align: center;
- padding-top: 0.7em;
-
+ padding-top: 1em;
+ background: url(/assets/titlecap.svg) top no-repeat;
+ background-position-x: center;
+ background-position-y: -12px;
+ background-size: 165px;
.layout-footer & {
margin-bottom: 0.625em;
border-bottom: none;
diff --git a/assets/stylesheets/template/base/_variables.scss b/assets/stylesheets/template/base/_variables.scss
index bd7ffdf..f6f27e5 100644
--- a/assets/stylesheets/template/base/_variables.scss
+++ b/assets/stylesheets/template/base/_variables.scss
@@ -16,13 +16,13 @@ $theme-red: #d20001;
$theme-blue: #003d7e;
$theme-color-main: #333333;
-$theme-color-second: #E4002B;
+$theme-color-second: #c49951;
$theme-color-third: #ed4c43;
-$theme-color-green: #288E8E;
+$theme-color-green: #c49951;
// Font stacks
-$main-font: "IndustryW00-Medium","Barlow", "Roboto", "微軟正黑體", "Helvetica Neue", Helvetica, sans-serif;
-$sub-font: "Barlow","Roboto", "微軟正黑體", "Helvetica Neue", Helvetica, sans-serif;
+$main-font: "Roboto", "微軟正黑體", "Helvetica Neue", Helvetica, sans-serif;
+$sub-font: "Roboto", "微軟正黑體", "Helvetica Neue", Helvetica, sans-serif;
@font-face {font-family: "IndustryW00-Medium"; src: url("//db.onlinewebfonts.com/t/b8e20323f8f36e06f87745c93c45afcd.eot"); src: url("//db.onlinewebfonts.com/t/b8e20323f8f36e06f87745c93c45afcd.eot?#iefix") format("embedded-opentype"), url("//db.onlinewebfonts.com/t/b8e20323f8f36e06f87745c93c45afcd.woff2") format("woff2"), url("//db.onlinewebfonts.com/t/b8e20323f8f36e06f87745c93c45afcd.woff") format("woff"), url("//db.onlinewebfonts.com/t/b8e20323f8f36e06f87745c93c45afcd.ttf") format("truetype"), url("//db.onlinewebfonts.com/t/b8e20323f8f36e06f87745c93c45afcd.svg#IndustryW00-Medium") format("svg"); }
diff --git a/assets/stylesheets/template/layout/content.scss b/assets/stylesheets/template/layout/content.scss
index faff835..1a2aea0 100644
--- a/assets/stylesheets/template/layout/content.scss
+++ b/assets/stylesheets/template/layout/content.scss
@@ -17,10 +17,7 @@ body{
.downIcon{
position: absolute;
left: 50%;
- top: 775px;
- @media (min-width:1026px) and (max-width:1280px){
- top: 735px;
- }
+ bottom: 15%;
//bottom: 10%;
z-index: 2;
color: #fff;
@@ -131,14 +128,39 @@ body{
}
}
.bannertwo{
-
+// .ba-banner-widget-1 .w-ba-banner__slide>a img{
+// @media(max-width: $screen-xs){
+// width: auto;
+// max-width: unset;
+// transform: translateX(-38%);
+// height: 50vw!important;
+// }
+// }
+.w-ba-banner{
+ @media(max-width: 768px){
+ height:auto!important;
+ .banner-overlay{
+ background: #c49951!important;
+ }
+ }
+}
@media(min-width:1024px){
padding: 0;
.w-ba-banner{
display: flex;
flex-direction: row-reverse;
+ height: 35vh!important;
.w-ba-banner__wrap{
- flex: 0 0 65%;
+ flex: 0 0 60%;
+ height: 35vh!important;
+ .w-ba-banner__slide{
+ height: 35vh!important;
+ img{
+ height: 100%;
+ width: auto;
+ max-width: unset;
+ }
+ }
}
.ad-overlay{
position: relative;
@@ -250,21 +272,38 @@ body{
width: 100%;
display: flex;
flex-wrap: wrap;
- padding: 2em;
@media(max-width: $screen-xs){
flex-wrap: wrap;
}
}
+.colorwrapper{
+ width: 100%;
+ background-color: #f1f2f4;
+}
.iconbox{
width: 20% !important;
flex: 1 1 20%;
+ &:hover{
+ opacity: .7;
+ cursor: pointer;
+ transform: scale(1.2);
+ -webkit-transition: .5s ease-out;
+ -moz-transition: .5s ease-out;
+ -ms-transition: .5s ease-out;
+ -o-transition: .5s ease-out;
+ transition: .5s ease-out;
+ }
.fas{
font-size: 2.5em;
- color: #abb5b4;
+ color:#d2d2d2;
}
.fab{
font-size: 2.5em;
- color: #abb5b4;
+ color: #d2d2d2;
+ }
+ .far{
+ font-size: 2.5em;
+ color: #d2d2d2;
}
@media(max-width: $screen-xs){
flex: 50%;
@@ -345,7 +384,7 @@ body{
}
.bannertwo{
@media(min-width:1024px){
- background-color: #72bcad;
+ background-color: #c49951;
}
@media(max-width: $screen-sm){
padding: 0;
@@ -353,9 +392,6 @@ body{
}
.onesection{
color: #fff;
- @media(max-width:$screen-xs){
- padding: 0 15px;
- }
}
.onepicture{
padding: 0;
@@ -363,14 +399,11 @@ body{
.onetext{
padding:3em;
}
-.line{
- @media(min-width:1025px){
- width: 80%!important;
- margin: auto!important;
- }
-}
.threesection{
- padding: 2em 0;
+
+}
+.extra-box {
+ padding: 0!important;
}
.widget-event_news-0.widget-event_news-0-new{
.w-event_news__list{
@@ -423,7 +456,7 @@ body{
display: none;
}
.card0{
- border-top: 25px solid #72bcad;
+ border-top: 25px solid #c49951;
}
.w-event_news__meta{
top: -25px!important;
@@ -438,7 +471,7 @@ body{
.w-event_news__widget-title{
text-align: center;
padding-top: 0.7em;
- background: url(/assets/titlecap.png) top no-repeat;
+ background: url(/assets/titlecap.svg) top no-repeat;
background-size: 164px 35px;
background-position-y: -7px;
font-size: 1.2rem;
@@ -499,11 +532,76 @@ body{
.w-event_news__img-wrap.bullseye{
overflow: visible!important;
}
-//內頁
-.inner-page{
- padding: 50px 0;
+.twosection{
+ padding: 2em 0;
+ background: url(/assets/故宮剪影.svg) bottom repeat #f6f6f6;
+ background-size: 30px;
+ // background: url(/assets/故宮剪影.svg) bottom no-repeat #f6f6f6;
+ // background-position: right 10em;
+ // background-size: 200px;
+ @media(min-width: 769px){
+ align-items: center;
+ }
+ #search_query{
+ -webkit-appearance: none;
+ border-radius: 20px;
+ height: 40px;
+ border: none;
+ padding: 1em;
+ color: #333;
+ @media(max-width: $screen-xs){
+ width: 86%;
+ }
+ }
+ .icon{
+ background: #c49951;
+ border-radius: 50%;
+ height: 40px;
+ left: 163px;
+ top: 2px;
+ transition-delay: .3s;
+ width: 40px;
+ border: none;
+ padding: 10px;
+ font-size: 10px;
+ color: #fff;
+ &:hover{
+ background: #9d7528;
+ }
+ }
}
+.timeinfo{
+ padding: 2em;
+ .ho{
+ &:hover{
+ .fas{
+ transform: translateX(5px)!important;
+ }
+ }
+ }
+}
+.oneshadow{
+ background-image: linear-gradient(to right, #1212121f, #dedede00);
+ -pie-background: linear-gradient(to right, #1212121f, #dedede00);
+ behavior: url("/assets/ie_support/PIE2/PIE.htc");
+ padding-bottom: 1em;
+ @media(min-width: 768px){
+ padding-left: 2em;
+ padding-right: 0;
+ }
+}
+.rightbox{
+ @media(min-width: 768px){
+ padding-right: 2em;
+ }
+}
+
.internal-page{
+ .ba-banner-widget-1 .ad-overlay, .ba-banner-widget-1 .banner-overlay{
+ @media(max-width:768px){
+ position:absolute;
+ }
+ }
background-color: #fff;
.kenjohn {
flex-wrap:wrap-reverse;
@@ -652,3 +750,8 @@ body{
}
}
}
+.middlebox{
+ @media(min-width: 769px){
+ padding-left: 0;
+ }
+}
diff --git a/assets/stylesheets/template/layout/footer.scss b/assets/stylesheets/template/layout/footer.scss
index e14992b..44cca4d 100644
--- a/assets/stylesheets/template/layout/footer.scss
+++ b/assets/stylesheets/template/layout/footer.scss
@@ -2,17 +2,18 @@
@import "../initial";
.kenfooter{
- background-color:#333333;
+ background-color:#3d3d3d;
width: 100%;
margin: auto;
}
.layout-footer-inner{
- background-color:#333333;
+ background: url(/assets/故宮剪影.svg) bottom no-repeat #3d3d3d;
+ background-position: right 92px;
padding: 2em!important;
}
.layout-footer {
- color:#dfdfdf;
+ color:#fff;
font-size: 0.8125em;
letter-spacing: 1px;
z-index: 2;
@@ -25,11 +26,14 @@
}
.footer-counter a { padding-right: 0.5em; }
a {
- color: #bcbac2;
+ color: #fff;
&:hover,
&:focus {
color:#fff;
+ letter-spacing: 3px;
+ -webkit-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
}
}
}
@@ -42,31 +46,3 @@
padding-right: 10px;
}
}
-@media(max-width:$screen-xs){
- .footer-content{
- flex-wrap: wrap;
- }
- .part{
- width: 100%!important;
- }
-}
-.footertext{
- @media(min-width:$screen-xs){
- flex: 0 0 70%;
- }
-}
-.layout-footer-content{
- @media(min-width:$screen-xs){
- display: flex;
- }
-}
-.footerimage{
- @media(min-width:$screen-xs){
- display: flex;
- }
-}
-.footericon{
- @media(min-width:$screen-xs){
- flex:0 0 50%;
- }
-}
diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss
index efef6a6..a3d8835 100644
--- a/assets/stylesheets/template/layout/header.scss
+++ b/assets/stylesheets/template/layout/header.scss
@@ -18,7 +18,7 @@
.header-nav {
text-align: center;
z-index: 1;
- padding: 1em 0.5em!important;
+ padding: 1em 0.5em 0!important;
color: #fff;
font-family: $main-font;
text-transform:uppercase;
@@ -80,30 +80,30 @@ a#content{
.navbar-nav>li{
padding: 0.5em;
margin: 0.5em;
- border: 1px solid #ddd;
- border-left: none;
- border-right: none;
- .modules-menu-level-1{
- display: none;
+ border: 2px solid #fff;
+ color: #fff;
+ padding: calc(0.7777777778em - 2px) calc(2.5em - 2px);
+ align-items: center;
+ border-radius: 4px;
+ behavior: url("/assets/ie_support/PIE2/PIE.htc");
+ &:nth-child(3){
+ background: #c49951;
+ border: 2px solid #c49951;
+ }
+ a{
+ color: #fff;
+ text-shadow: 0px 0px 8px #00000070;
+ font-size: 1.2em;
+
}
&:hover{
- .modules-menu-level-1{
- display: block;
- transition-duration: opacity 0.3s cubic-bezier(0.48, 0.01, 0.5, 0.99),visibility 0.1s linear;
- background-color: #fffffff2;
- position: absolute;
- box-shadow: 2px 2px 5px #00000033;
- padding: 1em;
- li{
- padding: 0.5em;
- &:hover{
- span {
- color:#0d5151!important;
- text-decoration: underline;
- }
- }
- }
-
+ background: #ffffffe6;
+ border-color: #f2f2f2;
+ color: #64696b;
+ a{
+ color: #64696b;
+ text-shadow: none;
+ text-decoration: none;
}
}
}
@@ -113,7 +113,7 @@ a#content{
span{
&:hover{
- color: #288E8E!important;
+ color: #c49951!important;
}
}
@@ -122,31 +122,31 @@ a#content{
&,& .jp-jplayer{
@media(min-width:1801px){
.ad-overlay{
- bottom: 50%;
+ bottom: 6%;
position: absolute;
}
}
@media screen and (min-width:1451px) and (max-width:1800px){
.ad-overlay{
- bottom: 40%;
+ bottom: 6%;
position: absolute;
}
}
@media screen and (min-width:1281px) and (max-width:1450px){
.ad-overlay{
- bottom: 50%;
+ bottom: 6%;
position: absolute;
}
}
@media screen and (min-width:1026px) and (max-width:1280px){
.ad-overlay{
- bottom: 30%;
+ bottom: 6%;
position: absolute;
}
}
- @media screen and (min-width:991px) and (max-width:1025px){
+ @media screen and (min-width:$screen-xs) and (max-width:1025px){
.ad-overlay{
- bottom: 31%;
+ bottom: 40%;
position: absolute;
}
}
@@ -157,11 +157,24 @@ a#content{
}
}
@media screen and (min-width: 769px){
- height: 100vh;
+ height: 65vh!important;
}
- @media screen and (max-width: 768px){
- height: 720px;
+ @media screen and(min-width:$screen-xs) and (max-width:768px){
+ height: 1000px!important;
+ .w-ad-banner__image{
+ height: 1000px!important;
+ max-width: unset;
+ width: auto;
+ }
}
+ @media screen and (max-width: $screen-xs){
+ height: 680px!important;
+ .w-ad-banner__image{
+ height: 680px!important;
+ max-width: unset;
+ width: auto;
+ }
+ }
}
}
.jp-jplayer{
@@ -206,7 +219,28 @@ a#content{
.button-mid{
display: none;
}
-
+ input[type=search]{
+ -webkit-appearance: none;
+ border-radius: 20px;
+ height: 40px;
+ border: none;
+ padding: 1em;
+ color: #333;
+ }
+ .icon{
+ background: #c49951;
+ border-radius: 50%;
+ height: 40px;
+ left: 163px;
+ top: 2px;
+ transition-delay: .3s;
+ width: 40px;
+ border: none;
+ padding: 10px;
+ &:hover{
+ background: #9d7528;
+ }
+ }
.container {
@extend .response-container;
}
@@ -256,22 +290,23 @@ a#content{
}
@media(min-width:1900px){
width: 225px;
- margin-top: -12px;
+ margin-top: 10px;
}
@media screen and (min-width:1025px) and (max-width:1899px){
width: 181px;
- margin-top: -3px;
+ margin-top: 10px;
}
@media screen and (min-width:769px) and (max-width:1025px){
- width: 150px;
- margin-top: -5px;
+ width: 250px !important;
+ margin-top: 23px;
}
@media screen and (min-width:$screen-xs) and (max-width:769px){
- width: 146px !important;
+ width: 200px !important;
+ margin-top: 10px;
}
@media screen and (max-width:$screen-xs){
- width: 110px !important;
- margin-top: 3px;
+ width: 200px !important;
+ margin-top: 10px;
}
}
@@ -353,7 +388,10 @@ a#content{
}
.navFixed{
position: fixed!important;
- top:2.5em;
+ top:0;
+ .btn-search{
+ color: #333333;
+ }
}
.internal-page .kenjohn.navRel,.navRel {
position: relative!important;
@@ -375,10 +413,11 @@ a#content{
}
z-index: 10;
left: 0;
- background-color: #fff;
+ -webkit-backdrop-filter: saturate(180%) blur(20px);
+ backdrop-filter: saturate(180%) blur(20px);
+ background-color: #ffffffe6;
margin-top: 0;
min-width: 100%;
- opacity: 0.98;
transition: opacity .5s ease-out;
.collapse{
flex: 0 0 62%;
@@ -399,8 +438,8 @@ a#content{
.navbar-header{
@media screen and (min-width:769px) {
- height: 78px;
- margin-bottom: 1em;
+ height: 80px;
+ margin-bottom: 0;
width: 35%;
justify-content: center;
}
@@ -421,8 +460,10 @@ a#content{
text-shadow: none;
}
.header-nav{
- background: #e7e8ea;
- padding:0.5em !important;
+ background:#e2e2e2;
+ padding:0.5em!important;
+ margin: 0;
+ width: 100%;
}
.header-nav a{
text-shadow:none;
@@ -437,7 +478,7 @@ a#content{
max-height: 65%;
verflow-y: scroll;
border-radius: 0.5em;
- opacity: 1;
+ opacity: 1;
padding:1em 5% 3em;
transition-duration: opacity 0.3s cubic-bezier(0.48, 0.01, 0.5, 0.99),visibility 0.1s linear;
&::-webkit-scrollbar {
@@ -505,3 +546,38 @@ a#content{
display: inline-block;
left: 5px;
}
+.btn-search{
+ &:hover{
+ .searchbox{
+ display: block;
+ }
+ }
+}
+.btn-search{
+ padding-right: 0.5em;
+ float: right;
+ padding-top: 5px;
+ padding-left: 5px;
+ color: #fff;
+
+ @media(max-width:$screen-xs){
+ float:left;
+ margin-left: 1em;
+ .searchbox{
+ margin-top: 2em;
+ margin-left: 1em;
+ }
+ }
+}
+.searchbox{
+ display: none;
+ position: absolute;
+
+ ::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */
+ color: #fff;
+ opacity: 1; /* Firefox */
+ }
+ input[type=search]{
+ background: #4e4e4e66;
+ }
+}
diff --git a/assets/stylesheets/template/layout/slide.scss b/assets/stylesheets/template/layout/slide.scss
index 19851f3..b3f8d89 100644
--- a/assets/stylesheets/template/layout/slide.scss
+++ b/assets/stylesheets/template/layout/slide.scss
@@ -5,9 +5,22 @@
.layout-slide {
position: relative;
z-index: 0;
+ background: #fff;
+ padding: 0;
.w-ad-banner {
//max-width: 75em;
margin: auto;
}
}
+.layout-slidewrapper{
+ width: 100%;
+ background: #fff;
+ // padding-bottom: 2em;
+ .w-annc__widget-title{
+ margin: 0;
+ }
+}
+.layout-slide-one{
+ padding-bottom: 1em;
+}
diff --git a/assets/stylesheets/template/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss
index 325aab9..3ef39ea 100644
--- a/assets/stylesheets/template/modules/ad_banner.scss
+++ b/assets/stylesheets/template/modules/ad_banner.scss
@@ -8,7 +8,27 @@
// Widget
// ## gerenral styles
-
+.designbox{
+ background: url(/assets/花紋1.svg) top no-repeat;
+ background-position: top left;
+ width: 80%;
+ height: 80%;
+ position: absolute;
+ z-index: 102;
+ opacity: .7;
+ float: left;
+}.designboxx{
+ background: url(/assets/花紋2.svg) top no-repeat;
+ background-position: bottom right;
+ width: 100%;
+ height: 100%;
+ position: relative;
+ z-index: 102;
+ opacity: .5;
+}
+.banner-pager .active-slide button{
+ background:$theme-color-second!important;
+}
.w-ba-banner {
position: relative;
z-index: 0;
@@ -48,13 +68,16 @@
font-family: $main-font;
width: 100%;
bottom: 0;
+ text-align: center;
+ background: none!important;
// background-image: linear-gradient(180deg,transparent 0,rgba(0,0,0,.7) 40%,#000);
h3 {
margin: 0;
padding: 0 0.5rem;
color: #fff;
- font-size: 33px;
+ font-size: 1.5em;
font-weight: 400;
+ text-shadow: 2px 2px 5px #333;
}
@@ -426,11 +449,15 @@ ul.button-mid{
// Widget 1
.ba-banner-widget-1 {
+ .banner-overlay{
+ padding:2em 1em;
+ }
.w-ba-banner__caption {
color: $theme-color-main;
z-index: 200;
- padding: 4em;
+ padding-bottom: 9%;
+ // background-image: linear-gradient(180deg, transparent 0, #0000004d 50%, #000000e0);
h2 {
font-family: $main-font;
@@ -445,11 +472,10 @@ ul.button-mid{
}
@media(max-width: $screen-sm) {
.ad-overlay {
- padding: 0.5em 1em;
position: relative;
- background:#72bcad;
- h3 { font-size: 1em; }
- p { font-size: 0.75em; }
+ background:$theme-color-second;
+ h3 { font-size: 1.2em; }
+ p {}
}
.controlplay {
right: 0;
@@ -582,4 +608,60 @@ ul.button-mid{
position: absolute;
width: 100%;
height: 100%;
-}
\ No newline at end of file
+}
+// Widget 8
+[data-cycle-carousel-visible="4"] .w-ba-banner__slide {
+ width: auto;
+ height: auto
+}
+.ba-banner-widget-8 {
+ &:hover{
+ img{
+ transform: scale(1.2);
+ -webkit-transition: .3s;
+ transition: .3s;
+ overflow: hidden;
+ }
+ }
+ .banner-pager{
+ display: none!important;
+ }
+ .banner-overlay{
+ text-align: center;
+ background-image: linear-gradient(
+ 180deg
+ , transparent 0, #00000045 50%, #00000085);
+ }
+ .w-ba-banner__caption {
+ color: $theme-color-main;
+ z-index: 200;
+ padding: 1em;
+ position: absolute;
+
+ h2 {
+ font-family: $main-font;
+ font-size: $w-caption-font-size;
+ margin: 0.5em 0;
+ }
+
+ p {
+ font-family: $main-font;
+ font-size:1.2rem;
+ }
+ }
+
+ @media(max-width: $screen-sm) {
+ .ad-overlay {
+ padding: 0.5em 1em;
+ position: relative;
+ background:$theme-color-second;
+ h3 { font-size: 1em; }
+ p { font-size: 0.75em; }
+ }
+ .controlplay {
+ right: 0;
+ a { padding: 0 5px;}
+ a i { font-size: 0.75em; }
+ }
+ }
+}
diff --git a/assets/stylesheets/template/modules/announcement.scss b/assets/stylesheets/template/modules/announcement.scss
index 7dac6e3..ccf5348 100644
--- a/assets/stylesheets/template/modules/announcement.scss
+++ b/assets/stylesheets/template/modules/announcement.scss
@@ -5,7 +5,33 @@
//
// Widget
//
-
+.w-annc__item {
+ margin-bottom: 1.875em;
+ &:hover{
+ img{
+ transform: scale(1.5)!important;
+ -webkit-transition: .5s ease-out;
+ -moz-transition: .5s ease-out;
+ -ms-transition: .5s ease-out;
+ -o-transition: .5s ease-out;
+ transition: .5s ease-out;
+ }
+ .transitionfade{
+ height: inherit;
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ background-color: rgba(0,0,0,.4);
+ -webkit-transition: .5s ease-out;
+ -moz-transition: .5s ease-out;
+ -ms-transition: .5s ease-out;
+ -o-transition: .5s ease-out;
+ transition: .5s ease-out;
+ }
+ }
+}
// Announcement widget
.label{
padding: .4em .6em .4em;
@@ -18,19 +44,37 @@
width: 100%;
}
.w-annc__widget-title{
- background: url(/assets/titlecap.png) top no-repeat;
- background-size: 164px 35px;
- background-position-y: -7px;
+ background: url(/assets/titlecap.svg)top no-repeat;
+ background-position-x: center;
+ background-position-y: -12px;
+ margin: 0.5em 0;
+ line-height: 1.5;
+ font-family: "IndustryW00-Medium", "Barlow", "Roboto", "微軟正黑體", "Helvetica Neue", Helvetica, sans-serif;
+ font-size: 1.5rem;
+ color: #333333;
+ text-align: center;
+ padding-top: 1em;
+ background-size: 165px;
+}
+.w-annc__title{
+ display: -webkit-box;
+ -webkit-line-clamp: 1;
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
+
}
.w-annc {
.w-annc__widget-title {
@extend .unity-title;
+
}
.w-annc__list {
margin: 0;
padding: 0;
list-style: none;
+ clear: both;
}
.w-annc__item {
@@ -47,7 +91,7 @@
.w-annc__postdate-wrap,
.w-annc__category-wrap {
display: inline-block;
- margin-right: 0.2em;
+ margin-right:0;
font-size: 0.8125em;
color: $theme-color-main;
font-weight: normal;
@@ -55,6 +99,7 @@
i {
color:$theme-color-main;
+ padding-right: 5px;
}
}
@@ -74,7 +119,7 @@
font-size: 1rem;
line-height: initial;
&:hover {
- // color: darken($theme-color-main, 10%);
+ color: #7d0000;
}
}
}
@@ -220,7 +265,6 @@
line-height: 1.3;
font-size: 1.2rem;
}
- .w-annc__widget-title { float: left; }
.w-annc__more { margin-top: 1.5em; }
.w-annc__list > .w-annc__item:nth-child(3n+1) {
clear: both;
@@ -241,7 +285,7 @@
}
.w-annc__item {
- border-bottom: 0.0625em dashed lighten($theme-gray, 65%);
+ //border-bottom: 0.0625em dashed lighten($theme-gray, 65%);
padding-bottom: 1em;
margin-bottom: 1em;
}
@@ -252,7 +296,7 @@
.w-annc__item {
margin-bottom: 0.8em;
padding-bottom: 0.8em;
- border-bottom: 0.0625em dashed lighten($theme-gray, 65%);
+ //border-bottom: 0.0625em dashed lighten($theme-gray, 65%);
}
.w-annc__entry-title {
@@ -276,7 +320,7 @@
.w-annc__item {
margin-bottom: 0.8em;
padding-bottom: 0.8em;
- border-bottom: 0.0625em dashed lighten($theme-gray, 65%);
+ //border-bottom: 0.0625em dashed lighten($theme-gray, 65%);
}
.w-annc__entry-title {
@@ -299,9 +343,7 @@
.w-annc__postdate,
.w-annc__category {
- white-space: nowrap;
font-size: 1rem;
- float: right;
}
// Widget-8
@@ -356,7 +398,7 @@
.w-annc__item {
margin-bottom: 0.8em;
padding-bottom: 0.8em;
- border-bottom: 0.0625em dashed lighten($theme-gray, 65%);
+ //border-bottom: 0.0625em dashed lighten($theme-gray, 65%);
}
.w-annc__entry-title {
@@ -378,7 +420,7 @@
.w-annc__item {
margin-bottom: 0.8em;
padding-bottom: 0.8em;
- border-bottom: 0.0625em dashed lighten($theme-gray, 65%);
+ //border-bottom: 0.0625em dashed lighten($theme-gray, 65%);
}
.w-annc__entry-title {
@@ -462,7 +504,7 @@
.w-annc__item {
margin-bottom: 0.8em;
padding-bottom: 0.8em;
- border-bottom: 0.0625em dashed lighten($theme-gray, 65%);
+ //border-bottom: 0.0625em dashed lighten($theme-gray, 65%);
}
.w-annc__entry-title {
@@ -493,7 +535,6 @@
line-height: 1.3;
font-size: 1rem;
}
- .w-annc__widget-title { float: left; }
.w-annc__more { margin-top: 1.5em; }
.w-annc__list > .w-annc__item:nth-child(3n+1) {
clear: both;
@@ -534,7 +575,8 @@
.w-annc__item {
margin-bottom: 0.8em;
padding-bottom: 0.8em;
- border-bottom: 0.0625em dashed lighten($theme-gray, 65%);
+ clear: both;
+ //border-bottom: 0.0625em dashed lighten($theme-gray, 65%);
}
.w-annc__entry-title {
@@ -549,6 +591,14 @@
display: inline-block;
font-size: 0.75rem;
}
+ .search_block{
+ p{
+ float: left;
+ padding-right: 1em;
+ line-height: 2;
+ padding-left: 0.8em
+ }
+ }
}
//widget 19
.widget-announcement-19 {
@@ -624,7 +674,7 @@
}
.i-annc__th {
- color: $theme-color-main;
+ color: #fff;
background: $theme-color-second;
font-size: 0.8125em;
border: none;
@@ -722,7 +772,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl
.i-annc__item {
margin-bottom: 0.8em;
padding-bottom: 0.8em;
- border-bottom: 0.0625em dashed lighten($theme-gray, 65%);
+ //border-bottom: 0.0625em dashed lighten($theme-gray, 65%);
}
.i-annc__title {
font-size: 0.95rem;
@@ -757,7 +807,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl
.i-annc__item {
margin-bottom: 0.8em;
padding-bottom: 0.8em;
- border-bottom: 0.0625em dashed lighten($theme-gray, 65%);
+ //border-bottom: 0.0625em dashed lighten($theme-gray, 65%);
}
.i-annc__title {
font-size: 0.95rem;
@@ -910,7 +960,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl
.i-annc__item {
margin-bottom: 0.8em;
padding-bottom: 0.8em;
- border-bottom: 0.0625em dashed lighten($theme-gray, 65%);
+ //border-bottom: 0.0625em dashed lighten($theme-gray, 65%);
}
.i-annc__title {
font-size: 0.95rem;
diff --git a/assets/stylesheets/template/modules/event_news.scss b/assets/stylesheets/template/modules/event_news.scss
new file mode 100644
index 0000000..578a4db
--- /dev/null
+++ b/assets/stylesheets/template/modules/event_news.scss
@@ -0,0 +1,53 @@
+@charset "utf-8";
+
+@import "../initial";
+
+
+
+
+.widget-event-news-calendar-2.w-calendar .w-calendar-table td{
+ color: #333!important;
+}
+.widget-event-news-calendar-2.w-calendar .w-calendar-table td.w-calendar-event div{
+ color: #333!important;
+ border: none!important;
+ border-radius: 0!important;
+ background: none!important;
+}
+.widget-event-news-calendar-2.w-calendar .event-inner-title{
+ line-height: normal!important;
+}
+.widget-event-news-calendar-2.w-calendar .event-header{
+ font-size: 1em !important;
+}
+.w-annc .w-annc__subtitle{
+ 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;
+}
+.widget-event-news-calendar-2.w-calendar .event-container-one .event-content{
+ font-size: 0.8em!important;
+}
+.text{
+ color: #333!important;
+}
+.widget-event-news-calendar-2.w-calendar{
+ webkit-box-shadow: 0 2px 10px 0 #00000033!important;
+ box-shadow: 0 2px 10px 0 #00000033!important;
+}
+.widget-event-news-calendar-2.w-calendar button.switch_button{
+ width: 1.8em!important;
+ height: 1.8em!important;
+}
+.widget-event-news-calendar-2.w-calendar .event-container-one:hover, .widget-event-news-calendar-2.w-calendar .event-container-one.hover-class{
+ font-weight: bold!important;
+ background: none!important;
+ box-shadow: none!important;
+}
+.w-annc__list{
+ padding: 0!important;
+}
diff --git a/assets/stylesheets/template/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss
index 477d3dc..4ab828b 100644
--- a/assets/stylesheets/template/modules/menu.scss
+++ b/assets/stylesheets/template/modules/menu.scss
@@ -29,7 +29,7 @@
padding-top: 32px!important;
}
@media (min-width: 1025px){
- padding-top: 28px!important;
+ padding-top: 20px!important;
}
@media (min-width: 769px) {
margin: 0 0 0.8em 0;
@@ -89,7 +89,7 @@
position:relative;
margin: 0;
padding: 0 1em;
- border-bottom: 0.0625em solid lighten($theme-gray, 5%);
+ // border-bottom: 0.0625em solid lighten($theme-gray, 5%);
& > a {
display: block;
@@ -103,7 +103,7 @@
// border-radius: 0.5em;
& > a {
- color: #288E8E;
+ color: #a85a56;
}
@media (min-width: $screen-sm) {
@@ -150,8 +150,8 @@
}
& > a {
- padding: 0.8rem;
- font-size: 14px;
+ padding: 0.8rem 1em;
+ font-size:1.15rem;
color:#fff;
font-weight: 900;
// text-shadow: 1px 1px 1px #0000008c;
@@ -221,10 +221,10 @@
& > li {
padding-right: 2em;
- flex: 0 0 33.3%;
+ flex: 0 0 25%;
& > a {
padding-left: 1em;
- border-bottom: 2px solid #288E8E;
+ border-bottom: 2px solid #a85a56;
padding: 5px 0;
}
@@ -312,7 +312,7 @@
width: 100%;
position: absolute;
right: 0;
- background: #ffffff;
+ background:#f6f6f6;
height: 100%;
top: 40px;
padding-top: 0;
diff --git a/assets/stylesheets/template/template.scss b/assets/stylesheets/template/template.scss
index dd418fa..5d8eb90 100644
--- a/assets/stylesheets/template/template.scss
+++ b/assets/stylesheets/template/template.scss
@@ -40,7 +40,9 @@ div.extra-box:empty {
// outline: 2px solid #43B5FC;
outline: transparent;
}
-
+.twocontent{
+ margin-top:0!important;
+}
// container setting
.response-container {
position: relative;
@@ -72,14 +74,17 @@ div.extra-box:empty {
@media (min-width: $screen-sm) {
width: 100%;
+ padding:0 2em;
}
@media (min-width: $screen-md) {
- width: 60em;
+ width: 100%;
+ padding:0 2em;
}
@media (min-width: $screen-lg) {
- width:70em;
+ width: 100%;
+ padding:0 2em;
}
}
.dropdowns{
@@ -139,11 +144,11 @@ ul.tab_nav {
border-radius: 30px;
behavior: url("/assets/ie_support/PIE2/PIE.htc");
&:hover{
- background:#288E8E;
+ background:#c49951;
color: #fff;
}
&.active {
- background:#288E8E;
+ background:#c49951;
color: #fff;
}
}
diff --git a/assets/stylesheets/template/widget/sitemenu.scss b/assets/stylesheets/template/widget/sitemenu.scss
index 85f6424..59e674e 100644
--- a/assets/stylesheets/template/widget/sitemenu.scss
+++ b/assets/stylesheets/template/widget/sitemenu.scss
@@ -76,7 +76,7 @@
.sitemenu-list {
border-radius: 0.25em;
box-shadow: 0px 0px 0px 1px #d7d7d7;
- margin: 0 -1px!important;
+ margin:0 0 1em !important;
}
.sitemenu-item{
@media (min-width: 768px) {
diff --git a/home/index.html.erb b/home/index.html.erb
index 1e5a49a..7114c3a 100644
--- a/home/index.html.erb
+++ b/home/index.html.erb
@@ -15,35 +15,43 @@
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -52,37 +60,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
<%= render_footer %>
diff --git a/modules/ad_banner/_ad_banner_widget1.html.erb b/modules/ad_banner/_ad_banner_widget1.html.erb
index 8c32071..410f3b7 100644
--- a/modules/ad_banner/_ad_banner_widget1.html.erb
+++ b/modules/ad_banner/_ad_banner_widget1.html.erb
@@ -29,35 +29,33 @@
-
-
+
+
diff --git a/modules/ad_banner/info.json b/modules/ad_banner/info.json
index dda4273..93ec03a 100644
--- a/modules/ad_banner/info.json
+++ b/modules/ad_banner/info.json
@@ -70,6 +70,14 @@
"en" : "7. Carousel ( image, description, navigation )"
},
"thumbnail" : "thumb.png"
- }
+ },
+ {
+ "filename" : "ad_banner_widget8",
+ "name" : {
+ "zh_tw" : "8. 橫幅輪播 ( 兩張圖片, 圖片說明文字, 導航圖示 )",
+ "en" : "8. Carousel ( image, description, navigation )"
+ },
+ "thumbnail" : "thumb.png"
+ }
]
}
diff --git a/modules/announcement/_annc_widget10.html.erb b/modules/announcement/_annc_widget10.html.erb
index 4f860fb..aca26bd 100644
--- a/modules/announcement/_annc_widget10.html.erb
+++ b/modules/announcement/_annc_widget10.html.erb
@@ -4,14 +4,14 @@
-
+
-
-
+
+
{{postdate}}
diff --git a/modules/announcement/_annc_widget11.html.erb b/modules/announcement/_annc_widget11.html.erb
index b9ccd5c..293dd0d 100644
--- a/modules/announcement/_annc_widget11.html.erb
+++ b/modules/announcement/_annc_widget11.html.erb
@@ -4,11 +4,11 @@
-
-
+
+
{{postdate}}
-
+
{{status}}
diff --git a/modules/announcement/_annc_widget15.html.erb b/modules/announcement/_annc_widget15.html.erb
index 01c1a98..a40c21e 100644
--- a/modules/announcement/_annc_widget15.html.erb
+++ b/modules/announcement/_annc_widget15.html.erb
@@ -1,8 +1,8 @@
-
+
-
+
{{archive-title}}
{{status}}
-
+
- {{file-name}}
- {{file-type}}
+ {{file-name}}
+ {{file-type}}
@@ -33,4 +33,11 @@
{{link_to_edit}}
+
\ No newline at end of file
diff --git a/modules/archive/archive_index3.html.erb b/modules/archive/archive_index3.html.erb
index ad5e1ad..bbd7caf 100644
--- a/modules/archive/archive_index3.html.erb
+++ b/modules/archive/archive_index3.html.erb
@@ -12,8 +12,8 @@
- {{file-name}}
- {{file-type}}
+ {{file-name}}
+ {{file-type}}
diff --git a/modules/archive/archive_index4.html.erb b/modules/archive/archive_index4.html.erb
index 48ebcf4..e4c39a4 100644
--- a/modules/archive/archive_index4.html.erb
+++ b/modules/archive/archive_index4.html.erb
@@ -3,7 +3,7 @@
{{page-title}}
-
+
-
- {{link_to_edit}}
+ {{link_to_edit}}
\ No newline at end of file
diff --git a/modules/archive/archive_index9.html.erb b/modules/archive/archive_index9.html.erb
index 839160f..02056ec 100644
--- a/modules/archive/archive_index9.html.erb
+++ b/modules/archive/archive_index9.html.erb
@@ -12,14 +12,14 @@
-
+
- {{file-name}}
+ {{file-name}}
- {{file-type}}
+ {{file-type}}
diff --git a/modules/archive/info.json b/modules/archive/info.json
index a88c353..03ee4b1 100644
--- a/modules/archive/info.json
+++ b/modules/archive/info.json
@@ -87,6 +87,40 @@
"en": "11. Table list - Simple - Unfold Files (widget-title, category, Serial Number, filename, download link)"
},
"thumbnail": "ar9.png"
+ },
+ {
+ "filename": "archive_index12",
+ "name": {
+ "zh_tw": "12. 手風琴式列表 - 有下拉 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )",
+ "en": "12. Accordion list - with drop down (widget-title, category, filename, download link)"
+ },
+ "thumbnail": "ar2.png"
+ },
+ {
+ "filename": "archive_index13",
+ "name": {
+ "zh_tw": "13. 頁籤式 ( 模組標題, 類別標題, 標題, 下載連結, 描述 )",
+ "en": "13. Tab list (widget-title, category, title, download link, description)"
+ },
+ "thumbnail": "ar-tab1.png"
+ },
+ {
+ "filename": "archive_index14",
+ "name": {
+ "zh_tw": "14. 手風琴式列表 - 有下拉 - 針對各筆資料 ( 模組標題, 標題, 檔案名稱, 下載連結 )",
+ "en": "14. Accordion list - with drop down - For every data (widget-title, title, filename, download link)"
+ },
+ "force_cover": "true",
+ "thumbnail": "ar2.png"
+ },
+ {
+ "filename": "archive_index15",
+ "name": {
+ "zh_tw": "15. 頁籤式 ( 模組標題, 類別標題, 標題, 完整檔案名稱, 下載連結, 描述 )",
+ "en": "15. Tab list (widget-title, category, title, full filename, download link, description)"
+ },
+ "force_cover": "true",
+ "thumbnail": "ar-tab1.png"
}
],
"widgets": [
@@ -105,6 +139,24 @@
"en": "2. Accordion list (widget-title, category, link of download page)"
},
"thumbnail": "thumb.png"
+ },
+ {
+ "filename": "archive_widget3",
+ "name": {
+ "zh_tw": "3. 列表 ( 模組標題, 類別標題, 檔案名稱, 包含檔案 )",
+ "en": "3. List (widget-title, category, and files)"
+ },
+ "force_cover": "true",
+ "thumbnail": "thumb.png"
+ },
+ {
+ "filename": "archive_widget4",
+ "name": {
+ "zh_tw": "4. 手風琴式列表 - 有下拉 ( 模組標題, 類別標題, 包含檔案 )",
+ "en": "4. Accordion list - with drop down (widget-title, category, and files)"
+ },
+ "force_cover": "true",
+ "thumbnail": "thumb.png"
}
]
}
\ No newline at end of file
diff --git a/modules/archive/thumbs/ar-tab1.png b/modules/archive/thumbs/ar-tab1.png
new file mode 100644
index 0000000..2f887da
Binary files /dev/null and b/modules/archive/thumbs/ar-tab1.png differ
diff --git a/modules/event_news/_event_news_widget1.html.erb b/modules/event_news/_event_news_widget1.html.erb
deleted file mode 100644
index 0e91227..0000000
--- a/modules/event_news/_event_news_widget1.html.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-
diff --git a/modules/event_news/_event_news_widget10.html.erb b/modules/event_news/_event_news_widget10.html.erb
deleted file mode 100644
index c0f10e9..0000000
--- a/modules/event_news/_event_news_widget10.html.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-
diff --git a/modules/event_news/_event_news_widget11.html.erb b/modules/event_news/_event_news_widget11.html.erb
deleted file mode 100644
index d5759a9..0000000
--- a/modules/event_news/_event_news_widget11.html.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-
diff --git a/modules/event_news/_event_news_widget12.html.erb b/modules/event_news/_event_news_widget12.html.erb
deleted file mode 100644
index 8d306c8..0000000
--- a/modules/event_news/_event_news_widget12.html.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-
\ No newline at end of file
diff --git a/modules/event_news/_event_news_widget13.html.erb b/modules/event_news/_event_news_widget13.html.erb
deleted file mode 100644
index 46139ee..0000000
--- a/modules/event_news/_event_news_widget13.html.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-
\ No newline at end of file
diff --git a/modules/event_news/_event_news_widget14.html.erb b/modules/event_news/_event_news_widget14.html.erb
deleted file mode 100644
index ed00755..0000000
--- a/modules/event_news/_event_news_widget14.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-
diff --git a/modules/event_news/_event_news_widget15.html.erb b/modules/event_news/_event_news_widget15.html.erb
deleted file mode 100644
index c42b0f0..0000000
--- a/modules/event_news/_event_news_widget15.html.erb
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-
diff --git a/modules/event_news/_event_news_widget16.html.erb b/modules/event_news/_event_news_widget16.html.erb
deleted file mode 100644
index 60c8544..0000000
--- a/modules/event_news/_event_news_widget16.html.erb
+++ /dev/null
@@ -1,32 +0,0 @@
-
\ No newline at end of file
diff --git a/modules/event_news/_event_news_widget17.html.erb b/modules/event_news/_event_news_widget17.html.erb
deleted file mode 100644
index 0f5f614..0000000
--- a/modules/event_news/_event_news_widget17.html.erb
+++ /dev/null
@@ -1,35 +0,0 @@
-
\ No newline at end of file
diff --git a/modules/event_news/_event_news_widget2.html.erb b/modules/event_news/_event_news_widget2.html.erb
deleted file mode 100644
index 6dc470b..0000000
--- a/modules/event_news/_event_news_widget2.html.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-
diff --git a/modules/event_news/_event_news_widget3.html.erb b/modules/event_news/_event_news_widget3.html.erb
deleted file mode 100644
index 06dd99c..0000000
--- a/modules/event_news/_event_news_widget3.html.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-
diff --git a/modules/event_news/_event_news_widget4.html.erb b/modules/event_news/_event_news_widget4.html.erb
deleted file mode 100644
index a2df522..0000000
--- a/modules/event_news/_event_news_widget4.html.erb
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
diff --git a/modules/event_news/_event_news_widget5.html.erb b/modules/event_news/_event_news_widget5.html.erb
deleted file mode 100644
index a1adecc..0000000
--- a/modules/event_news/_event_news_widget5.html.erb
+++ /dev/null
@@ -1,31 +0,0 @@
-
diff --git a/modules/event_news/_event_news_widget6.html.erb b/modules/event_news/_event_news_widget6.html.erb
deleted file mode 100644
index 47e36b3..0000000
--- a/modules/event_news/_event_news_widget6.html.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-
diff --git a/modules/event_news/_event_news_widget7.html.erb b/modules/event_news/_event_news_widget7.html.erb
deleted file mode 100644
index 6fb0d14..0000000
--- a/modules/event_news/_event_news_widget7.html.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-
diff --git a/modules/event_news/_event_news_widget8.html.erb b/modules/event_news/_event_news_widget8.html.erb
deleted file mode 100644
index c7caa5a..0000000
--- a/modules/event_news/_event_news_widget8.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-
\ No newline at end of file
diff --git a/modules/event_news/_event_news_widget9.html.erb b/modules/event_news/_event_news_widget9.html.erb
deleted file mode 100644
index fa30141..0000000
--- a/modules/event_news/_event_news_widget9.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-
\ No newline at end of file
diff --git a/modules/event_news/event_news_index1.html.erb b/modules/event_news/event_news_index1.html.erb
deleted file mode 100644
index 4ecc096..0000000
--- a/modules/event_news/event_news_index1.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
{{page-title}}
-
-
-
- {{category-head}}
- {{title-head}}
- {{date-head}}
-
-
-
-
- {{category}}
-
-
- {{status}}
-
- {{title}}
-
- {{postdate}}
-
-
-
-
-{{pagination_goes_here}}
diff --git a/modules/event_news/event_news_index10.html.erb b/modules/event_news/event_news_index10.html.erb
deleted file mode 100644
index a136a0c..0000000
--- a/modules/event_news/event_news_index10.html.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
{{page-title}}
-
-
-
-
- {{postdate}}
-
-
-
- {{status}}
-
- {{title}}
-
-
-
- {{category}}
-
-
- >
-
-{{pagination_goes_here}}
\ No newline at end of file
diff --git a/modules/event_news/event_news_index11.html.erb b/modules/event_news/event_news_index11.html.erb
deleted file mode 100644
index a719c49..0000000
--- a/modules/event_news/event_news_index11.html.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
{{page-title}}
-
-
-
-
- {{status}}
-
- {{title}}
-
-
-
- {{postdate}}
-
-
-
-
-{{pagination_goes_here}}
\ No newline at end of file
diff --git a/modules/event_news/event_news_index12.html.erb b/modules/event_news/event_news_index12.html.erb
deleted file mode 100644
index 8f742c9..0000000
--- a/modules/event_news/event_news_index12.html.erb
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
{{page-title}}
-
-
-
-
- {{postdate}}
-
-
-
- {{status}}
-
- {{title}}
-
-
-
-
-{{pagination_goes_here}}
\ No newline at end of file
diff --git a/modules/event_news/event_news_index13.html.erb b/modules/event_news/event_news_index13.html.erb
deleted file mode 100644
index 26bff2f..0000000
--- a/modules/event_news/event_news_index13.html.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
{{page-title}}
-
-
-
- {{title-head}}
- {{date-head}}
-
-
-
-
-
-
- {{status}}
-
- {{title}}
-
- {{postdate}}
-
-
-
-
-{{pagination_goes_here}}
diff --git a/modules/event_news/event_news_index14.html.erb b/modules/event_news/event_news_index14.html.erb
deleted file mode 100644
index aebed6d..0000000
--- a/modules/event_news/event_news_index14.html.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
{{page-title}}
-
-
-
- {{date-head}}
- {{title-head}}
-
-
-
-
- {{postdate}}
-
-
- {{status}}
-
- {{title}}
-
-
-
-
-
-{{pagination_goes_here}}
diff --git a/modules/event_news/event_news_index15.html.erb b/modules/event_news/event_news_index15.html.erb
deleted file mode 100644
index 0e8731b..0000000
--- a/modules/event_news/event_news_index15.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
{{page-title}}
-
-
-
- {{date-head}}
- {{title-head}}
- {{view-count-head}}
-
-
-
-
- {{postdate}}
-
-
- {{status}}
-
- {{title}}
-
- {{view_count}}
-
-
-
-
-{{pagination_goes_here}}
diff --git a/modules/event_news/event_news_index16.html.erb b/modules/event_news/event_news_index16.html.erb
deleted file mode 100644
index 6110b5b..0000000
--- a/modules/event_news/event_news_index16.html.erb
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
{{page-title}}
-
-
-
- {{date-head}}
- {{title-head}}
- {{link-head}}
- {{file-head}}
-
-
-
-
- {{postdate}}
-
-
- {{status}}
-
- {{title}}
-
-
-
-
-
-
-
-
-
-
-
-{{pagination_goes_here}}
diff --git a/modules/event_news/event_news_index17.html.erb b/modules/event_news/event_news_index17.html.erb
deleted file mode 100644
index 000fe72..0000000
--- a/modules/event_news/event_news_index17.html.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
{{page-title}}
-
-
-
- {{category-head}}
- {{title-head}}
- {{date-head}}
- {{department-head}}
-
-
-
-
- {{category}}
-
-
- {{status}}
-
- {{title}}
-
- {{postdate}}
- {{department}}
-
-
-
-
-{{pagination_goes_here}}
diff --git a/modules/event_news/event_news_index18.html.erb b/modules/event_news/event_news_index18.html.erb
deleted file mode 100644
index 15b8dd9..0000000
--- a/modules/event_news/event_news_index18.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
{{page-title}}
-
-
-
- {{event_date-head}}
- {{speaker-head}}
- {{title-head}}
- {{host-head}}
- {{notes-head}}
-
-
-
-
- {{postdate}}
- {{speaker}}
-
-
- {{status}}
-
- {{title}}
-
- {{host}}
- {{notes}}
-
-
-
-
-{{pagination_goes_here}}
diff --git a/modules/event_news/event_news_index2.html.erb b/modules/event_news/event_news_index2.html.erb
deleted file mode 100644
index 16eea90..0000000
--- a/modules/event_news/event_news_index2.html.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
{{page-title}}
-
-
-
- {{category-head}}
- {{title-head}}
- {{date-head}}
- {{view-count-head}}
-
-
-
-
- {{category}}
-
-
- {{status}}
-
- {{title}}
-
- {{postdate}}
- {{view_count}}
-
-
-
-
-{{pagination_goes_here}}
\ No newline at end of file
diff --git a/modules/event_news/event_news_index3.html.erb b/modules/event_news/event_news_index3.html.erb
deleted file mode 100644
index 261e059..0000000
--- a/modules/event_news/event_news_index3.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
{{page-title}}
-
-
-
- {{date-head}}
- {{title-head}}
- {{category-head}}
-
-
-
-
- {{postdate}}
-
-
- {{status}}
-
- {{title}}
-
- {{category}}
-
-
-
-
-{{pagination_goes_here}}
\ No newline at end of file
diff --git a/modules/event_news/event_news_index4.html.erb b/modules/event_news/event_news_index4.html.erb
deleted file mode 100644
index a62e2b7..0000000
--- a/modules/event_news/event_news_index4.html.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
{{page-title}}
-
-
-
- {{date-head}}
- {{title-head}}
- {{category-head}}
- {{view-count-head}}
-
-
-
-
- {{postdate}}
-
-
- {{status}}
-
- {{title}}
-
- {{category}}
- {{view_count}}
-
-
-
-
-{{pagination_goes_here}}
\ No newline at end of file
diff --git a/modules/event_news/event_news_index5.html.erb b/modules/event_news/event_news_index5.html.erb
deleted file mode 100644
index dd00dcb..0000000
--- a/modules/event_news/event_news_index5.html.erb
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
{{page-title}}
-
-
-
-
-
-
-
-
- {{status}}
-
-
-
- {{postdate}}
-
-
-
- {{category}}
-
-
-
- {{title}}
-
-
{{subtitle}}
-
-
-
-
-{{pagination_goes_here}}
diff --git a/modules/event_news/event_news_index6.html.erb b/modules/event_news/event_news_index6.html.erb
deleted file mode 100644
index f64483f..0000000
--- a/modules/event_news/event_news_index6.html.erb
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
{{page-title}}
-
-
-
-
-
- {{status}}
-
-
-
- {{postdate}}
-
-
-
- {{category}}
-
-
-
- {{title}}
-
-
{{subtitle}}
-
-
-
-
-
-
-
-{{pagination_goes_here}}
\ No newline at end of file
diff --git a/modules/event_news/event_news_index7.html.erb b/modules/event_news/event_news_index7.html.erb
deleted file mode 100644
index c7c060f..0000000
--- a/modules/event_news/event_news_index7.html.erb
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
{{page-title}}
-
-
-
-
-
-
-
-
- {{status}}
-
-
-
- {{postdate}}
-
-
-
- {{category}}
-
-
-
- {{title}}
-
-
{{subtitle}}
-
-
-
-
-{{pagination_goes_here}}
-
diff --git a/modules/event_news/event_news_index8.html.erb b/modules/event_news/event_news_index8.html.erb
deleted file mode 100644
index be56990..0000000
--- a/modules/event_news/event_news_index8.html.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
{{page-title}}
-
-
-
-
-
-
- {{postdate}}
-
-
-
- {{category}}
-
-
- {{status}}
-
-
-
- {{title}}
-
-
{{subtitle}}
-
-
-
-{{pagination_goes_here}}
\ No newline at end of file
diff --git a/modules/event_news/event_news_index9.html.erb b/modules/event_news/event_news_index9.html.erb
deleted file mode 100644
index 297a7e3..0000000
--- a/modules/event_news/event_news_index9.html.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
{{page-title}}
-
-
-
-
- {{category}}
-
-
-
- {{status}}
-
- {{title}}
-
-
-
- {{postdate}}
-
-
-
-
-{{pagination_goes_here}}
\ No newline at end of file
diff --git a/modules/event_news/info.json b/modules/event_news/info.json
deleted file mode 100644
index f8aa754..0000000
--- a/modules/event_news/info.json
+++ /dev/null
@@ -1,311 +0,0 @@
-{
- "frontend": [
- {
- "filename" : "event_news_index1",
- "name" : {
- "zh_tw" : "1. 標準標題列表-1A ( 模組標題, 類別, 狀態, 標題, 日期 )",
- "en" : "1. Standard Title List-1 (widget-title, category, status, title, postdate)"
- },
- "thumbnail" : "event_news_index1_thumbs.png"
- },
- {
- "filename" : "event_news_index2",
- "name" : {
- "zh_tw" : "2. 標準標題列表-1B ( 模組標題, 類別, 狀態, 標題, 日期, 瀏覽人次 )",
- "en" : "2. Standard Title List-1B (widget-title, category, status, title, postdate, view-count)"
- },
- "thumbnail" : "event_news_index2_thumbs.png"
- },
- {
- "filename" : "event_news_index3",
- "name" : {
- "zh_tw" : "3. 標準表格列表-2A ( 模組標題, 日期, 狀態, 標題, 類別 )",
- "en" : "3. Standard Table List-2 (widget-title, postdate, status, title, category)"
- },
- "thumbnail" : "event_news_index3_thumbs.png"
- },
- {
- "filename" : "event_news_index4",
- "name" : {
- "zh_tw" : "4. 標準表格列表-2B ( 模組標題, 日期, 狀態, 標題, 類別, 瀏覽人次 )",
- "en" : "4. Standard Table List-2 (widget-title, postdate, status, title, category, view-count)"
- },
- "thumbnail" : "event_news_index4_thumbs.png"
- },
- {
- "filename" : "event_news_index5",
- "name" : {
- "zh_tw" : "5. 左圖右文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
- "en" : "5. Balanced Image + Text(Left) (widget-title, image, status, postdate, category, title, subtitle)"
- },
- "thumbnail" : "event_news_index5_thumbs.png"
- },
- {
- "filename" : "event_news_index6",
- "name" : {
- "zh_tw" : "6. 右圖左文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
- "en" : "6. Balanced Image + Text(Right) (widget-title, image, status, postdate, category, title, subtitle)"
- },
- "thumbnail" : "event_news_index6_thumbs.png"
- },
- {
- "filename" : "event_news_index7",
- "name" : {
- "zh_tw" : "7. 三欄圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
- "en" : "7. 3-Column Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)"
- },
- "thumbnail" : "event_news_index7_thumbs.png"
- },
- {
- "filename" : "event_news_index8",
- "name" : {
- "zh_tw" : "8. 標準文字列表 ( 模組標題, 日期, 類別, 狀態, 標題, 副標題 )",
- "en" : "8. Standard Text List (widget-title, postdate, category, status, title, subtitle)"
- },
- "thumbnail" : "event_news_index8_thumbs.png"
- },
- {
- "filename" : "event_news_index9",
- "name" : {
- "zh_tw" : "9. 標準標題列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )",
- "en" : "9. Standard Title List-1 (widget-title, category, status, title, postdate)"
- },
- "thumbnail" : "event_news_index9_thumbs.png"
- },
- {
- "filename" : "event_news_index10",
- "name" : {
- "zh_tw" : "10. 標準標題列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )",
- "en" : "10. Standard Title List-2 (widget-title, postdate, status, title, category)"
- },
- "thumbnail" : "event_news_index10_thumbs.png"
- },
- {
- "filename" : "event_news_index11",
- "name" : {
- "zh_tw" : "11. 精簡標題列表-1 ( 模組標題, 狀態, 標題, 日期 )",
- "en" : "11. Simple Title List-1 (widget-title, status, title, postdate)"
- },
- "thumbnail" : "event_news_index11_thumbs.png"
- },
- {
- "filename" : "event_news_index12",
- "name" : {
- "zh_tw" : "12. 精簡標題列表-2 ( 模組標題, 日期, 狀態, 標題 )",
- "en" : "12. Simple Title List-2 (widget-title, postdate, status, title)"
- },
- "thumbnail" : "event_news_index12_thumbs.png"
- },
- {
- "filename" : "event_news_index13",
- "name" : {
- "zh_tw" : "13. 精簡表格列表-1 ( 模組標題, 狀態, 標題, 日期 )",
- "en" : "13. Simple Table List (widget-title, status, title, postdate)"
- },
- "thumbnail" : "event_news_index13_thumbs.png"
- },
- {
- "filename" : "event_news_index14",
- "name" : {
- "zh_tw" : "14. 精簡表格列表-2 ( 模組標題, 日期, 狀態, 標題 )",
- "en" : "14. Simple Table List (widget-title, postdate, status, title)"
- },
- "thumbnail" : "event_news_index14_thumbs.png"
- },
- {
- "filename" : "event_news_index15",
- "name" : {
- "zh_tw" : "15. 精簡表格列表-3 ( 模組標題, 日期, 狀態, 標題, 瀏覽人次 )",
- "en" : "15. Simple Table List (widget-title, postdate, status, title, view-count)"
- },
- "thumbnail" : "event_news_index15_thumbs.png"
- },
- {
- "filename" : "event_news_index16",
- "name" : {
- "zh_tw" : "16. 連結 + 附件表格列表 ( 模組標題, 類別, 狀態, 標題 )",
- "en" : "16. Table List including Links and attachments (widget-title, category, status, title, view-count)"
- },
- "thumbnail" : "event_news_index16_thumbs.png"
- },
- {
- "filename" : "event_news_index17",
- "name" : {
- "zh_tw" : "17. 標準標題列表-1A ( 類別, 標題, 日期, 張貼人 )",
- "en" : "17. Standard Title List-1 ( category, title, postdate, department)"
- },
- "thumbnail" : "event_news_index1_thumbs.png"
- },
- {
- "filename" : "event_news_index18",
- "name" : {
- "zh_tw" : "18. 標準標題列表-2 ( 日期, 演講者, 狀態, 標題, 主持人, 備註 )",
- "en" : "18. Standard Title List-2 ( EventDate, speaker, status, title, host, notes)"
- },
- "thumbnail" : "event_news_index1_thumbs.png"
- }
- ],
- "widgets" : [
-
- {
- "filename" : "event_news_widget0",
- "name" : {
- "zh_tw" : "0. 標準四欄圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
- "en" : "0. Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)"
- },
- "thumbnail" : "event_news_widget1_thumbs.png"
- },
- {
- "filename" : "event_news_widget0.5",
- "name" : {
- "zh_tw" : "0.5. 首頁行事曆樣式",
- "en" : "0.5. Home calendar"
- },
- "thumbnail" : "event_news_widget1_thumbs.png"
- },
- {
- "filename" : "event_news_widget0.5_new",
- "name" : {
- "zh_tw" : "0.5. 首頁行事曆樣式(新版)",
- "en" : "0.5. Home calendar(New)"
- },
- "thumbnail" : "event_news_widget1_thumbs.png"
- },
- {
- "filename" : "event_news_widget1",
- "name" : {
- "zh_tw" : "1. 標準圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
- "en" : "1. Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)"
- },
- "thumbnail" : "event_news_widget1_thumbs.png"
- },
- {
- "filename" : "event_news_widget2",
- "name" : {
- "zh_tw" : "2. 左圖右文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
- "en" : "2. Balanced Image + Text(Left) (widget-title, image, status, postdate, category, title, subtitle)"
- },
- "thumbnail" : "event_news_widget2_thumbs.png"
- },
- {
- "filename" : "event_news_widget3",
- "name" : {
- "zh_tw" : "3. 右圖左文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
- "en" : "3. Balanced Image + Text(Right) (widget-title, image, status, postdate, category, title, subtitle)"
- },
- "thumbnail" : "event_news_widget3_thumbs.png"
- },
- {
- "filename" : "event_news_widget4",
- "name" : {
- "zh_tw" : "4. 三欄圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
- "en" : "4. 3-Column Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)"
- },
- "thumbnail" : "event_news_widget4_thumbs.png"
- },
- {
- "filename" : "event_news_widget15",
- "name" : {
- "zh_tw" : "4.5. 三欄圖文-slide ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
- "en" : "4.5. 3-Column Standard Image + Text -slide(widget-title, image, status, postdate, category, title, subtitle)"
- },
- "thumbnail" : "event_news_widget4_thumbs.png"
- },
- {
- "filename" : "event_news_widget5",
- "name" : {
- "zh_tw" : "5. 標準文字列表 ( 模組標題, 日期, 類別, 狀態, 標題, 副標題 )",
- "en" : "5. Standard Text List (widget-title, postdate, category, status, title, subtitle)"
- },
- "thumbnail" : "event_news_widget5_thumbs.png"
- },
- {
- "filename" : "event_news_widget6",
- "name" : {
- "zh_tw" : "6. 標準標題列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )",
- "en" : "6. Standard Title List-1 (widget-title, category, status, title, postdate)"
- },
- "thumbnail" : "event_news_widget6_thumbs.png"
- },
- {
- "filename" : "event_news_widget7",
- "name" : {
- "zh_tw" : "7. 標準標題列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )",
- "en" : "7. Standard Title List-2 (widget-title, postdate, status, title, category)"
- },
- "thumbnail" : "event_news_widget7_thumbs.png"
- },
- {
- "filename" : "event_news_widget8",
- "name" : {
- "zh_tw" : "8. 標準表格列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )",
- "en" : "8. Standard Table List-1 (widget-title, category, status, title, postdate)"
- },
- "thumbnail" : "event_news_widget8_thumbs.png"
- },
- {
- "filename" : "event_news_widget9",
- "name" : {
- "zh_tw" : "9. 標準表格列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )",
- "en" : "9. Standard Table List-2 (widget-title, postdate, status, title, category)"
- },
- "thumbnail" : "event_news_widget9_thumbs.png"
- },
- {
- "filename" : "event_news_widget10",
- "name" : {
- "zh_tw" : "10. 精簡標題列表-1 ( 模組標題, 狀態, 標題, 日期 )",
- "en" : "10. Simple Title List-1 (widget-title, status, title, postdate)"
- },
- "thumbnail" : "event_news_widget10_thumbs.png"
- },
- {
- "filename" : "event_news_widget11",
- "name" : {
- "zh_tw" : "11. 精簡標題列表-2 ( 模組標題, 日期, 狀態, 標題 )",
- "en" : "11. Simple Title List-2 (widget-title, postdate, status, title)"
- },
- "thumbnail" : "event_news_widget11_thumbs.png"
- },
- {
- "filename" : "event_news_widget12",
- "name" : {
- "zh_tw" : "12. 精簡表格列表-1 ( 模組標題, 狀態, 標題, 日期 )",
- "en" : "12. Simple Table List (widget-title, status, title, postdate)"
- },
- "thumbnail" : "event_news_widget12_thumbs.png"
- },
- {
- "filename" : "event_news_widget13",
- "name" : {
- "zh_tw" : "13. 精簡表格列表-2 ( 模組標題, 日期, 狀態, 標題 )",
- "en" : "13. Simple Table List (widget-title, postdate, status, title)"
- },
- "thumbnail" : "event_news_widget13_thumbs.png"
- },
- {
- "filename" : "event_news_widget14",
- "name" : {
- "zh_tw" : "14. 一圖 + 標題列表 ( 模組標題, 圖片, 狀態, 標題, 日期 )",
- "en" : "14. 1 Image + Title List (widget-title, image, status, title, postdate)"
- },
- "thumbnail" : "event_news_widget14_thumbs.png"
- },
- {
- "filename" : "event_news_widget16",
- "name" : {
- "zh_tw" : "15. 標準表格列表-3 ( 日期, 演講者, 狀態, 標題, 主持人, 備註 )",
- "en" : "15. Standard Table List (EventDate, speaker, status, title, host, notes)"
- },
- "thumbnail" : "event_news_widget13_thumbs.png"
- },
- {
- "filename" : "event_news_widget17",
- "name" : {
- "zh_tw" : "16. 標準表格列表-3 ( 日期, 狀態, 標題, 演講者, 主持人, 備註 )",
- "en" : "16. Standard Table List (EventDate, status, title, speaker, host, notes)"
- },
- "thumbnail" : "event_news_widget13_thumbs.png"
- }
- ]
-}
diff --git a/modules/event_news/show.html.erb b/modules/event_news/show.html.erb
deleted file mode 100644
index 9847736..0000000
--- a/modules/event_news/show.html.erb
+++ /dev/null
@@ -1,374 +0,0 @@
-
-
-
- {{title}}
-
-
-
-
-
-
-
{{img_description}}
-
- {{subtitle_ann}}
- {{body}}
-
-
-
-
-
-
-
-
-
-
1 /{{carousel_count}}
-
-
-
-
-
-
-
-
-
-
-{{link_to_edit}}
-
\ No newline at end of file
diff --git a/modules/event_news/_event_news_widget0.5.html.erb b/modules/event_news_mod/_event_news_widget0.5.html.erb
similarity index 100%
rename from modules/event_news/_event_news_widget0.5.html.erb
rename to modules/event_news_mod/_event_news_widget0.5.html.erb
diff --git a/modules/event_news/_event_news_widget0.5_new.html.erb b/modules/event_news_mod/_event_news_widget0.5_new.html.erb
similarity index 100%
rename from modules/event_news/_event_news_widget0.5_new.html.erb
rename to modules/event_news_mod/_event_news_widget0.5_new.html.erb
diff --git a/modules/event_news/_event_news_widget0.html.erb b/modules/event_news_mod/_event_news_widget0.html.erb
similarity index 97%
rename from modules/event_news/_event_news_widget0.html.erb
rename to modules/event_news_mod/_event_news_widget0.html.erb
index e74d84d..a599542 100644
--- a/modules/event_news/_event_news_widget0.html.erb
+++ b/modules/event_news_mod/_event_news_widget0.html.erb
@@ -1,35 +1,35 @@
-
+
diff --git a/modules/event_news_mod/_event_news_widget1.html.erb b/modules/event_news_mod/_event_news_widget1.html.erb
new file mode 100644
index 0000000..19f537d
--- /dev/null
+++ b/modules/event_news_mod/_event_news_widget1.html.erb
@@ -0,0 +1,34 @@
+
diff --git a/modules/event_news_mod/_event_news_widget10.html.erb b/modules/event_news_mod/_event_news_widget10.html.erb
new file mode 100644
index 0000000..299f837
--- /dev/null
+++ b/modules/event_news_mod/_event_news_widget10.html.erb
@@ -0,0 +1,22 @@
+
diff --git a/modules/event_news_mod/_event_news_widget11.html.erb b/modules/event_news_mod/_event_news_widget11.html.erb
new file mode 100644
index 0000000..6a528dc
--- /dev/null
+++ b/modules/event_news_mod/_event_news_widget11.html.erb
@@ -0,0 +1,22 @@
+
diff --git a/modules/event_news_mod/_event_news_widget12.html.erb b/modules/event_news_mod/_event_news_widget12.html.erb
new file mode 100644
index 0000000..898aba0
--- /dev/null
+++ b/modules/event_news_mod/_event_news_widget12.html.erb
@@ -0,0 +1,27 @@
+
\ No newline at end of file
diff --git a/modules/event_news_mod/_event_news_widget13.html.erb b/modules/event_news_mod/_event_news_widget13.html.erb
new file mode 100644
index 0000000..f3f71e9
--- /dev/null
+++ b/modules/event_news_mod/_event_news_widget13.html.erb
@@ -0,0 +1,27 @@
+
\ No newline at end of file
diff --git a/modules/event_news_mod/_event_news_widget14.html.erb b/modules/event_news_mod/_event_news_widget14.html.erb
new file mode 100644
index 0000000..c6f4915
--- /dev/null
+++ b/modules/event_news_mod/_event_news_widget14.html.erb
@@ -0,0 +1,29 @@
+
diff --git a/modules/event_news_mod/_event_news_widget15.html.erb b/modules/event_news_mod/_event_news_widget15.html.erb
new file mode 100644
index 0000000..10d844c
--- /dev/null
+++ b/modules/event_news_mod/_event_news_widget15.html.erb
@@ -0,0 +1,169 @@
+
+
+
diff --git a/modules/event_news_mod/_event_news_widget16.html.erb b/modules/event_news_mod/_event_news_widget16.html.erb
new file mode 100644
index 0000000..a77dcc2
--- /dev/null
+++ b/modules/event_news_mod/_event_news_widget16.html.erb
@@ -0,0 +1,32 @@
+
\ No newline at end of file
diff --git a/modules/event_news_mod/_event_news_widget17.html.erb b/modules/event_news_mod/_event_news_widget17.html.erb
new file mode 100644
index 0000000..5cc9396
--- /dev/null
+++ b/modules/event_news_mod/_event_news_widget17.html.erb
@@ -0,0 +1,27 @@
+
\ No newline at end of file
diff --git a/modules/event_news_mod/_event_news_widget18.html.erb b/modules/event_news_mod/_event_news_widget18.html.erb
new file mode 100644
index 0000000..e3ad478
--- /dev/null
+++ b/modules/event_news_mod/_event_news_widget18.html.erb
@@ -0,0 +1,83 @@
+
+<%= stylesheet_link_tag "event_news_calendar_widget2" %>
+
\ No newline at end of file
diff --git a/modules/event_news_mod/_event_news_widget2.html.erb b/modules/event_news_mod/_event_news_widget2.html.erb
new file mode 100644
index 0000000..3ed6325
--- /dev/null
+++ b/modules/event_news_mod/_event_news_widget2.html.erb
@@ -0,0 +1,34 @@
+
diff --git a/modules/event_news_mod/_event_news_widget3.html.erb b/modules/event_news_mod/_event_news_widget3.html.erb
new file mode 100644
index 0000000..f450570
--- /dev/null
+++ b/modules/event_news_mod/_event_news_widget3.html.erb
@@ -0,0 +1,34 @@
+
diff --git a/modules/event_news_mod/_event_news_widget4.html.erb b/modules/event_news_mod/_event_news_widget4.html.erb
new file mode 100644
index 0000000..a8c8259
--- /dev/null
+++ b/modules/event_news_mod/_event_news_widget4.html.erb
@@ -0,0 +1,108 @@
+
+
+
diff --git a/modules/event_news_mod/_event_news_widget5.html.erb b/modules/event_news_mod/_event_news_widget5.html.erb
new file mode 100644
index 0000000..d6a8009
--- /dev/null
+++ b/modules/event_news_mod/_event_news_widget5.html.erb
@@ -0,0 +1,31 @@
+
diff --git a/modules/event_news_mod/_event_news_widget6.html.erb b/modules/event_news_mod/_event_news_widget6.html.erb
new file mode 100644
index 0000000..a8a9de2
--- /dev/null
+++ b/modules/event_news_mod/_event_news_widget6.html.erb
@@ -0,0 +1,26 @@
+
diff --git a/modules/event_news_mod/_event_news_widget7.html.erb b/modules/event_news_mod/_event_news_widget7.html.erb
new file mode 100644
index 0000000..4512d2a
--- /dev/null
+++ b/modules/event_news_mod/_event_news_widget7.html.erb
@@ -0,0 +1,26 @@
+
diff --git a/modules/event_news_mod/_event_news_widget8.html.erb b/modules/event_news_mod/_event_news_widget8.html.erb
new file mode 100644
index 0000000..ed06f25
--- /dev/null
+++ b/modules/event_news_mod/_event_news_widget8.html.erb
@@ -0,0 +1,29 @@
+
\ No newline at end of file
diff --git a/modules/event_news_mod/_event_news_widget9.html.erb b/modules/event_news_mod/_event_news_widget9.html.erb
new file mode 100644
index 0000000..4f70d2f
--- /dev/null
+++ b/modules/event_news_mod/_event_news_widget9.html.erb
@@ -0,0 +1,29 @@
+
\ No newline at end of file
diff --git a/modules/event_news_mod/event_news_index1.html.erb b/modules/event_news_mod/event_news_index1.html.erb
new file mode 100644
index 0000000..fdc2eda
--- /dev/null
+++ b/modules/event_news_mod/event_news_index1.html.erb
@@ -0,0 +1,25 @@
+
+
{{page-title}}
+
+
+
+ {{category-head}}
+ {{title-head}}
+ {{date-head}}
+
+
+
+
+ {{category}}
+
+
+ {{status}}
+
+ {{title}}
+
+ {{postdate}}
+
+
+
+
+{{pagination_goes_here}}
diff --git a/modules/event_news_mod/event_news_index10.html.erb b/modules/event_news_mod/event_news_index10.html.erb
new file mode 100644
index 0000000..8f7c10c
--- /dev/null
+++ b/modules/event_news_mod/event_news_index10.html.erb
@@ -0,0 +1,22 @@
+
+
{{page-title}}
+
+
+
+
+ {{postdate}}
+
+
+
+ {{status}}
+
+ {{title}}
+
+
+
+ {{category}}
+
+
+ >
+
+{{pagination_goes_here}}
\ No newline at end of file
diff --git a/modules/event_news_mod/event_news_index11.html.erb b/modules/event_news_mod/event_news_index11.html.erb
new file mode 100644
index 0000000..ebb47de
--- /dev/null
+++ b/modules/event_news_mod/event_news_index11.html.erb
@@ -0,0 +1,18 @@
+
+
{{page-title}}
+
+
+
+
+ {{status}}
+
+ {{title}}
+
+
+
+ {{postdate}}
+
+
+
+
+{{pagination_goes_here}}
\ No newline at end of file
diff --git a/modules/event_news_mod/event_news_index12.html.erb b/modules/event_news_mod/event_news_index12.html.erb
new file mode 100644
index 0000000..019d989
--- /dev/null
+++ b/modules/event_news_mod/event_news_index12.html.erb
@@ -0,0 +1,18 @@
+
+
{{page-title}}
+
+
+
+
+ {{postdate}}
+
+
+
+ {{status}}
+
+ {{title}}
+
+
+
+
+{{pagination_goes_here}}
\ No newline at end of file
diff --git a/modules/event_news_mod/event_news_index13.html.erb b/modules/event_news_mod/event_news_index13.html.erb
new file mode 100644
index 0000000..1c14577
--- /dev/null
+++ b/modules/event_news_mod/event_news_index13.html.erb
@@ -0,0 +1,23 @@
+
+
{{page-title}}
+
+
+
+ {{title-head}}
+ {{date-head}}
+
+
+
+
+
+
+ {{status}}
+
+ {{title}}
+
+ {{postdate}}
+
+
+
+
+{{pagination_goes_here}}
diff --git a/modules/event_news_mod/event_news_index14.html.erb b/modules/event_news_mod/event_news_index14.html.erb
new file mode 100644
index 0000000..3b97617
--- /dev/null
+++ b/modules/event_news_mod/event_news_index14.html.erb
@@ -0,0 +1,23 @@
+
+
{{page-title}}
+
+
+
+ {{date-head}}
+ {{title-head}}
+
+
+
+
+ {{postdate}}
+
+
+ {{status}}
+
+ {{title}}
+
+
+
+
+
+{{pagination_goes_here}}
diff --git a/modules/event_news_mod/event_news_index15.html.erb b/modules/event_news_mod/event_news_index15.html.erb
new file mode 100644
index 0000000..00a2019
--- /dev/null
+++ b/modules/event_news_mod/event_news_index15.html.erb
@@ -0,0 +1,25 @@
+
+
{{page-title}}
+
+
+
+ {{date-head}}
+ {{title-head}}
+ {{view-count-head}}
+
+
+
+
+ {{postdate}}
+
+
+ {{status}}
+
+ {{title}}
+
+ {{view_count}}
+
+
+
+
+{{pagination_goes_here}}
diff --git a/modules/event_news_mod/event_news_index16.html.erb b/modules/event_news_mod/event_news_index16.html.erb
new file mode 100644
index 0000000..ee4839b
--- /dev/null
+++ b/modules/event_news_mod/event_news_index16.html.erb
@@ -0,0 +1,39 @@
+
+
{{page-title}}
+
+
+
+ {{date-head}}
+ {{title-head}}
+ {{link-head}}
+ {{file-head}}
+
+
+
+
+ {{postdate}}
+
+
+ {{status}}
+
+ {{title}}
+
+
+
+
+
+
+
+
+
+
+
+{{pagination_goes_here}}
diff --git a/modules/event_news_mod/event_news_index17.html.erb b/modules/event_news_mod/event_news_index17.html.erb
new file mode 100644
index 0000000..b1c9629
--- /dev/null
+++ b/modules/event_news_mod/event_news_index17.html.erb
@@ -0,0 +1,27 @@
+
+
{{page-title}}
+
+
+
+ {{category-head}}
+ {{title-head}}
+ {{date-head}}
+ {{department-head}}
+
+
+
+
+ {{category}}
+
+
+ {{status}}
+
+ {{title}}
+
+ {{postdate}}
+ {{department}}
+
+
+
+
+{{pagination_goes_here}}
diff --git a/modules/event_news_mod/event_news_index18.html.erb b/modules/event_news_mod/event_news_index18.html.erb
new file mode 100644
index 0000000..55e6efe
--- /dev/null
+++ b/modules/event_news_mod/event_news_index18.html.erb
@@ -0,0 +1,29 @@
+
+
{{page-title}}
+
+
+
+ {{event_date-head}}
+ {{speaker-head}}
+ {{title-head}}
+ {{host-head}}
+ {{notes-head}}
+
+
+
+
+ {{postdate}}
+ {{speaker}}
+
+
+ {{status}}
+
+ {{title}}
+
+ {{host}}
+ {{notes}}
+
+
+
+
+{{pagination_goes_here}}
diff --git a/modules/event_news_mod/event_news_index2.html.erb b/modules/event_news_mod/event_news_index2.html.erb
new file mode 100644
index 0000000..d3862df
--- /dev/null
+++ b/modules/event_news_mod/event_news_index2.html.erb
@@ -0,0 +1,27 @@
+
+
{{page-title}}
+
+
+
+ {{category-head}}
+ {{title-head}}
+ {{date-head}}
+ {{view-count-head}}
+
+
+
+
+ {{category}}
+
+
+ {{status}}
+
+ {{title}}
+
+ {{postdate}}
+ {{view_count}}
+
+
+
+
+{{pagination_goes_here}}
\ No newline at end of file
diff --git a/modules/event_news_mod/event_news_index3.html.erb b/modules/event_news_mod/event_news_index3.html.erb
new file mode 100644
index 0000000..333a8ab
--- /dev/null
+++ b/modules/event_news_mod/event_news_index3.html.erb
@@ -0,0 +1,25 @@
+
+
{{page-title}}
+
+
+
+ {{date-head}}
+ {{title-head}}
+ {{category-head}}
+
+
+
+
+ {{postdate}}
+
+
+ {{status}}
+
+ {{title}}
+
+ {{category}}
+
+
+
+
+{{pagination_goes_here}}
\ No newline at end of file
diff --git a/modules/event_news_mod/event_news_index4.html.erb b/modules/event_news_mod/event_news_index4.html.erb
new file mode 100644
index 0000000..74c6a4a
--- /dev/null
+++ b/modules/event_news_mod/event_news_index4.html.erb
@@ -0,0 +1,27 @@
+
+
{{page-title}}
+
+
+
+ {{date-head}}
+ {{title-head}}
+ {{category-head}}
+ {{view-count-head}}
+
+
+
+
+ {{postdate}}
+
+
+ {{status}}
+
+ {{title}}
+
+ {{category}}
+ {{view_count}}
+
+
+
+
+{{pagination_goes_here}}
\ No newline at end of file
diff --git a/modules/event_news_mod/event_news_index5.html.erb b/modules/event_news_mod/event_news_index5.html.erb
new file mode 100644
index 0000000..c12769e
--- /dev/null
+++ b/modules/event_news_mod/event_news_index5.html.erb
@@ -0,0 +1,30 @@
+
+
{{page-title}}
+
+
+
+
+
+
+
+
+ {{status}}
+
+
+
+ {{postdate}}
+
+
+
+ {{category}}
+
+
+
+ {{title}}
+
+
{{subtitle}}
+
+
+
+
+{{pagination_goes_here}}
diff --git a/modules/event_news_mod/event_news_index6.html.erb b/modules/event_news_mod/event_news_index6.html.erb
new file mode 100644
index 0000000..e73aa5a
--- /dev/null
+++ b/modules/event_news_mod/event_news_index6.html.erb
@@ -0,0 +1,30 @@
+
+
{{page-title}}
+
+
+
+
+
+ {{status}}
+
+
+
+ {{postdate}}
+
+
+
+ {{category}}
+
+
+
+ {{title}}
+
+
{{subtitle}}
+
+
+
+
+
+
+
+{{pagination_goes_here}}
\ No newline at end of file
diff --git a/modules/event_news_mod/event_news_index7.html.erb b/modules/event_news_mod/event_news_index7.html.erb
new file mode 100644
index 0000000..69cd4ff
--- /dev/null
+++ b/modules/event_news_mod/event_news_index7.html.erb
@@ -0,0 +1,83 @@
+
+
{{page-title}}
+
+
+
+
+
+
+
+
+ {{status}}
+
+
+
+ {{postdate}}
+
+
+
+ {{category}}
+
+
+
+ {{title}}
+
+
{{subtitle}}
+
+
+
+
+{{pagination_goes_here}}
+
diff --git a/modules/event_news_mod/event_news_index8.html.erb b/modules/event_news_mod/event_news_index8.html.erb
new file mode 100644
index 0000000..266ad01
--- /dev/null
+++ b/modules/event_news_mod/event_news_index8.html.erb
@@ -0,0 +1,26 @@
+
+
{{page-title}}
+
+
+
+
+
+
+ {{postdate}}
+
+
+
+ {{category}}
+
+
+ {{status}}
+
+
+
+ {{title}}
+
+
{{subtitle}}
+
+
+
+{{pagination_goes_here}}
\ No newline at end of file
diff --git a/modules/event_news_mod/event_news_index9.html.erb b/modules/event_news_mod/event_news_index9.html.erb
new file mode 100644
index 0000000..f773b49
--- /dev/null
+++ b/modules/event_news_mod/event_news_index9.html.erb
@@ -0,0 +1,22 @@
+
+
{{page-title}}
+
+
+
+
+ {{category}}
+
+
+
+ {{status}}
+
+ {{title}}
+
+
+
+ {{postdate}}
+
+
+
+
+{{pagination_goes_here}}
\ No newline at end of file
diff --git a/modules/event_news_mod/info.json b/modules/event_news_mod/info.json
new file mode 100644
index 0000000..4e9f231
--- /dev/null
+++ b/modules/event_news_mod/info.json
@@ -0,0 +1,294 @@
+{
+ "frontend": [
+ {
+ "filename": "event_news_index1",
+ "name": {
+ "zh_tw": "1. 標準標題列表-1A ( 模組標題, 類別, 狀態, 標題, 日期 )",
+ "en": "1. Standard Title List-1 (widget-title, category, status, title, postdate)"
+ },
+ "thumbnail": "event_news_index1_thumbs.png"
+ },
+ {
+ "filename": "event_news_index2",
+ "name": {
+ "zh_tw": "2. 標準標題列表-1B ( 模組標題, 類別, 狀態, 標題, 日期, 瀏覽人次 )",
+ "en": "2. Standard Title List-1B (widget-title, category, status, title, postdate, view-count)"
+ },
+ "thumbnail": "event_news_index2_thumbs.png"
+ },
+ {
+ "filename": "event_news_index3",
+ "name": {
+ "zh_tw": "3. 標準表格列表-2A ( 模組標題, 日期, 狀態, 標題, 類別 )",
+ "en": "3. Standard Table List-2 (widget-title, postdate, status, title, category)"
+ },
+ "thumbnail": "event_news_index3_thumbs.png"
+ },
+ {
+ "filename": "event_news_index4",
+ "name": {
+ "zh_tw": "4. 標準表格列表-2B ( 模組標題, 日期, 狀態, 標題, 類別, 瀏覽人次 )",
+ "en": "4. Standard Table List-2 (widget-title, postdate, status, title, category, view-count)"
+ },
+ "thumbnail": "event_news_index4_thumbs.png"
+ },
+ {
+ "filename": "event_news_index5",
+ "name": {
+ "zh_tw": "5. 左圖右文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
+ "en": "5. Balanced Image + Text(Left) (widget-title, image, status, postdate, category, title, subtitle)"
+ },
+ "thumbnail": "event_news_index5_thumbs.png"
+ },
+ {
+ "filename": "event_news_index6",
+ "name": {
+ "zh_tw": "6. 右圖左文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
+ "en": "6. Balanced Image + Text(Right) (widget-title, image, status, postdate, category, title, subtitle)"
+ },
+ "thumbnail": "event_news_index6_thumbs.png"
+ },
+ {
+ "filename": "event_news_index7",
+ "name": {
+ "zh_tw": "7. 三欄圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
+ "en": "7. 3-Column Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)"
+ },
+ "thumbnail": "event_news_index7_thumbs.png"
+ },
+ {
+ "filename": "event_news_index8",
+ "name": {
+ "zh_tw": "8. 標準文字列表 ( 模組標題, 日期, 類別, 狀態, 標題, 副標題 )",
+ "en": "8. Standard Text List (widget-title, postdate, category, status, title, subtitle)"
+ },
+ "thumbnail": "event_news_index8_thumbs.png"
+ },
+ {
+ "filename": "event_news_index9",
+ "name": {
+ "zh_tw": "9. 標準標題列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )",
+ "en": "9. Standard Title List-1 (widget-title, category, status, title, postdate)"
+ },
+ "thumbnail": "event_news_index9_thumbs.png"
+ },
+ {
+ "filename": "event_news_index10",
+ "name": {
+ "zh_tw": "10. 標準標題列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )",
+ "en": "10. Standard Title List-2 (widget-title, postdate, status, title, category)"
+ },
+ "thumbnail": "event_news_index10_thumbs.png"
+ },
+ {
+ "filename": "event_news_index11",
+ "name": {
+ "zh_tw": "11. 精簡標題列表-1 ( 模組標題, 狀態, 標題, 日期 )",
+ "en": "11. Simple Title List-1 (widget-title, status, title, postdate)"
+ },
+ "thumbnail": "event_news_index11_thumbs.png"
+ },
+ {
+ "filename": "event_news_index12",
+ "name": {
+ "zh_tw": "12. 精簡標題列表-2 ( 模組標題, 日期, 狀態, 標題 )",
+ "en": "12. Simple Title List-2 (widget-title, postdate, status, title)"
+ },
+ "thumbnail": "event_news_index12_thumbs.png"
+ },
+ {
+ "filename": "event_news_index13",
+ "name": {
+ "zh_tw": "13. 精簡表格列表-1 ( 模組標題, 狀態, 標題, 日期 )",
+ "en": "13. Simple Table List (widget-title, status, title, postdate)"
+ },
+ "thumbnail": "event_news_index13_thumbs.png"
+ },
+ {
+ "filename": "event_news_index14",
+ "name": {
+ "zh_tw": "14. 精簡表格列表-2 ( 模組標題, 日期, 狀態, 標題 )",
+ "en": "14. Simple Table List (widget-title, postdate, status, title)"
+ },
+ "thumbnail": "event_news_index14_thumbs.png"
+ },
+ {
+ "filename": "event_news_index15",
+ "name": {
+ "zh_tw": "15. 精簡表格列表-3 ( 模組標題, 日期, 狀態, 標題, 瀏覽人次 )",
+ "en": "15. Simple Table List (widget-title, postdate, status, title, view-count)"
+ },
+ "thumbnail": "event_news_index15_thumbs.png"
+ },
+ {
+ "filename": "event_news_index16",
+ "name": {
+ "zh_tw": "16. 連結 + 附件表格列表 ( 模組標題, 類別, 狀態, 標題 )",
+ "en": "16. Table List including Links and attachments (widget-title, category, status, title, view-count)"
+ },
+ "thumbnail": "event_news_index16_thumbs.png"
+ },
+ {
+ "filename": "event_news_index17",
+ "name": {
+ "zh_tw": "17. 標準標題列表-1A ( 類別, 標題, 日期, 張貼人 )",
+ "en": "17. Standard Title List-1 ( category, title, postdate, department)"
+ },
+ "thumbnail": "event_news_index1_thumbs.png"
+ },
+ {
+ "filename": "event_news_index18",
+ "name": {
+ "zh_tw": "18. 標準標題列表-2 ( 日期, 演講者, 狀態, 標題, 主持人, 備註 )",
+ "en": "18. Standard Title List-2 ( EventDate, speaker, status, title, host, notes)"
+ },
+ "thumbnail": "event_news_index1_thumbs.png"
+ }
+ ],
+ "widgets": [
+ {
+ "filename": "event_news_widget1",
+ "name": {
+ "zh_tw": "1. 標準圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
+ "en": "1. Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)"
+ },
+ "thumbnail": "event_news_widget1_thumbs.png"
+ },
+ {
+ "filename": "event_news_widget2",
+ "name": {
+ "zh_tw": "2. 左圖右文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
+ "en": "2. Balanced Image + Text(Left) (widget-title, image, status, postdate, category, title, subtitle)"
+ },
+ "thumbnail": "event_news_widget2_thumbs.png"
+ },
+ {
+ "filename": "event_news_widget3",
+ "name": {
+ "zh_tw": "3. 右圖左文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
+ "en": "3. Balanced Image + Text(Right) (widget-title, image, status, postdate, category, title, subtitle)"
+ },
+ "thumbnail": "event_news_widget3_thumbs.png"
+ },
+ {
+ "filename": "event_news_widget4",
+ "name": {
+ "zh_tw": "4. 三欄圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
+ "en": "4. 3-Column Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)"
+ },
+ "thumbnail": "event_news_widget4_thumbs.png"
+ },
+ {
+ "filename": "event_news_widget15",
+ "name": {
+ "zh_tw": "4.5. 三欄圖文-slide ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )",
+ "en": "4.5. 3-Column Standard Image + Text -slide(widget-title, image, status, postdate, category, title, subtitle)"
+ },
+ "thumbnail": "event_news_widget4_thumbs.png"
+ },
+ {
+ "filename": "event_news_widget5",
+ "name": {
+ "zh_tw": "5. 標準文字列表 ( 模組標題, 日期, 類別, 狀態, 標題, 副標題 )",
+ "en": "5. Standard Text List (widget-title, postdate, category, status, title, subtitle)"
+ },
+ "thumbnail": "event_news_widget5_thumbs.png"
+ },
+ {
+ "filename": "event_news_widget6",
+ "name": {
+ "zh_tw": "6. 標準標題列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )",
+ "en": "6. Standard Title List-1 (widget-title, category, status, title, postdate)"
+ },
+ "thumbnail": "event_news_widget6_thumbs.png"
+ },
+ {
+ "filename": "event_news_widget7",
+ "name": {
+ "zh_tw": "7. 標準標題列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )",
+ "en": "7. Standard Title List-2 (widget-title, postdate, status, title, category)"
+ },
+ "thumbnail": "event_news_widget7_thumbs.png"
+ },
+ {
+ "filename": "event_news_widget8",
+ "name": {
+ "zh_tw": "8. 標準表格列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )",
+ "en": "8. Standard Table List-1 (widget-title, category, status, title, postdate)"
+ },
+ "thumbnail": "event_news_widget8_thumbs.png"
+ },
+ {
+ "filename": "event_news_widget9",
+ "name": {
+ "zh_tw": "9. 標準表格列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )",
+ "en": "9. Standard Table List-2 (widget-title, postdate, status, title, category)"
+ },
+ "thumbnail": "event_news_widget9_thumbs.png"
+ },
+ {
+ "filename": "event_news_widget10",
+ "name": {
+ "zh_tw": "10. 精簡標題列表-1 ( 模組標題, 狀態, 標題, 日期 )",
+ "en": "10. Simple Title List-1 (widget-title, status, title, postdate)"
+ },
+ "thumbnail": "event_news_widget10_thumbs.png"
+ },
+ {
+ "filename": "event_news_widget11",
+ "name": {
+ "zh_tw": "11. 精簡標題列表-2 ( 模組標題, 日期, 狀態, 標題 )",
+ "en": "11. Simple Title List-2 (widget-title, postdate, status, title)"
+ },
+ "thumbnail": "event_news_widget11_thumbs.png"
+ },
+ {
+ "filename": "event_news_widget12",
+ "name": {
+ "zh_tw": "12. 精簡表格列表-1 ( 模組標題, 狀態, 標題, 日期 )",
+ "en": "12. Simple Table List (widget-title, status, title, postdate)"
+ },
+ "thumbnail": "event_news_widget12_thumbs.png"
+ },
+ {
+ "filename": "event_news_widget13",
+ "name": {
+ "zh_tw": "13. 精簡表格列表-2 ( 模組標題, 日期, 狀態, 標題 )",
+ "en": "13. Simple Table List (widget-title, postdate, status, title)"
+ },
+ "thumbnail": "event_news_widget13_thumbs.png"
+ },
+ {
+ "filename": "event_news_widget14",
+ "name": {
+ "zh_tw": "14. 一圖 + 標題列表 ( 模組標題, 圖片, 狀態, 標題, 日期 )",
+ "en": "14. 1 Image + Title List (widget-title, image, status, title, postdate)"
+ },
+ "thumbnail": "event_news_widget14_thumbs.png"
+ },
+ {
+ "filename": "event_news_widget16",
+ "name": {
+ "zh_tw": "15. 標準表格列表-3 ( 日期, 演講者, 狀態, 標題, 主持人, 備註 )",
+ "en": "15. Standard Table List (EventDate, speaker, status, title, host, notes)"
+ },
+ "thumbnail": "event_news_widget13_thumbs.png"
+ },
+ {
+ "filename": "event_news_widget17",
+ "name": {
+ "zh_tw": "16. 標準表格列表-3 ( 日期, 狀態, 標題, 演講者, 主持人, 備註 )",
+ "en": "16. Standard Table List (EventDate, status, title, speaker, host, notes)"
+ },
+ "thumbnail": "event_news_widget13_thumbs.png"
+ },
+ {
+ "filename": "event_news_widget18",
+ "name": {
+ "zh_tw": "18. 日歷",
+ "en": "18. Calendar"
+ },
+ "thumbnail": "event_news_widget13_thumbs.png"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/modules/event_news_mod/show.html.erb b/modules/event_news_mod/show.html.erb
new file mode 100644
index 0000000..c94bc39
--- /dev/null
+++ b/modules/event_news_mod/show.html.erb
@@ -0,0 +1,65 @@
+
+ {{title}}
+
+
+
+
+
+
+
{{img_description}}
+
+ {{subtitle_ann}}
+ {{body}}
+
+
+
+
+
+{{link_to_edit}}
\ No newline at end of file
diff --git a/modules/event_news/thumbs/event_news_index10_thumbs.png b/modules/event_news_mod/thumbs/event_news_index10_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_index10_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_index10_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_index11_thumbs.png b/modules/event_news_mod/thumbs/event_news_index11_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_index11_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_index11_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_index12_thumbs.png b/modules/event_news_mod/thumbs/event_news_index12_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_index12_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_index12_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_index13_thumbs.png b/modules/event_news_mod/thumbs/event_news_index13_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_index13_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_index13_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_index14_thumbs.png b/modules/event_news_mod/thumbs/event_news_index14_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_index14_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_index14_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_index15_thumbs.png b/modules/event_news_mod/thumbs/event_news_index15_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_index15_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_index15_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_index16_thumbs.png b/modules/event_news_mod/thumbs/event_news_index16_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_index16_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_index16_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_index1_thumbs.png b/modules/event_news_mod/thumbs/event_news_index1_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_index1_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_index1_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_index2_thumbs.png b/modules/event_news_mod/thumbs/event_news_index2_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_index2_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_index2_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_index3_thumbs.png b/modules/event_news_mod/thumbs/event_news_index3_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_index3_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_index3_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_index4_thumbs.png b/modules/event_news_mod/thumbs/event_news_index4_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_index4_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_index4_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_index5_thumbs.png b/modules/event_news_mod/thumbs/event_news_index5_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_index5_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_index5_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_index6_thumbs.png b/modules/event_news_mod/thumbs/event_news_index6_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_index6_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_index6_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_index7_thumbs.png b/modules/event_news_mod/thumbs/event_news_index7_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_index7_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_index7_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_index8_thumbs.png b/modules/event_news_mod/thumbs/event_news_index8_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_index8_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_index8_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_index9_thumbs.png b/modules/event_news_mod/thumbs/event_news_index9_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_index9_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_index9_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_widget10_thumbs.png b/modules/event_news_mod/thumbs/event_news_widget10_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_widget10_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_widget10_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_widget11_thumbs.png b/modules/event_news_mod/thumbs/event_news_widget11_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_widget11_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_widget11_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_widget12_thumbs.png b/modules/event_news_mod/thumbs/event_news_widget12_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_widget12_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_widget12_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_widget13_thumbs.png b/modules/event_news_mod/thumbs/event_news_widget13_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_widget13_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_widget13_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_widget14_thumbs.png b/modules/event_news_mod/thumbs/event_news_widget14_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_widget14_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_widget14_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_widget1_thumbs.png b/modules/event_news_mod/thumbs/event_news_widget1_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_widget1_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_widget1_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_widget2_thumbs.png b/modules/event_news_mod/thumbs/event_news_widget2_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_widget2_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_widget2_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_widget3_thumbs.png b/modules/event_news_mod/thumbs/event_news_widget3_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_widget3_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_widget3_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_widget4_thumbs.png b/modules/event_news_mod/thumbs/event_news_widget4_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_widget4_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_widget4_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_widget5_thumbs.png b/modules/event_news_mod/thumbs/event_news_widget5_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_widget5_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_widget5_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_widget6_thumbs.png b/modules/event_news_mod/thumbs/event_news_widget6_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_widget6_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_widget6_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_widget7_thumbs.png b/modules/event_news_mod/thumbs/event_news_widget7_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_widget7_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_widget7_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_widget8_thumbs.png b/modules/event_news_mod/thumbs/event_news_widget8_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_widget8_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_widget8_thumbs.png
diff --git a/modules/event_news/thumbs/event_news_widget9_thumbs.png b/modules/event_news_mod/thumbs/event_news_widget9_thumbs.png
similarity index 100%
rename from modules/event_news/thumbs/event_news_widget9_thumbs.png
rename to modules/event_news_mod/thumbs/event_news_widget9_thumbs.png
diff --git a/modules/faq/faq_index2.html.erb b/modules/faq/faq_index2.html.erb
index cce43c1..21d1e43 100644
--- a/modules/faq/faq_index2.html.erb
+++ b/modules/faq/faq_index2.html.erb
@@ -1,26 +1,26 @@
-
+
{{page-title}}
-
+
-
+
{{question}}
{{status}}
-
+
{{pagination_goes_here}}
\ No newline at end of file
diff --git a/modules/web_resource/_web_res_widget1.html.erb b/modules/web_resource/_web_res_widget1.html.erb
index 80c965b..3822492 100644
--- a/modules/web_resource/_web_res_widget1.html.erb
+++ b/modules/web_resource/_web_res_widget1.html.erb
@@ -7,7 +7,7 @@
- {{title}}
+ {{title}}
{{status}}
diff --git a/modules/web_resource/_web_res_widget2.html.erb b/modules/web_resource/_web_res_widget2.html.erb
index 017ce7f..5299a37 100644
--- a/modules/web_resource/_web_res_widget2.html.erb
+++ b/modules/web_resource/_web_res_widget2.html.erb
@@ -1,4 +1,4 @@
-