diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js
index a5253d4..edcd237 100644
--- a/assets/javascripts/app.js
+++ b/assets/javascripts/app.js
@@ -12,7 +12,7 @@
var scrollBottom = $('html').height() - $(window).height() - $('.kenjohn').height();
if (scrollTop>5 && scrollBottom>0) { /* 要滑動到選單的距離 */
if (parseInt($('.layout-content').css('margin-top'))==0){
- $('.layout-content').css('margin-top',$('.kenjohn').height());
+ $('.layout-content').css('margin-top',$('.kenjohn').height()-$('#orbit-bar').height());
}
$('.kenjohn').addClass('navFixed').removeClass('navRel'); /* 幫選單加上固定效果 */
} else {
@@ -827,7 +827,7 @@ function transdate(){
var theTop;
if (stop){
$(".kenjohn").addClass('navFixed');
- $('.layout-content').css('margin-top',$('.kenjohn').height());
+ $('.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;
}else{
diff --git a/modules/ad_banner/_ad_banner_widget2_video.html.erb b/modules/ad_banner/_ad_banner_widget2_video.html.erb
index 949e906..cb5ee59 100644
--- a/modules/ad_banner/_ad_banner_widget2_video.html.erb
+++ b/modules/ad_banner/_ad_banner_widget2_video.html.erb
@@ -54,7 +54,6 @@
if (typeof onYouTubeIframeAPIReady !== 'function'){
if(window.yt_players == undefined)
window.yt_players = {};
- $(".w-ba-banner__wrap[data-overlay=\".w-ad-banner__overlay_{{subpart-id}}\"]");
function onYouTubeIframeAPIReady(){
$(".w-ba-banner").each(function(i,banner){
var iframes = $(banner).find("iframe");
@@ -74,7 +73,6 @@ if (typeof onYouTubeIframeAPIReady !== 'function'){
delete yt_players[id][k];
})
iframes.each(function(i,iframe){
- console.log($(iframe).attr("id"))
var yt_player = yt_players[id][$(iframe).attr("id")];
if(yt_player){
}else{
@@ -82,8 +80,8 @@ if (typeof onYouTubeIframeAPIReady !== 'function'){
events: {
'onReady': function(event){
var height = $(event.target.getIframe()).height();
- var banner_wrap = $(".w-ba-banner__wrap[data-overlay=\".w-ad-banner__overlay_{{subpart-id}}\"]");
- banner_wrap.height(height).css({"padding-bottom":"4em","padding-top":""});
+ var banner_wrap = $(".w-ba-banner__wrap[data-overlay=\".w-ad-banner__overlay_"+id+"\"]");
+ banner_wrap.height(height).css({"padding-bottom":"","padding-top":""});
banner_wrap.find(".cycle-carousel-wrap").css("top","3em");
delete (event.target.B || event.target.H).onStateChange;
var onStateChange_idx = event.target.l.i.onStateChange;
@@ -123,6 +121,7 @@ if (typeof onYouTubeIframeAPIReady !== 'function'){
}
{{extra_state_chnage_script}}
}
+}
$(document).ready(function(){
window.onYouTubePlayerAPIReady = function() {
onYouTubeIframeAPIReady.apply(this,arguments);
@@ -143,8 +142,10 @@ if (typeof onYouTubeIframeAPIReady !== 'function'){
controlplay.find(".pause-slide").removeClass("active");
}
})
+ /*
var height = opts.slides.filter('.active').height() || opts.slides.height();
- banner_wrap.height(height).css("padding-bottom","");
+ banner_wrap.height(height)*/
+ banner_wrap.css("padding-bottom","");
{{extra_document_ready_script}}
$('.pause-slide').off('click').click(function(){
$(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle('pause');
@@ -175,7 +176,6 @@ if (typeof onYouTubeIframeAPIReady !== 'function'){
},300);
})
})
-}
+
{{widget-title}}
+
+ -
+
+
+
+ {{postdate}}
-
-
- {{postdate}}
+
+
+ {{category}}
+
+
+ {{status}}
-
-
- {{category}}
-
-
{{subtitle}}
+
{{subtitle}}
-
-
-
+
\ No newline at end of file
diff --git a/modules/announcement/info.json b/modules/announcement/info.json
index f583146..a3fe1bf 100644
--- a/modules/announcement/info.json
+++ b/modules/announcement/info.json
@@ -289,6 +289,14 @@
"en": "18. 3-Column Standard Image + Text Lite (widget-title, title, subtitle(only display 15 words))"
},
"thumbnail": "annc_widget4_thumbs.png"
+ },
+ {
+ "filename": "annc_widget19",
+ "name": {
+ "zh_tw": "19. 標準文字列表三欄 ( 模組標題, 日期, 類別, 狀態, 標題, 副標題 )",
+ "en": "19. 3-Column Standard Text List (widget-title, postdate, category, status, title, subtitle)"
+ },
+ "thumbnail": "annc_index9_thumbs.png"
}
]
}
diff --git a/modules/announcement/thumbs/annc_index19_thumbs.png b/modules/announcement/thumbs/annc_index19_thumbs.png
new file mode 100644
index 0000000..21bb4c9
Binary files /dev/null and b/modules/announcement/thumbs/annc_index19_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_index10_thumbs.png b/modules/announcement/thumbs_dup/annc_index10_thumbs.png
new file mode 100644
index 0000000..69185bc
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_index10_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_index11_thumbs.png b/modules/announcement/thumbs_dup/annc_index11_thumbs.png
new file mode 100644
index 0000000..0193f81
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_index11_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_index12_thumbs.png b/modules/announcement/thumbs_dup/annc_index12_thumbs.png
new file mode 100644
index 0000000..7c0a551
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_index12_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_index13_thumbs.png b/modules/announcement/thumbs_dup/annc_index13_thumbs.png
new file mode 100644
index 0000000..82eee2c
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_index13_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_index14_thumbs.png b/modules/announcement/thumbs_dup/annc_index14_thumbs.png
new file mode 100644
index 0000000..0a58044
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_index14_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_index15_thumbs.png b/modules/announcement/thumbs_dup/annc_index15_thumbs.png
new file mode 100644
index 0000000..cb9ed5e
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_index15_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_index16_thumbs.png b/modules/announcement/thumbs_dup/annc_index16_thumbs.png
new file mode 100644
index 0000000..6ecaa4e
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_index16_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_index17_thumbs.png b/modules/announcement/thumbs_dup/annc_index17_thumbs.png
new file mode 100644
index 0000000..69185bc
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_index17_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_index18_thumbs.png b/modules/announcement/thumbs_dup/annc_index18_thumbs.png
new file mode 100644
index 0000000..21bb4c9
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_index18_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_index19_thumbs.png b/modules/announcement/thumbs_dup/annc_index19_thumbs.png
new file mode 100644
index 0000000..21bb4c9
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_index19_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_index1_thumbs.png b/modules/announcement/thumbs_dup/annc_index1_thumbs.png
new file mode 100644
index 0000000..9fc7c23
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_index1_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_index2_thumbs.png b/modules/announcement/thumbs_dup/annc_index2_thumbs.png
new file mode 100644
index 0000000..0745dc6
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_index2_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_index3_thumbs.png b/modules/announcement/thumbs_dup/annc_index3_thumbs.png
new file mode 100644
index 0000000..8dc2261
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_index3_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_index4_thumbs.png b/modules/announcement/thumbs_dup/annc_index4_thumbs.png
new file mode 100644
index 0000000..2e00654
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_index4_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_index5_thumbs.png b/modules/announcement/thumbs_dup/annc_index5_thumbs.png
new file mode 100644
index 0000000..832fe35
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_index5_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_index6_thumbs.png b/modules/announcement/thumbs_dup/annc_index6_thumbs.png
new file mode 100644
index 0000000..eac8619
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_index6_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_index7_thumbs.png b/modules/announcement/thumbs_dup/annc_index7_thumbs.png
new file mode 100644
index 0000000..b69abd9
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_index7_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_index8_thumbs.png b/modules/announcement/thumbs_dup/annc_index8_thumbs.png
new file mode 100644
index 0000000..cf6eb30
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_index8_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_index9_thumbs.png b/modules/announcement/thumbs_dup/annc_index9_thumbs.png
new file mode 100644
index 0000000..21bb4c9
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_index9_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_widget10_thumbs.png b/modules/announcement/thumbs_dup/annc_widget10_thumbs.png
new file mode 100644
index 0000000..8dc2261
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_widget10_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_widget11_thumbs.png b/modules/announcement/thumbs_dup/annc_widget11_thumbs.png
new file mode 100644
index 0000000..2e00654
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_widget11_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_widget12_thumbs.png b/modules/announcement/thumbs_dup/annc_widget12_thumbs.png
new file mode 100644
index 0000000..82eee2c
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_widget12_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_widget13_thumbs.png b/modules/announcement/thumbs_dup/annc_widget13_thumbs.png
new file mode 100644
index 0000000..0a58044
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_widget13_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_widget14_thumbs.png b/modules/announcement/thumbs_dup/annc_widget14_thumbs.png
new file mode 100644
index 0000000..d1cab18
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_widget14_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_widget1_thumbs.png b/modules/announcement/thumbs_dup/annc_widget1_thumbs.png
new file mode 100644
index 0000000..77ba0a8
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_widget1_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_widget2_thumbs.png b/modules/announcement/thumbs_dup/annc_widget2_thumbs.png
new file mode 100644
index 0000000..832fe35
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_widget2_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_widget3_thumbs.png b/modules/announcement/thumbs_dup/annc_widget3_thumbs.png
new file mode 100644
index 0000000..eac8619
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_widget3_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_widget4_thumbs.png b/modules/announcement/thumbs_dup/annc_widget4_thumbs.png
new file mode 100644
index 0000000..b69abd9
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_widget4_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_widget5_thumbs.png b/modules/announcement/thumbs_dup/annc_widget5_thumbs.png
new file mode 100644
index 0000000..cf6eb30
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_widget5_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_widget6_thumbs.png b/modules/announcement/thumbs_dup/annc_widget6_thumbs.png
new file mode 100644
index 0000000..9fc7c23
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_widget6_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_widget7_thumbs.png b/modules/announcement/thumbs_dup/annc_widget7_thumbs.png
new file mode 100644
index 0000000..0745dc6
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_widget7_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_widget8_thumbs.png b/modules/announcement/thumbs_dup/annc_widget8_thumbs.png
new file mode 100644
index 0000000..7cfddf7
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_widget8_thumbs.png differ
diff --git a/modules/announcement/thumbs_dup/annc_widget9_thumbs.png b/modules/announcement/thumbs_dup/annc_widget9_thumbs.png
new file mode 100644
index 0000000..b0a2bb4
Binary files /dev/null and b/modules/announcement/thumbs_dup/annc_widget9_thumbs.png differ
diff --git a/modules/archive/archive_index1.html.erb b/modules/archive/archive_index1.html.erb
index 725165d..b96a830 100644
--- a/modules/archive/archive_index1.html.erb
+++ b/modules/archive/archive_index1.html.erb
@@ -1,5 +1,5 @@
-
{{page-title}}
+
{{page-title}}
-
{{category-title}}
diff --git a/modules/archive/archive_index3.html.erb b/modules/archive/archive_index3.html.erb
index fc78836..ad5e1ad 100644
--- a/modules/archive/archive_index3.html.erb
+++ b/modules/archive/archive_index3.html.erb
@@ -1,5 +1,5 @@
-
{{page-title}}
+
{{page-title}}