From 8df824d2aa759c79e1883261bfb02ec21d63fbc2 Mon Sep 17 00:00:00 2001 From: rulingcom Date: Fri, 3 Sep 2021 03:45:43 +0000 Subject: [PATCH] update template --- assets/stylesheets/bootstrap/_mixins.scss | 12 ++ assets/stylesheets/template/layout/slide.scss | 4 +- .../template/modules/ad_banner.scss | 3 + .../template/modules/announcement.scss | 4 + .../stylesheets/template/modules/member.scss | 1 + modules/active/active_index.html.erb | 13 +- modules/active/active_index1.html.erb | 25 +++ modules/active/active_index2.html.erb | 32 ++++ modules/active/info.json | 22 ++- .../active/thumbs/active_index1_thumbs.png | Bin 0 -> 2130 bytes .../active/thumbs/active_index2_thumbs.png | Bin 0 -> 3379 bytes modules/ad_banner/_ad_banner_widget1.html.erb | 33 +++- .../_ad_banner_widget2_video.html.erb | 148 ++++++++++++---- modules/announcement/_annc_widget15.html.erb | 162 +++++++++++------- modules/announcement/_annc_widget4.html.erb | 81 ++++++++- modules/announcement/annc_index11.html.erb | 17 +- modules/announcement/annc_index12.html.erb | 17 +- modules/announcement/annc_index15.html.erb | 17 +- modules/announcement/annc_index16.html.erb | 17 +- modules/announcement/show.html.erb | 35 +++- modules/member/show.html.erb | 19 +- modules/personal_activity/index.html.erb | 17 +- modules/personal_book/index_search1.html.erb | 2 +- .../index_search1.html.erb | 2 +- modules/personal_course/index.html.erb | 17 +- modules/personal_honor/index.html.erb | 17 +- .../personal_journal/index_search1.html.erb | 2 +- modules/personal_lab/index.html.erb | 17 +- .../personal_patent/index_search1.html.erb | 2 +- modules/personal_research/index.html.erb | 17 +- .../ruling_bus/_ruling_bus_widget1.html.erb | 57 ++++++ modules/ruling_bus/info.json | 14 ++ .../web_resource/_web_res_widget1.html.erb | 3 + .../web_resource/_web_res_widget2.html.erb | 3 + modules/web_resource/web_res_index1.html.erb | 19 +- modules/web_resource/web_res_index2.html.erb | 21 ++- partial/_head.html.erb | 14 +- .../_site_menu_widget1.html.erb | 2 +- .../_site_menu_widget2.html.erb | 2 +- 39 files changed, 675 insertions(+), 215 deletions(-) create mode 100644 modules/active/active_index1.html.erb create mode 100644 modules/active/active_index2.html.erb create mode 100644 modules/active/thumbs/active_index1_thumbs.png create mode 100644 modules/active/thumbs/active_index2_thumbs.png create mode 100644 modules/ruling_bus/_ruling_bus_widget1.html.erb create mode 100644 modules/ruling_bus/info.json diff --git a/assets/stylesheets/bootstrap/_mixins.scss b/assets/stylesheets/bootstrap/_mixins.scss index 74ccf9f..cbbafd9 100644 --- a/assets/stylesheets/bootstrap/_mixins.scss +++ b/assets/stylesheets/bootstrap/_mixins.scss @@ -303,6 +303,8 @@ @mixin gradient-horizontal($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) { background-image: -webkit-linear-gradient(left, color-stop($start-color $start-percent), color-stop($end-color $end-percent)); // Safari 5.1-6, Chrome 10+ background-image: linear-gradient(to right, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ + -pie-background: linear-gradient(to right, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ + behavior: url("/assets/ie_support/PIE2/PIE.htc"); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 and down } @@ -314,6 +316,8 @@ @mixin gradient-vertical($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) { background-image: -webkit-linear-gradient(top, $start-color $start-percent, $end-color $end-percent); // Safari 5.1-6, Chrome 10+ background-image: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ + -pie-background: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ + behavior: url("/assets/ie_support/PIE2/PIE.htc"); background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down } @@ -322,16 +326,22 @@ background-repeat: repeat-x; background-image: -webkit-linear-gradient($deg, $start-color, $end-color); // Safari 5.1-6, Chrome 10+ background-image: linear-gradient($deg, $start-color, $end-color); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ + -pie-background: linear-gradient($deg, $start-color, $end-color); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ + behavior: url("/assets/ie_support/PIE2/PIE.htc"); } @mixin gradient-horizontal-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) { background-image: -webkit-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color); background-image: linear-gradient(to right, $start-color, $mid-color $color-stop, $end-color); + -pie-background: linear-gradient(to right, $start-color, $mid-color $color-stop, $end-color); + behavior: url("/assets/ie_support/PIE2/PIE.htc"); background-repeat: no-repeat; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 and down, gets no color-stop at all for proper fallback } @mixin gradient-vertical-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) { background-image: -webkit-linear-gradient($start-color, $mid-color $color-stop, $end-color); background-image: linear-gradient($start-color, $mid-color $color-stop, $end-color); + -pie-background: linear-gradient($start-color, $mid-color $color-stop, $end-color); + behavior: url("/assets/ie_support/PIE2/PIE.htc"); background-repeat: no-repeat; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback } @@ -343,6 +353,8 @@ @mixin gradient-striped($color: rgba(255,255,255,.15), $angle: 45deg) { background-image: -webkit-linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent); background-image: linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent); + -pie-background: linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent); + behavior: url("/assets/ie_support/PIE2/PIE.htc"); } // Reset filters for IE diff --git a/assets/stylesheets/template/layout/slide.scss b/assets/stylesheets/template/layout/slide.scss index fbafbbe..19851f3 100644 --- a/assets/stylesheets/template/layout/slide.scss +++ b/assets/stylesheets/template/layout/slide.scss @@ -7,7 +7,7 @@ z-index: 0; .w-ad-banner { - max-width: 75em; + //max-width: 75em; margin: auto; } -} \ No newline at end of file +} diff --git a/assets/stylesheets/template/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss index 20b43a6..7839c5e 100644 --- a/assets/stylesheets/template/modules/ad_banner.scss +++ b/assets/stylesheets/template/modules/ad_banner.scss @@ -37,6 +37,8 @@ width: 100%; bottom: 0; background-image: linear-gradient(180deg,transparent 0,rgba(0,0,0,.7) 40%,#000); + -pie-background: linear-gradient(180deg,transparent 0,rgba(0,0,0,.7) 40%,#000); + behavior: url("/assets/ie_support/PIE2/PIE.htc"); padding: 1.5em 1em; h3 { margin: 0; @@ -85,6 +87,7 @@ width: 0.8em; height: 0.8em; border-radius: 50%; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); opacity: .5; cursor:pointer; border:0; diff --git a/assets/stylesheets/template/modules/announcement.scss b/assets/stylesheets/template/modules/announcement.scss index a0a74c4..e5ff769 100644 --- a/assets/stylesheets/template/modules/announcement.scss +++ b/assets/stylesheets/template/modules/announcement.scss @@ -927,6 +927,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl text-align: center; background-color: #aab2bd; border-radius: 4px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); -webkit-border-radius: 4px; -moz-border-radius: 4px } @@ -947,6 +948,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl background-color: #4fc1e9; border: 4px solid #f5f7fa; border-radius: 50%; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); -webkit-border-radius: 50%; -moz-border-radius: 50% } @@ -968,6 +970,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl margin-top: 31px; background-color: #CCC; border-radius: 4px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); -webkit-border-radius: 4px; -moz-border-radius: 4px } @@ -1021,6 +1024,7 @@ table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before, tabl .VivaTimeline dl dd .events .events-footer ol li { background: #32b487; border-radius: 5px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); margin: 10px; display: inline-block; width: 10px; diff --git a/assets/stylesheets/template/modules/member.scss b/assets/stylesheets/template/modules/member.scss index 0e719e8..0dac435 100644 --- a/assets/stylesheets/template/modules/member.scss +++ b/assets/stylesheets/template/modules/member.scss @@ -264,6 +264,7 @@ @media(max-width:580px) { overflow: hidden; border-radius: 50%; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); height: 14em; width: 14em; margin: 1.5em auto 1em auto; diff --git a/modules/active/active_index.html.erb b/modules/active/active_index.html.erb index 5bda937..3bb4e90 100644 --- a/modules/active/active_index.html.erb +++ b/modules/active/active_index.html.erb @@ -14,10 +14,15 @@ {{category}} - {{act_start_date}} ~
{{act_end_date}} - {{title}} - {{sign_start_date}} ~
{{sign_end_date}} - {{sign_up}} + {{act_duration_date}} + + + {{status}} + + {{title}} + + {{sign_duration_date}} + {{sign_up}} diff --git a/modules/active/active_index1.html.erb b/modules/active/active_index1.html.erb new file mode 100644 index 0000000..49fe82a --- /dev/null +++ b/modules/active/active_index1.html.erb @@ -0,0 +1,25 @@ +
+

{{page-title}}

+ + + + + + + + + + + + + + + +
{{th_act_time_range}}{{th_title}}{{th_sign_up}}
{{act_duration_date}} + + {{status}} + + {{title}} + {{sign_up}}
+
+{{pagination_goes_here}} diff --git a/modules/active/active_index2.html.erb b/modules/active/active_index2.html.erb new file mode 100644 index 0000000..99f9a19 --- /dev/null +++ b/modules/active/active_index2.html.erb @@ -0,0 +1,32 @@ +
+

{{page-title}}

+ +
+{{pagination_goes_here}} \ No newline at end of file diff --git a/modules/active/info.json b/modules/active/info.json index 97cd820..aa5f20c 100644 --- a/modules/active/info.json +++ b/modules/active/info.json @@ -3,10 +3,26 @@ { "filename" : "active_index", "name" : { - "zh_tw" : "1. 列表", - "en" : "1. List" - }, + "zh_tw" : "1. 列表 (類別, 活動期間, 狀態, 活動標題, 報名期間, 線上報名)", + "en" : "1. List (Category, Event Period, status, Event Title, Registration Period, Register)" + }, "thumbnail" : "thumb.png" + }, + { + "filename" : "active_index1", + "name" : { + "zh_tw" : "2. 精簡表格列表-2 ( 模組標題, 活動期間, 狀態, 標題, 線上報名)", + "en" : "2. Simple Table List (widget-title, Event Period, status, title, Register)" + }, + "thumbnail" : "active_index1_thumbs.png" + }, + { + "filename" : "active_index2", + "name" : { + "zh_tw" : "3. 三欄圖文 ( 模組標題, 圖片, 狀態, 活動期間, 類別, 標題, 副標題, 線上報名)", + "en" : "3. 3-Column Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle, Register)" + }, + "thumbnail" : "active_index2_thumbs.png" } ] } \ No newline at end of file diff --git a/modules/active/thumbs/active_index1_thumbs.png b/modules/active/thumbs/active_index1_thumbs.png new file mode 100644 index 0000000000000000000000000000000000000000..0a58044bcab1badab10347049e79a10fdef28201 GIT binary patch literal 2130 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 literal 0 HcmV?d00001 diff --git a/modules/ad_banner/_ad_banner_widget1.html.erb b/modules/ad_banner/_ad_banner_widget1.html.erb index 1f18ada..8c32071 100644 --- a/modules/ad_banner/_ad_banner_widget1.html.erb +++ b/modules/ad_banner/_ad_banner_widget1.html.erb @@ -1,5 +1,5 @@ -
-
+
-
- +
-
- +
+
    @@ -58,10 +60,23 @@ \ No newline at end of file diff --git a/modules/ad_banner/_ad_banner_widget2_video.html.erb b/modules/ad_banner/_ad_banner_widget2_video.html.erb index 725db51..0c82e07 100644 --- a/modules/ad_banner/_ad_banner_widget2_video.html.erb +++ b/modules/ad_banner/_ad_banner_widget2_video.html.erb @@ -1,5 +1,5 @@ -
    -
    +
    - +
      @@ -45,53 +45,116 @@ var firstScriptTag = document.getElementsByTagName('script')[0]; firstScriptTag.parentNode.insertBefore(tag, firstScriptTag); } - - $("document").ready(function(){ - $("*[data-yt-binded=0]").each(function(){ - $(this).attr("data-yt-binded","1"); - var obj = $(this).find("iframe"); - obj.attr("id",$(this).data("youtube-id") + "_" + ad_banners_count); - ad_banners_count++; - }) - }); - + $("*[data-yt-binded=0]").each(function(){ + $(this).attr("data-yt-binded","1"); + var obj = $(this).find("iframe"); + obj.attr("id",$(this).data("youtube-id") + "_" + ad_banners_count); + ad_banners_count++; + }) 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 iframe[data-yt-api-binded=0]").each(function(){ - $(this).attr("data-yt-api-binded","1"); - new YT.Player($(this).attr("id"), { - events: { - 'onStateChange': onPlayerStateChange - } - }); + $(".w-ba-banner").each(function(i,banner){ + 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){ + console.log($(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 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":""}); + banner_wrap.find(".cycle-carousel-wrap").css("top","3em"); + delete event.target.B.onStateChange; + var onStateChange_idx = event.target.l.i.onStateChange; + onStateChange_idx.reverse(); + var event_size = 3; + onStateChange_idx.forEach(function(start_idx){ + event.target.l.h.splice(start_idx,event_size); + }); + event.target.l.i.onStateChange = []; + event.target.l.s = event.target.l.h.length; + event.target.addEventListener('onStateChange',onPlayerStateChange); + {{extra_ready_script}} + }, + 'onStateChange': onPlayerStateChange + } + }); + yt_players[id][$(iframe).attr("id")] = yt_player; + $(iframe).data("yt_player",yt_player); + } + }) + } }) } function onPlayerStateChange(event){ var iframe = $(event.target.h), cyclediv = iframe.parents("div.cycle-slideshow"); - var widget = cyclediv.parents('.ba-banner-widget-youtube') + 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').css('visibility','hidden') - }else if(event.data == YT.PlayerState.PAUSED || event.data == YT.PlayerState.ENDED){ - cyclediv.cycle("resume"); + }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').css('visibility','') } + {{extra_state_chnage_script}} } $(document).ready(function(){ window.onYouTubePlayerAPIReady = function() { - onYouTubeIframeAPIReady(); + onYouTubeIframeAPIReady.apply(this,arguments); }; + var banner_wrap = $(".w-ba-banner__wrap[data-overlay=\".w-ad-banner__overlay_{{subpart-id}}\"]"); + var opts = banner_wrap.data('cycle.opts'); + banner_wrap.on('cycle-paused',function(opts){ + var controlplay = $(this).nextAll(".controlplay"); + if(controlplay.length != 0){ + controlplay.find(".resume-slide").removeClass("active"); + controlplay.find(".pause-slide").addClass("active"); + } + }) + banner_wrap.on('cycle-resumed',function(opts){ + var controlplay = $(this).nextAll(".controlplay"); + if(controlplay.length != 0){ + controlplay.find(".resume-slide").addClass("active"); + controlplay.find(".pause-slide").removeClass("active"); + } + }) + var height = opts.slides.filter('.active').height() || opts.slides.height(); + banner_wrap.height(height).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'); - $(this).addClass('active') - $(this).parents('.controlplay').eq(0).find('.resume-slide').removeClass('active') + $(this).addClass('active'); + $(this).parents('.controlplay').eq(0).find('.resume-slide').removeClass('active'); }); $('.resume-slide').off('click').click(function(){ $(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle('resume'); - $(this).addClass('active') - $(this).parents('.controlplay').eq(0).find('.pause-slide').removeClass('active') + $(this).addClass('active'); + $(this).parents('.controlplay').eq(0).find('.pause-slide').removeClass('active'); }); $('.next-button').off('click').on('click',function(){ $(this).parent("ul").parent('.w-ba-banner').find(".cycle-slideshow").cycle("next"); @@ -99,14 +162,39 @@ if (typeof onYouTubeIframeAPIReady !== 'function'){ $('.prev-button').off('click').on('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/announcement/_annc_widget15.html.erb b/modules/announcement/_annc_widget15.html.erb index 5d6b453..908b2bc 100644 --- a/modules/announcement/_annc_widget15.html.erb +++ b/modules/announcement/_annc_widget15.html.erb @@ -1,13 +1,13 @@ -
      +

      {{widget-title}}

      <%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %>
      -
      - - +
      + +
      • @@ -20,11 +20,11 @@ {{status}} - + {{postdate}} - + {{category}}
      @@ -38,92 +38,126 @@
      diff --git a/modules/announcement/annc_index11.html.erb b/modules/announcement/annc_index11.html.erb index 7a883b6..5df5931 100644 --- a/modules/announcement/annc_index11.html.erb +++ b/modules/announcement/annc_index11.html.erb @@ -25,10 +25,15 @@ {{pagination_goes_here}} \ No newline at end of file diff --git a/modules/announcement/annc_index12.html.erb b/modules/announcement/annc_index12.html.erb index 3f2c32d..e478a9f 100644 --- a/modules/announcement/annc_index12.html.erb +++ b/modules/announcement/annc_index12.html.erb @@ -27,10 +27,15 @@ {{pagination_goes_here}} \ No newline at end of file diff --git a/modules/announcement/annc_index15.html.erb b/modules/announcement/annc_index15.html.erb index 8b0ffa8..55ddde9 100644 --- a/modules/announcement/annc_index15.html.erb +++ b/modules/announcement/annc_index15.html.erb @@ -25,10 +25,15 @@ {{pagination_goes_here}} \ No newline at end of file diff --git a/modules/announcement/annc_index16.html.erb b/modules/announcement/annc_index16.html.erb index ec0972d..006afa4 100644 --- a/modules/announcement/annc_index16.html.erb +++ b/modules/announcement/annc_index16.html.erb @@ -39,10 +39,15 @@ {{pagination_goes_here}} \ No newline at end of file diff --git a/modules/announcement/show.html.erb b/modules/announcement/show.html.erb index 981db72..4f0adf9 100644 --- a/modules/announcement/show.html.erb +++ b/modules/announcement/show.html.erb @@ -1,3 +1,28 @@ +

      {{title}}

      @@ -19,7 +44,7 @@
    -
    +
    {{img_description}} {{img_description}}
    @@ -44,7 +69,7 @@
-
+
li").eq(active_slide); if(carousel_images_slide_first_child.length > 0){ - var content_size = Math.floor((carousel_images_slide.width() - Number.parseInt(carousel_images_slide.css('font-size')) * 3) / carousel_images_slide_first_child.width()); + var content_size = Math.floor((carousel_images_slide.outerWidth() - Number.parseInt(carousel_images_slide.css('font-size')) * 3) / carousel_images_slide_first_child.outerWidth(true)); content_size = Math.max(content_size,1); if(carousel_images_slide.find(">li").length > content_size && active_slide > 0){ active_slide -= content_size; @@ -259,7 +284,7 @@ var carousel_images_slide = $('.carousel_images_slide'); var carousel_images_slide_first_child = carousel_images_slide.find(">li").eq(active_slide); if(carousel_images_slide_first_child.length > 0){ - var content_size = Math.floor((carousel_images_slide.width() - Number.parseInt(carousel_images_slide.css('font-size')) * 3) / carousel_images_slide_first_child.width()); + var content_size = Math.floor((carousel_images_slide.outerWidth() - Number.parseInt(carousel_images_slide.css('font-size')) * 3) / carousel_images_slide_first_child.outerWidth(true)); content_size = Math.max(content_size,1); var li_length = carousel_images_slide.find(">li").length; if(li_length > content_size){ @@ -307,7 +332,7 @@ var carousel_images_slide = $('.carousel_images_slide'); var carousel_images_slide_first_child = carousel_images_slide.find(">li").eq(active_slide); if(carousel_images_slide_first_child.length > 0){ - var content_size = Math.floor((carousel_images_slide.width() - Number.parseInt(carousel_images_slide.css('font-size')) * 3) / carousel_images_slide_first_child.width()); + var content_size = Math.floor((carousel_images_slide.outerWidth() - Number.parseInt(carousel_images_slide.css('font-size')) * 3) / carousel_images_slide_first_child.outerWidth(true)); content_size = Math.max(content_size,1); carousel_images_slide.find(">li").css("display","none"); var active_count = carousel_images_slide.find(">li").length - active_slide; diff --git a/modules/member/show.html.erb b/modules/member/show.html.erb index cda8c07..66c0f89 100644 --- a/modules/member/show.html.erb +++ b/modules/member/show.html.erb @@ -76,11 +76,16 @@ for ( var i = 0; i < $('tr[data-list="pd_title"]').length ; i++ ) { } } -$('.tab-pane table').DataTable({ - searching: false, - paging: false, - ordering: false, - info: false, - order: false -}); +$('.tab-pane table').each(function(){ + if($(this).find('thead').length!=0 && $(this).find('td').length!=0 && !$(this).hasClass('dataTable')){ + $(this).DataTable({ + searching: false, + paging: false, + ordering: false, + info: false, + order: false, + autoWidth: false + }); + } +});; diff --git a/modules/personal_activity/index.html.erb b/modules/personal_activity/index.html.erb index e32c44d..6c80469 100644 --- a/modules/personal_activity/index.html.erb +++ b/modules/personal_activity/index.html.erb @@ -26,10 +26,15 @@ {{pagination_goes_here}} diff --git a/modules/personal_book/index_search1.html.erb b/modules/personal_book/index_search1.html.erb index bd3eeea..2e91d5a 100644 --- a/modules/personal_book/index_search1.html.erb +++ b/modules/personal_book/index_search1.html.erb @@ -23,7 +23,7 @@ $( ".selectbox" ).ready(function() { Clear
- +
diff --git a/modules/personal_conference/index_search1.html.erb b/modules/personal_conference/index_search1.html.erb index 80a021f..eb7fa8e 100644 --- a/modules/personal_conference/index_search1.html.erb +++ b/modules/personal_conference/index_search1.html.erb @@ -23,7 +23,7 @@ $( ".selectbox" ).ready(function() { Clear -
{{head-title}}
+
diff --git a/modules/personal_course/index.html.erb b/modules/personal_course/index.html.erb index 87eb4cb..53f10cc 100644 --- a/modules/personal_course/index.html.erb +++ b/modules/personal_course/index.html.erb @@ -22,10 +22,15 @@ {{pagination_goes_here}} \ No newline at end of file diff --git a/modules/personal_honor/index.html.erb b/modules/personal_honor/index.html.erb index bab8aec..119a0b9 100644 --- a/modules/personal_honor/index.html.erb +++ b/modules/personal_honor/index.html.erb @@ -16,10 +16,15 @@ \ No newline at end of file diff --git a/modules/personal_journal/index_search1.html.erb b/modules/personal_journal/index_search1.html.erb index b9d7958..c4f71a1 100644 --- a/modules/personal_journal/index_search1.html.erb +++ b/modules/personal_journal/index_search1.html.erb @@ -23,7 +23,7 @@ $( ".selectbox" ).ready(function() { Clear -
{{head-title}}
+
diff --git a/modules/personal_lab/index.html.erb b/modules/personal_lab/index.html.erb index 956b7a2..a469853 100644 --- a/modules/personal_lab/index.html.erb +++ b/modules/personal_lab/index.html.erb @@ -31,10 +31,15 @@ for ( var i = 0; i < $('thead th').length ; i++ ) { } } -$('table.personal-lab').DataTable({ - searching: false, - paging: false, - ordering: false, - info: false -}); +$('table.personal-lab').each(function(){ + if($(this).find('thead').length!=0 && $(this).find('td').length!=0 && !$(this).hasClass('dataTable')){ + $(this).DataTable({ + searching: false, + paging: false, + ordering: false, + info: false, + autoWidth: false + }); + } +});; \ No newline at end of file diff --git a/modules/personal_patent/index_search1.html.erb b/modules/personal_patent/index_search1.html.erb index 856793b..03eb09f 100644 --- a/modules/personal_patent/index_search1.html.erb +++ b/modules/personal_patent/index_search1.html.erb @@ -23,7 +23,7 @@ $( ".selectbox" ).ready(function() { Clear -
{{head-title}}
+
diff --git a/modules/personal_research/index.html.erb b/modules/personal_research/index.html.erb index c9625ef..180bbab 100644 --- a/modules/personal_research/index.html.erb +++ b/modules/personal_research/index.html.erb @@ -31,10 +31,15 @@ for ( var i = 0; i < $('thead th').length ; i++ ) { } } -$('table.personal-researchs').DataTable({ - searching: false, - paging: false, - ordering: false, - info: false -}); +$('table.personal-researchs').each(function(){ + if($(this).find('thead').length!=0 && $(this).find('td').length!=0 && !$(this).hasClass('dataTable')){ + $(this).DataTable({ + searching: false, + paging: false, + ordering: false, + info: false, + autoWidth: false + }); + } +});; \ No newline at end of file diff --git a/modules/ruling_bus/_ruling_bus_widget1.html.erb b/modules/ruling_bus/_ruling_bus_widget1.html.erb new file mode 100644 index 0000000..4ec8f60 --- /dev/null +++ b/modules/ruling_bus/_ruling_bus_widget1.html.erb @@ -0,0 +1,57 @@ +
+
+
+
+ + {{bus_title}} +
+
+
+
+
+ {{route_name}}: + {{time_to_arrive}} +
+
+
+
+
+ + diff --git a/modules/ruling_bus/info.json b/modules/ruling_bus/info.json new file mode 100644 index 0000000..f831a6a --- /dev/null +++ b/modules/ruling_bus/info.json @@ -0,0 +1,14 @@ +{ + "frontend": [ + ], + "widgets" : [ + { + "filename" : "ruling_bus_widget1", + "name" : { + "zh_tw" : "1. 公車呈現樣式1", + "en" : "1. Bus layout 1" + }, + "thumbnail" : "bus1_thumbs.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 5b3ef48..80c965b 100644 --- a/modules/web_resource/_web_res_widget1.html.erb +++ b/modules/web_resource/_web_res_widget1.html.erb @@ -4,6 +4,9 @@
  • +
    + {{img_description}} +
    {{title}} {{status}} diff --git a/modules/web_resource/_web_res_widget2.html.erb b/modules/web_resource/_web_res_widget2.html.erb index b85221e..017ce7f 100644 --- a/modules/web_resource/_web_res_widget2.html.erb +++ b/modules/web_resource/_web_res_widget2.html.erb @@ -4,6 +4,9 @@
    • +
      + {{img_description}} +
      {{title}} {{status}} diff --git a/modules/web_resource/web_res_index1.html.erb b/modules/web_resource/web_res_index1.html.erb index f225a23..040dde9 100644 --- a/modules/web_resource/web_res_index1.html.erb +++ b/modules/web_resource/web_res_index1.html.erb @@ -4,13 +4,18 @@ diff --git a/modules/web_resource/web_res_index2.html.erb b/modules/web_resource/web_res_index2.html.erb index 6432ea6..86db2aa 100644 --- a/modules/web_resource/web_res_index2.html.erb +++ b/modules/web_resource/web_res_index2.html.erb @@ -4,13 +4,20 @@ diff --git a/partial/_head.html.erb b/partial/_head.html.erb index eb7cc41..e13d0c7 100644 --- a/partial/_head.html.erb +++ b/partial/_head.html.erb @@ -1,3 +1,4 @@ +<%= render 'shared/ie_html5_fix' %> <%= favicon_link_tag (current_site.favicon.blank? ? 'favicon.ico' : current_site.favicon.url) %> @@ -9,18 +10,10 @@ <%= javascript_include_tag "plugin/modernizr.js"%> <%= javascript_include_tag "plugin/picturefill.min.js"%> - <%= javascript_include_tag "jquery.min"%> - <%= javascript_include_tag "jquery_prefix"%> - <%= javascript_include_tag "jquery.min"%> - <%= javascript_include_tag "jquery_prefix"%> <%= javascript_include_tag "plugin/jquery.mobile.custom.min.js"%> <%= javascript_include_tag "bootstrap.min"%> <%= javascript_include_tag "bootstrap.min"%> - <%= javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/jquery.cycle2/20140415/jquery.cycle2.min.js"%> - <%= javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/jquery.cycle2/20140415/jquery.cycle2.carousel.min.js"%> - <%= javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/jquery.cycle2/20140415/jquery.cycle2.scrollVert.min.js"%> - <%= javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/jquery.cycle2/20140415/jquery.cycle2.tile.min.js"%> <%= javascript_include_tag "plugin/jquery.cycle2.video.min.js"%> <%= javascript_include_tag "plugin/jquery-bullseye-min.js"%> <%= javascript_include_tag "plugin/jquery.scrolling-tabs.min.js"%> @@ -29,15 +22,10 @@ - <%= javascript_include_tag "//cdn.datatables.net/1.10.7/js/jquery.dataTables.min.js"%> - <%= javascript_include_tag "//cdn.datatables.net/responsive/1.0.7/js/dataTables.responsive.min.js"%> - <%= stylesheet_link_tag "//cdn.datatables.net/responsive/1.0.7/css/responsive.dataTables.min.css"%> - <%= javascript_include_tag "app"%> <%= javascript_include_tag "#{@dataApi}" if @dataApi != nil%> <%= render_google_analytics %> diff --git a/widgets/site_menu_widget/_site_menu_widget1.html.erb b/widgets/site_menu_widget/_site_menu_widget1.html.erb index 99b9454..149b3a0 100644 --- a/widgets/site_menu_widget/_site_menu_widget1.html.erb +++ b/widgets/site_menu_widget/_site_menu_widget1.html.erb @@ -3,7 +3,7 @@ /accesskey" title="Sitemenu">:::

      {{widget_title}}

        -
      • +
      • {{page_name}}
        • diff --git a/widgets/site_menu_widget/_site_menu_widget2.html.erb b/widgets/site_menu_widget/_site_menu_widget2.html.erb index 8462dc4..9b5f716 100644 --- a/widgets/site_menu_widget/_site_menu_widget2.html.erb +++ b/widgets/site_menu_widget/_site_menu_widget2.html.erb @@ -3,7 +3,7 @@ /accesskey" title="Sitemenu">:::

          {{widget_title}}

{{head-title}}