-
{{name}}
--
-
- {{title}} -
{{year}}
+
+
{{name}}
+-
+
- {{title}} +
-
">
">
@@ -37,17 +37,46 @@
if (typeof ad_banners_count === 'undefined'){
var ad_banners_count = 0;
}
+ var control_play_btn_pause = function(){
+ this.attr('aria-label', '<%= I18n.t("ad_banner.resume") %>');
+ this.attr('title', '<%= I18n.t("ad_banner.resume") %>');
+ this.find('p').text('<%= I18n.t("ad_banner.resume") %>');
+ this.find('i.fa-pause').removeClass('fa-pause').addClass('fa-play');
+ }
+ var control_play_btn_play = function(){
+ this.attr('aria-label', '<%= I18n.t("ad_banner.pause") %>');
+ this.attr('title', '<%= I18n.t("ad_banner.pause") %>');
+ this.find('p').text('<%= I18n.t("ad_banner.pause") %>');
+ this.find('i.fa-play').removeClass('fa-play').addClass('fa-pause');
+ }
function ad_audio_button(ele,is_stop){
var $self = $(ele);
var button_container = $self.parents('.ba-banner-widget-youtube').eq(0);
+ var append_class = "";
if (is_stop){
button_container.find('.jarallax-video-audio').remove();
+ var control_play_btn = $('.jarallax-video-control-play');
+ if(control_play_btn.length){
+ control_play_btn_pause.call(control_play_btn);
+ }
}else{
+ var control_play_btn = null;
+ if(window.accessibility_mode){
+ append_class = " accessibility_mode_btn";
+ var control_play_btn = $('.jarallax-video-control-play');
+ if(control_play_btn.length){
+
+ control_play_btn_play.call(control_play_btn);
+ control_play_btn = null;
+ }else{
+ control_play_btn = $('');
+ }
+ }
var audio_div;
if ($self.hasClass('have-audio')){
- audio_div = $('');
+ audio_div = $('');
}else{
- audio_div = $('');
+ audio_div = $('');
}
audio_div.find('p').css('display','none'); //fix CSP
audio_div.click(function(event) {
@@ -79,7 +108,47 @@
});
button_container.find('.jarallax-video-audio').remove();
button_container.append(audio_div);
+ if(control_play_btn != null){
+ audio_div.after(control_play_btn);
+ control_play_btn.click(function(){
+ var cycle_slideshow = button_container.find('.cycle-slideshow');
+ var opts = cycle_slideshow.data('cycle.opts');
+ var active_slide = opts.slides.filter('.'+opts.slideActiveClass);
+ if(active_slide.length){
+ var yt_iframe = active_slide.find('iframe');
+ if(yt_iframe.length == 0){
+ var jplayer = active_slide.find('.jp-jplayer').data('jPlayer');
+ if(jplayer){
+ if(jplayer.htmlElement.video.paused){
+ jplayer.play();
+ }else{
+ jplayer.pause();
+ }
+ }
+ }else{
+ if(window.yt_players){
+ var subpart_id = button_container.attr('data-subpart-id');
+ var subpart_yt_players = window.yt_players[subpart_id];
+ if(subpart_yt_players){
+ var yt_player = subpart_yt_players[yt_iframe.attr('id')];
+ var play_state = yt_player.getPlayerState();
+ if(play_state == YT.PlayerState.PLAYING || play_state == YT.PlayerState.BUFFERING){
+ yt_player.pauseVideo();
+ }else if(play_state == YT.PlayerState.UNSTARTED || play_state == YT.PlayerState.PAUSED || play_state == YT.PlayerState.ENDED || play_state == YT.PlayerState.CUED){
+ yt_player.playVideo();
+ play_state = yt_player.getPlayerState();
+ if(play_state == YT.PlayerState.UNSTARTED || play_state == YT.PlayerState.PAUSED || play_state == YT.PlayerState.ENDED || play_state == YT.PlayerState.CUED){
+ yt_player.mute().playVideo();
+ }
+ }
+ }
+ }
+ }
+ }
+ })
+ }
}
+
}
if(document.getElementById("youtube-iframe-api") == null){
var tag = document.createElement('script');
@@ -102,193 +171,198 @@
$("*[data-yt-binded=0]").each(function(){
init_yt_banner(this);
})
-if (typeof onYouTubeIframeAPIReady !== 'function'){
- $(document).ready(function() {
- $(document).on('touchstart click mousedown',".jarallax-video-audio",function(){
- $(this).trigger('click');
+ if (typeof onYouTubeIframeAPIReady !== 'function'){
+ $(document).ready(function() {
+ $(document).on('touchstart click mousedown',".jarallax-video-audio",function(){
+ $(this).trigger('click');
+ });
});
- });
- if(window.yt_players == undefined)
- window.yt_players = {};
- function find_out_yt_event_list_key(yt_player){
- var defalt_key = 'o';
- var all_keys = Object.keys(yt_player).filter(function(s){return s.length == 1});
- var prop_nums_thresh = 6;
- if(all_keys.indexOf(defalt_key) != -1){
- if((yt_player[defalt_key] instanceof Object) && Object.keys(yt_player[defalt_key]).length > prop_nums_thresh){
- return defalt_key;
- }
- }
- var event_key;
- all_keys.forEach(function(k){
- if((yt_player[k] instanceof Object) && Object.keys(yt_player[k]).length > prop_nums_thresh){
- event_key = k;
- return false;
- }
- })
- return event_key;
- }
- function find_out_yt_event_list_count_key(yt_player, event_list_key){
- var defalt_key = 'v';
- var all_keys = Object.keys(yt_player).filter(function(s){return s.length == 1});
- var equal_count = yt_player[event_list_key].length;
- if(all_keys.indexOf(defalt_key) != -1){
- if(yt_player[defalt_key] == equal_count){
- return defalt_key;
- }
- }
- var count_key;
- all_keys.forEach(function(k){
- if(yt_player[k] == equal_count){
- count_key = k;
- return false;
- }
- })
- return count_key;
- }
- function find_out_yt_event_list_array_key(event_dict){
- var defalt_key = 'i';
- var all_keys = Object.keys(event_dict);
- if(all_keys.indexOf(defalt_key) != -1){
- var tmp = event_dict[defalt_key];
- if(Array.isArray(tmp) && tmp.indexOf('onStateChange') != -1){
- return defalt_key;
- }
- }
- var array_key;
- all_keys.forEach(function(k){
- var tmp = event_dict[k];
- if(Array.isArray(tmp) && tmp.indexOf('onStateChange') != -1){
- array_key = k;
- return false;
- }
- })
- return array_key;
- }
- function find_out_yt_event_relation_key(event_dict, is_obj){ // is_obj = true => store event idx array. false => store whether event init(true or false)
- var defalt_key = 'j';
- var all_keys = Object.keys(event_dict);
- if(all_keys.indexOf(defalt_key) != -1){
- var tmp = event_dict[defalt_key];
- if((tmp instanceof Object) && tmp['onStateChange']){
- if(!is_obj || (tmp['onStateChange'] instanceof Object)){
+ if(window.yt_players == undefined)
+ window.yt_players = {};
+ function find_out_yt_event_list_key(yt_player){
+ var defalt_key = 'o';
+ var all_keys = Object.keys(yt_player).filter(function(s){return s.length == 1});
+ var prop_nums_thresh = 6;
+ if(all_keys.indexOf(defalt_key) != -1){
+ if((yt_player[defalt_key] instanceof Object) && Object.keys(yt_player[defalt_key]).length > prop_nums_thresh){
return defalt_key;
}
}
- }
- var relation_key;
- all_keys.forEach(function(k){
- var tmp = event_dict[k];
- if((tmp instanceof Object) && tmp['onStateChange']){
- if(!is_obj || (tmp['onStateChange'] instanceof Object)){
- relation_key = k;
+ var event_key;
+ all_keys.forEach(function(k){
+ if((yt_player[k] instanceof Object) && Object.keys(yt_player[k]).length > prop_nums_thresh){
+ event_key = k;
return false;
}
- }
- })
- return relation_key;
- }
- function onYouTubeIframeAPIReady(){
- $(".w-ba-banner").on('cycle-post-initialize', function(){
- init_banner(this);
- });
- function init_banner(banner){
- var $banner = $(banner);
- $banner.find('.w-ad-banner__slide').each(function(j, banner__slide){
- init_yt_banner(banner__slide);
})
- var iframes = $banner.find("iframe");
- if(iframes.length > 0){
- var id = $banner.attr("data-subpart-id");
- if(yt_players[id] == undefined)
- yt_players[id] = {};
- var remove_ids = [];
- Object.keys(yt_players[id]).forEach(function(k){
- var yt_player = yt_players[id][k];
- if($(yt_player.getIframe()).length == 0){
- yt_player.destroy();
- remove_ids.push(k);
- }
- })
- remove_ids.forEach(function(k){
- delete yt_players[id][k];
- })
- iframes.each(function(i,iframe){
- var yt_id = $(iframe).attr("id");
- var yt_player = yt_players[id][$(iframe).attr("id")];
- if(yt_player){
- }else{
- yt_player = new YT.Player($(iframe).attr("id"), {
- events: {
- 'onReady': function(event){
- var yt_player = event.target;
- var height = $(yt_player.getIframe()).height();
- var banner_wrap = $(iframe).parents('.w-ba-banner__wrap').eq(0);
- var carousel_wrap = banner_wrap.find(".cycle-carousel-wrap");
- if(carousel_wrap.length){
- carousel_wrap.css("top","3em");
- height += parseInt(carousel_wrap.css('font-size')) * 3;
- }
- banner_wrap.height(height).css({"padding-bottom":"","padding-top":""});
- var init_key = find_out_yt_event_relation_key(yt_player, false);
- if(init_key){
- delete yt_player[init_key].onStateChange;
- }
- else{
- console.log("{onReady: true, onStateChange: true} missing!");
- }
- var event_list_key = find_out_yt_event_list_key(yt_player);
- if(event_list_key){
- var event_dict = yt_player[event_list_key];
- var array_key = find_out_yt_event_list_array_key(event_dict);
- var count_key = find_out_yt_event_list_count_key(event_dict, array_key);
- var relation_key = find_out_yt_event_relation_key(event_dict, true);
- var onStateChange_idx = event_dict[relation_key].onStateChange;
- onStateChange_idx.reverse();
- var event_size = 3;
- onStateChange_idx.forEach(function(start_idx){
- event_dict[array_key].splice(start_idx,event_size);
- });
- event_dict[relation_key].onStateChange = [];
- event_dict[count_key] = event_dict[array_key].length;
- yt_player.addEventListener('onStateChange',onPlayerStateChange);
- banner_wrap.trigger('resize');
- }else{
- console.log("YT player changes its variables!")
- }
- {{extra_ready_script}}
- },
- 'onStateChange': onPlayerStateChange
- }
- });
- yt_players[id][$(iframe).attr("id")] = yt_player;
- $(iframe).data("yt_player",yt_player);
- }
- })
+ return event_key;
+ }
+ function find_out_yt_event_list_count_key(yt_player, event_list_key){
+ var defalt_key = 'v';
+ var all_keys = Object.keys(yt_player).filter(function(s){return s.length == 1});
+ var equal_count = yt_player[event_list_key].length;
+ if(all_keys.indexOf(defalt_key) != -1){
+ if(yt_player[defalt_key] == equal_count){
+ return defalt_key;
+ }
}
+ var count_key;
+ all_keys.forEach(function(k){
+ if(yt_player[k] == equal_count){
+ count_key = k;
+ return false;
+ }
+ })
+ return count_key;
}
- $(".w-ba-banner").each(function(i,banner){
- init_banner(banner);
- })
- }
- function onPlayerStateChange(event){
- var iframe = $(event.target.getIframe()),
- cyclediv = iframe.parents("div.cycle-slideshow");
- var widget = cyclediv.parents('.ba-banner-widget-youtube');
- if(event.data == YT.PlayerState.PLAYING || event.data == YT.PlayerState.BUFFERING){
- cyclediv[0].need_resume = !(cyclediv.hasClass("cycle-paused"));
- cyclediv.cycle("pause");
- widget.find('.banner-pager,.controlplay,.button-mid,.ad-overlay,.banner-overlay').css('visibility','hidden')
- ad_audio_button(iframe.parents(".w-ad-banner__slide").eq(0),false);
- }else if(event.data == YT.PlayerState.UNSTARTED || event.data == YT.PlayerState.PAUSED || event.data == YT.PlayerState.ENDED){
- if(cyclediv[0].need_resume)
- cyclediv.cycle("resume");
- widget.find('.banner-pager,.controlplay,.button-mid,.ad-overlay,.banner-overlay').css('visibility','')
- ad_audio_button(iframe.parents(".w-ad-banner__slide").eq(0),true);
+ function find_out_yt_event_list_array_key(event_dict){
+ var defalt_key = 'i';
+ var all_keys = Object.keys(event_dict);
+ if(all_keys.indexOf(defalt_key) != -1){
+ var tmp = event_dict[defalt_key];
+ if(Array.isArray(tmp) && tmp.indexOf('onStateChange') != -1){
+ return defalt_key;
+ }
+ }
+ var array_key;
+ all_keys.forEach(function(k){
+ var tmp = event_dict[k];
+ if(Array.isArray(tmp) && tmp.indexOf('onStateChange') != -1){
+ array_key = k;
+ return false;
+ }
+ })
+ return array_key;
+ }
+ function find_out_yt_event_relation_key(event_dict, is_obj){ // is_obj = true => store event idx array. false => store whether event init(true or false)
+ var defalt_key = 'j';
+ var all_keys = Object.keys(event_dict);
+ if(all_keys.indexOf(defalt_key) != -1){
+ var tmp = event_dict[defalt_key];
+ if((tmp instanceof Object) && tmp['onStateChange']){
+ if(!is_obj || (tmp['onStateChange'] instanceof Object)){
+ return defalt_key;
+ }
+ }
+ }
+ var relation_key;
+ all_keys.forEach(function(k){
+ var tmp = event_dict[k];
+ if((tmp instanceof Object) && tmp['onStateChange']){
+ if(!is_obj || (tmp['onStateChange'] instanceof Object)){
+ relation_key = k;
+ return false;
+ }
+ }
+ })
+ return relation_key;
+ }
+ function onYouTubeIframeAPIReady(){
+ $(".w-ba-banner").on('cycle-post-initialize', function(){
+ init_banner(this);
+ });
+ function init_banner(banner){
+ var $banner = $(banner);
+ $banner.find('.w-ad-banner__slide').each(function(j, banner__slide){
+ init_yt_banner(banner__slide);
+ })
+ var iframes = $banner.find("iframe");
+ if(iframes.length > 0){
+ var id = $banner.attr("data-subpart-id");
+ if(yt_players[id] == undefined)
+ yt_players[id] = {};
+ var remove_ids = [];
+ Object.keys(yt_players[id]).forEach(function(k){
+ var yt_player = yt_players[id][k];
+ if($(yt_player.getIframe()).length == 0){
+ yt_player.destroy();
+ remove_ids.push(k);
+ }
+ })
+ remove_ids.forEach(function(k){
+ delete yt_players[id][k];
+ })
+ iframes.each(function(i,iframe){
+ var $iframe = $(iframe);
+ var yt_id = $iframe.attr("id");
+ var yt_player = yt_players[id][yt_id];
+ if(yt_player){
+ }else{
+ yt_player = new YT.Player(yt_id, {
+ events: {
+ 'onReady': function(event){
+ var yt_player = event.target;
+ var height = $(yt_player.getIframe()).height();
+ var banner_wrap = $iframe.parents('.w-ba-banner__wrap').eq(0);
+ var carousel_wrap = banner_wrap.find(".cycle-carousel-wrap");
+ if(carousel_wrap.length){
+ carousel_wrap.css("top","3em");
+ height += parseInt(carousel_wrap.css('font-size')) * 3;
+ }
+ var overlay_in_slide = $iframe.parent().siblings('.ad-overlay,.banner-overlay');
+ if(overlay_in_slide.length != 0){
+ height += overlay_in_slide.outerHeight(true);
+ }
+ banner_wrap.height(height).css({"padding-bottom":"","padding-top":""});
+ var init_key = find_out_yt_event_relation_key(yt_player, false);
+ if(init_key){
+ delete yt_player[init_key].onStateChange;
+ }
+ else{
+ console.log("{onReady: true, onStateChange: true} missing!");
+ }
+ var event_list_key = find_out_yt_event_list_key(yt_player);
+ if(event_list_key){
+ var event_dict = yt_player[event_list_key];
+ var array_key = find_out_yt_event_list_array_key(event_dict);
+ var count_key = find_out_yt_event_list_count_key(event_dict, array_key);
+ var relation_key = find_out_yt_event_relation_key(event_dict, true);
+ var onStateChange_idx = event_dict[relation_key].onStateChange;
+ onStateChange_idx.reverse();
+ var event_size = 3;
+ onStateChange_idx.forEach(function(start_idx){
+ event_dict[array_key].splice(start_idx,event_size);
+ });
+ event_dict[relation_key].onStateChange = [];
+ event_dict[count_key] = event_dict[array_key].length;
+ yt_player.addEventListener('onStateChange',onPlayerStateChange);
+ banner_wrap.trigger('resize');
+ }else{
+ console.log("YT player changes its variables!")
+ }
+ {{extra_ready_script}}
+ },
+ 'onStateChange': onPlayerStateChange
+ }
+ });
+ yt_players[id][yt_id] = yt_player;
+ $iframe.data("yt_player",yt_player);
+ }
+ })
+ }
+ }
+ $(".w-ba-banner").each(function(i,banner){
+ init_banner(banner);
+ })
+ }
+ function onPlayerStateChange(event){
+ var iframe = $(event.target.getIframe()),
+ cyclediv = iframe.parents("div.cycle-slideshow");
+ var widget = cyclediv.parents('.ba-banner-widget-youtube');
+ if(event.data == YT.PlayerState.PLAYING || event.data == YT.PlayerState.BUFFERING){
+ cyclediv[0].need_resume = !(cyclediv.hasClass("cycle-paused"));
+ cyclediv.cycle("pause");
+ widget.find('.banner-pager,.controlplay,.button-mid,.ad-overlay,.banner-overlay').css('visibility','hidden')
+ ad_audio_button(iframe.parents(".w-ad-banner__slide").eq(0),false);
+ }else if(event.data == YT.PlayerState.UNSTARTED || event.data == YT.PlayerState.PAUSED || event.data == YT.PlayerState.ENDED){
+ if(cyclediv[0].need_resume)
+ cyclediv.cycle("resume");
+ widget.find('.banner-pager,.controlplay,.button-mid,.ad-overlay,.banner-overlay').css('visibility','')
+ ad_audio_button(iframe.parents(".w-ad-banner__slide").eq(0),true);
+ }
+ {{extra_state_chnage_script}}
}
- {{extra_state_chnage_script}}
}
-}
$(document).ready(function(){
window.onYouTubePlayerAPIReady = function() {
onYouTubeIframeAPIReady.apply(this,arguments);
@@ -332,22 +406,10 @@ if (typeof onYouTubeIframeAPIReady !== 'function'){
$('[data-subpart-id="{{subpart-id}}"] .prev-button').click(function(){
$(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle("prev");
})
- var resize_timeout_id;
- $(window).resize(function(){
- if(resize_timeout_id){
- window.clearTimeout(resize_timeout_id);
- }
- resize_timeout_id = window.setTimeout(function(){
- var banner_wrap = $(".w-ba-banner__wrap[data-overlay=\".w-ad-banner__overlay_{{subpart-id}}\"]");
- var opts = banner_wrap.data('cycle.opts');
- var height = opts.slides.filter('.active').height() || opts.slides.height();
- banner_wrap.height(height).css("padding-bottom","");
- },300);
- })
})
\ No newline at end of file
diff --git a/modules/archive/archive_index13.html.erb b/modules/archive/archive_index13.html.erb
index 9339ea5..42e6dc3 100644
--- a/modules/archive/archive_index13.html.erb
+++ b/modules/archive/archive_index13.html.erb
@@ -15,11 +15,11 @@
{{status}}
-
+
{{archive-title}}
-
+
{{file-type}}
@@ -32,6 +32,9 @@
\ No newline at end of file
diff --git a/modules/archive/archive_index3.html.erb b/modules/archive/archive_index3.html.erb
index 21fb229..bbd7caf 100644
--- a/modules/archive/archive_index3.html.erb
+++ b/modules/archive/archive_index3.html.erb
@@ -12,7 +12,7 @@
- - {{file-name}} + {{file-name}} {{file-type}}
-
+
- {{status}}
- - - {{file-name}} - {{file-type}} + {{file-name}} + {{file-type}}
-
-
+
-
-
-
- @@ -40,9 +42,8 @@ .widget-link.widget-5 .button-mid{ position: absolute; width: 100%; - height: 100%; - top: 0; - left: 0; + height: 0; + top: 50%; } .widget-link.widget-5 .button-mid .fa{ cursor: pointer; diff --git a/modules/web_resource/_web_res_widget6.html.erb b/modules/web_resource/_web_res_widget6.html.erb index 989df1a..08e12ba 100644 --- a/modules/web_resource/_web_res_widget6.html.erb +++ b/modules/web_resource/_web_res_widget6.html.erb @@ -7,12 +7,14 @@
- @@ -41,9 +43,8 @@ .widget-link.widget-6 .button-mid{ position: absolute; width: 100%; - height: 100%; - top: 0; - left: 0; + height: 0; + top: 50%; } .widget-link.widget-6 .button-mid .fa{ cursor: pointer; diff --git a/modules/web_resource/web_res_index1.html.erb b/modules/web_resource/web_res_index1.html.erb index 040dde9..25e4849 100644 --- a/modules/web_resource/web_res_index1.html.erb +++ b/modules/web_resource/web_res_index1.html.erb @@ -4,7 +4,7 @@
-
\ 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 @@
-
+
+
- {{link_to_edit}}
+ {{link_to_edit}}
-
-
-
+
-
-
-
-
-
\ No newline at end of file
diff --git a/modules/calendar/index2.html.erb b/modules/calendar/index2.html.erb
index b2d63e0..6ffa18b 100644
--- a/modules/calendar/index2.html.erb
+++ b/modules/calendar/index2.html.erb
@@ -1,55 +1,55 @@
-
-{{style_tag}}
-
-
+{{style_tag}}
+
+
\ No newline at end of file
diff --git a/modules/calendar/index3.html.erb b/modules/calendar/index3.html.erb
index de8cabd..2ab0863 100644
--- a/modules/calendar/index3.html.erb
+++ b/modules/calendar/index3.html.erb
@@ -1,71 +1,71 @@
-
-{{style_tag}}
-
-
+{{style_tag}}
+
+
\ No newline at end of file
diff --git a/modules/calendar/info.json b/modules/calendar/info.json
index 529ac5a..b189381 100644
--- a/modules/calendar/info.json
+++ b/modules/calendar/info.json
@@ -1,46 +1,46 @@
-{
- "frontend": [
- {
- "filename" : "index",
- "name" : {
- "zh_tw" : "1. 行事曆",
- "en" : "1. Calendar"
- },
- "thumbnail" : "thumb.png"
- },
- {
- "filename" : "index2",
- "name" : {
- "zh_tw" : "2. 行事曆(和widget樣式1同)",
- "en" : "2. Calendar(same as widget style 1)"
- },
- "thumbnail" : "thumb.png"
- },
- {
- "filename" : "index3",
- "name" : {
- "zh_tw" : "3. 行事曆加公告",
- "en" : "3. Calendar with announcement"
- },
- "thumbnail" : "thumb.png"
- }
- ],
- "widgets" : [
- {
- "filename" : "calendar_widget1",
- "name" : {
- "zh_tw" : "1. 行事曆",
- "en" : "1. Calendar"
- },
- "thumbnail" : "thumb.png"
- },
- {
- "filename" : "calendar_widget2",
- "name" : {
- "zh_tw" : "2. 行事曆加公告",
- "en" : "2. Calendar with announcement"
- },
- "thumbnail" : "thumb2.png"
- }
- ]
+{
+ "frontend": [
+ {
+ "filename" : "index",
+ "name" : {
+ "zh_tw" : "1. 行事曆",
+ "en" : "1. Calendar"
+ },
+ "thumbnail" : "thumb.png"
+ },
+ {
+ "filename" : "index2",
+ "name" : {
+ "zh_tw" : "2. 行事曆(和widget樣式1同)",
+ "en" : "2. Calendar(same as widget style 1)"
+ },
+ "thumbnail" : "thumb.png"
+ },
+ {
+ "filename" : "index3",
+ "name" : {
+ "zh_tw" : "3. 行事曆加公告",
+ "en" : "3. Calendar with announcement"
+ },
+ "thumbnail" : "thumb.png"
+ }
+ ],
+ "widgets" : [
+ {
+ "filename" : "calendar_widget1",
+ "name" : {
+ "zh_tw" : "1. 行事曆",
+ "en" : "1. Calendar"
+ },
+ "thumbnail" : "thumb.png"
+ },
+ {
+ "filename" : "calendar_widget2",
+ "name" : {
+ "zh_tw" : "2. 行事曆加公告",
+ "en" : "2. Calendar with announcement"
+ },
+ "thumbnail" : "thumb2.png"
+ }
+ ]
}
\ No newline at end of file
diff --git a/modules/gallery/_gallery_widget4.html.erb b/modules/gallery/_gallery_widget4.html.erb
index 2b56d73..fc6ec94 100644
--- a/modules/gallery/_gallery_widget4.html.erb
+++ b/modules/gallery/_gallery_widget4.html.erb
@@ -2,7 +2,7 @@
-
-
-
-
-
-
-- -
- - -{{widget-title}}
- + <% OrbitHelper.render_css_in_head(["gallery_card.css"]) %>
diff --git a/modules/personal_journal/index_by_author.html.erb b/modules/personal_journal/index_by_author.html.erb
index 806bd68..972a947 100644
--- a/modules/personal_journal/index_by_author.html.erb
+++ b/modules/personal_journal/index_by_author.html.erb
@@ -1,10 +1,13 @@
{{pagination_goes_here}}
\ No newline at end of file
diff --git a/modules/personal_journal/info.json b/modules/personal_journal/info.json
index bdb0c2c..b3b2ea3 100644
--- a/modules/personal_journal/info.json
+++ b/modules/personal_journal/info.json
@@ -15,6 +15,14 @@
"en" : "2. List which includes search"
},
"thumbnail" : "thumb.png"
+ },
+ {
+ "filename" : "index_by_author",
+ "name" : {
+ "zh_tw" : "3. 作者論文",
+ "en" : "3. List by Author"
+ },
+ "thumbnail" : "thumb.png"
}
]
}
\ 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 @@
-
{{page-title}}
+
- {{title}}
+ {{title}}
{{status}}
diff --git a/modules/web_resource/_web_res_widget3.html.erb b/modules/web_resource/_web_res_widget3.html.erb
index 70cfa0d..6fddc5d 100644
--- a/modules/web_resource/_web_res_widget3.html.erb
+++ b/modules/web_resource/_web_res_widget3.html.erb
@@ -9,7 +9,7 @@
{{widget-title}}
@@ -7,7 +7,7 @@
+ data-cycle-fx="carousel" data-cycle-timeout="0" data-cycle-carousel-visible="4"
+ data-cycle-carousel-rwd-json="{768: 1}"
+ data-cycle-pause-on-hover="true" data-cycle-log="false" data-cycle-carousel-fluid="true">
-
">
@@ -39,9 +42,8 @@
.widget-link.widget-4 .button-mid{
position: absolute;
width: 100%;
- height: 100%;
- top: 0;
- left: 0;
+ height: 0;
+ top: 50%;
}
.widget-link.widget-4 .button-mid .fa{
cursor: pointer;
diff --git a/modules/web_resource/_web_res_widget5.html.erb b/modules/web_resource/_web_res_widget5.html.erb
index 42c479b..af23e36 100644
--- a/modules/web_resource/_web_res_widget5.html.erb
+++ b/modules/web_resource/_web_res_widget5.html.erb
@@ -7,13 +7,15 @@
+ data-cycle-fx="carousel" data-cycle-timeout="0" data-cycle-carousel-visible="5"
+ data-cycle-carousel-rwd-json="{768: 1}"
+ data-cycle-pause-on-hover="true" data-cycle-log="false" data-cycle-carousel-fluid="true">
+ data-cycle-fx="carousel" data-cycle-timeout="0" data-cycle-carousel-visible="5"
+ data-cycle-carousel-rwd-json="{768: 1}"
+ data-cycle-pause-on-hover="true" data-cycle-log="false" data-cycle-carousel-fluid="true">