From db27a67366747cee2c3825a26ed6059a2356a601 Mon Sep 17 00:00:00 2001
From: rulingcom <orbit@rulingcom.com>
Date: Fri, 3 Sep 2021 03:34:32 +0000
Subject: [PATCH] update template

---
 .../stylesheets/template/layout/content.scss  |  4 ++
 assets/stylesheets/template/layout/slide.scss |  4 +-
 modules/ad_banner/_ad_banner_widget1.html.erb | 29 +++++++---
 .../_ad_banner_widget2_video.html.erb         | 27 ++++++---
 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/member/show.html.erb                  | 19 ++++---
 modules/personal_activity/index.html.erb      | 17 ++++--
 modules/personal_course/index.html.erb        | 17 ++++--
 modules/personal_honor/index.html.erb         | 17 ++++--
 modules/personal_lab/index.html.erb           | 17 ++++--
 modules/personal_research/index.html.erb      | 17 ++++--
 .../ruling_bus/_ruling_bus_widget1.html.erb   | 57 +++++++++++++++++++
 modules/ruling_bus/info.json                  | 14 +++++
 .../_site_menu_widget1.html.erb               |  2 +-
 .../_site_menu_widget2.html.erb               |  2 +-
 18 files changed, 231 insertions(+), 80 deletions(-)
 create mode 100644 modules/ruling_bus/_ruling_bus_widget1.html.erb
 create mode 100644 modules/ruling_bus/info.json

diff --git a/assets/stylesheets/template/layout/content.scss b/assets/stylesheets/template/layout/content.scss
index df2fb0d..dfc653f 100644
--- a/assets/stylesheets/template/layout/content.scss
+++ b/assets/stylesheets/template/layout/content.scss
@@ -367,6 +367,8 @@ background: linear-gradient(
     height: 1025px;
     top: 164%;
     background: linear-gradient(338deg, transparent 63px, #fff 0);
+    -pie-background: linear-gradient(338deg, transparent 63px, #fff 0);
+    behavior: url("/assets/ie_support/PIE2/PIE.htc");
   }
   @media screen and (min-width:769px) and (max-width:1025px){
     height: 990px;
@@ -376,6 +378,8 @@ background: linear-gradient(
     top: 186%;
     height: 10405px;
     background: linear-gradient(338deg, transparent 38px, #fff 0);
+    -pie-background: linear-gradient(338deg, transparent 38px, #fff 0);
+    behavior: url("/assets/ie_support/PIE2/PIE.htc");
   }
   @media(max-width:$screen-xs){
     height: 2131px;
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/modules/ad_banner/_ad_banner_widget1.html.erb b/modules/ad_banner/_ad_banner_widget1.html.erb
index 405ffb8..8c32071 100644
--- a/modules/ad_banner/_ad_banner_widget1.html.erb
+++ b/modules/ad_banner/_ad_banner_widget1.html.erb
@@ -1,5 +1,5 @@
-<div class="w-ba-banner ad-banner-widget-1 ba-banner-widget-1">
-  <div class="w-ba-banner__wrap  cycle-slideshow"
+<div class="w-ad-banner w-ba-banner ad-banner-widget-1 ba-banner-widget-1">
+  <div class="w-ad-banner__wrap  w-ba-banner__wrap  cycle-slideshow"
       data-list="images"
       data-level="0"
       data-cycle-slides=".w-ba-banner__slide"
@@ -15,7 +15,7 @@
       data-cycle-swipe=true
       data-cycle-swipe-fx="scrollHorz"
     >
-    <div class="w-ba-banner__slide {{class}}"
+    <div class="w-ad-banner__slide w-ba-banner__slide {{class}}"
         data-link="{{link}}"
         data-cycle-title="{{title}}"
         data-cycle-desc="{{context}}"
@@ -23,13 +23,13 @@
         data-target="{{target}}"
       >
        <a href="{{link}}" target="{{target}}" title="{{alt_title}}">
-           <img class="w-ba-banner__image banner-responsive" src="{{image_link}}" alt="{{alt_title}}">
+           <img class="w-ad-banner__image w-ba-banner__image banner-responsive" src="{{image_link}}" alt="{{alt_title}}">
        </a>
 
     </div>
   </div>
-  <div class="ad-overlay w-ba-banner__caption w-ad-banner__caption w-ad-banner__overlay_{{subpart-id}}"></div>
-    <div class="w-ba-banner__caption banner-pager banner_caption_{{subpart-id}}" data-list="images" data-level="0">
+  <div class="w-ad-banner__caption ad-overlay w-ba-banner__caption w-ad-banner__caption w-ad-banner__overlay_{{subpart-id}}"></div>
+    <div class="w-ad-banner__pager-1 w-ba-banner__caption banner-pager banner_caption_{{subpart-id}}" data-list="images" data-level="0">
       <li><button title="Slide {{slide_number}}"><span style="display: none;">Slide {{slide_number}}</span></button></li>
     </div>
     <ul class="controlplay"><a class="resume-slide active" title = "<%= (I18n.locale.to_s =="zh_tw") ? "繼續播放" : "resume" %>"><i></i></a><a class="pause-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "暫停播放" : "pause"%>"><i></i></a></ul>
@@ -60,10 +60,23 @@
   
 </script>
 <style type="text/css">
-  .controlplay .resume-slide.active i{
+  .w-ba-banner .controlplay .resume-slide.active i{
     color: #32D9C3;
   }
-  .controlplay .pause-slide.active i{
+  .w-ba-banner .controlplay .pause-slide.active i{
     color: #ff4500;
   }
+  .w-ba-banner .controlplay{
+    width: auto;
+  }
+  .w-ba-banner .button-mid{
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+  }
+  .next-button,.prev-button{
+    cursor: pointer;
+  }
 </style>
\ 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 c80bb92..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 @@
-<div class="w-ba-banner ba-banner-widget-1 ba-banner-widget-youtube">
-  <div class="w-ba-banner__wrap  cycle-slideshow"
+<div class="w-ad-banner ad-banner-widget-2 w-ba-banner ba-banner-widget-1 ba-banner-widget-youtube">
+  <div class="w-ad-banner__wrap  w-ba-banner__wrap  cycle-slideshow"
       data-list="images"
       data-level="0"
       data-cycle-slides=".w-ba-banner__slide"
@@ -25,11 +25,11 @@
     {{html}}
   </div>
   <div class="ad-overlay w-ad-banner__overlay_{{subpart-id}}"></div>
-    <div class="w-ba-banner__caption banner-pager banner_caption_{{subpart-id}}"></div>
+    <div class="w-ba-banner__caption w-ad-banner__pager-2 banner-pager banner_caption_{{subpart-id}}"></div>
     <ul class="controlplay"><a class="resume-slide active" title = "<%= (I18n.locale.to_s =="zh_tw") ? "繼續播放" : "resume" %>"><i></i></a><a class="pause-slide" title = "<%= (I18n.locale.to_s =="zh_tw") ? "暫停播放" : "pause"%>"><i></i></a></ul>
     <ul class="button-mid">
-      <i class="fa fa-angle-left prev-button" aria-hidden="true" title = "<%= (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" %>" style="cursor: pointer;"></i>
-      <i class="fa fa-angle-right next-button" aria-hidden="true" title = "<%= (I18n.locale.to_s =="zh_tw") ? "下一張" : "next" %>" style="cursor: pointer;"></i>
+      <i class="fa fa-angle-left prev-button" aria-hidden="true" title = "<%= (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev" %>"></i>
+      <i class="fa fa-angle-right next-button" aria-hidden="true" title = "<%= (I18n.locale.to_s =="zh_tw") ? "下一張" : "next" %>"></i>
     </ul>
   </div>
 </div>
@@ -178,10 +178,23 @@ if (typeof onYouTubeIframeAPIReady !== 'function'){
 }
 </script>
 <style type="text/css">
-  .controlplay .resume-slide.active i{
+  .w-ba-banner .controlplay .resume-slide.active i{
     color: #32D9C3;
   }
-  .controlplay .pause-slide.active i{
+  .w-ba-banner .controlplay .pause-slide.active i{
     color: #ff4500;
   }
+  .w-ba-banner .controlplay{
+    width: auto;
+  }
+  .w-ba-banner .button-mid{
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+  }
+  .next-button,.prev-button{
+    cursor: pointer;
+  }
 </style>
\ No newline at end of file
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}}
 
 <script>
-$('.i-annc__table').DataTable({
-  searching: false,
-  paging:   false,
-  ordering: false,
-  info:     false
-});
+$('.i-annc__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,
+      autoWidth: false
+    });
+  }
+});;
 </script>
\ 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}}
 
 <script>
-$('.i-annc__table').DataTable({
-  searching: false,
-  paging:   false,
-  ordering: false,
-  info:     false
-});
+$('.i-annc__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,
+      autoWidth: false
+    });
+  }
+});;
 </script>
\ 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}}
 
 <script>
-$('.i-annc__table').DataTable({
-  searching: false,
-  paging:   false,
-  ordering: false,
-  info:     false
-});
+$('.i-annc__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,
+      autoWidth: false
+    });
+  }
+});;
 </script>
\ 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}}
 
 <script>
-$('.i-annc__table').DataTable({
-  searching: false,
-  paging:   false,
-  ordering: false,
-  info:     false
-});
+$('.i-annc__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,
+      autoWidth: false
+    });
+  }
+});;
 </script>
\ No newline at end of file
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
+    });
+  }
+});;
 </script>
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}}
 
 <script>
-$('table.activities-index').DataTable({
-  searching: false,
-  paging:   false,
-  ordering: false,
-  info:     false
-});
+$('table.activities-index').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
+    });
+  }
+});;
 </script>
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}}
 
 <script>
-$('table.courses-index').DataTable({
-  searching: false,
-  paging:   false,
-  ordering: false,
-  info:     false
-});
+$('table.courses-index').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
+    });
+  }
+});;
 </script>
\ 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 @@
 <script>
 $('thead th.col-md-2:nth-child(2)').addClass('min-tablet-l');
 $('thead th.col-md-2:nth-child(5)').addClass('min-tablet');
-$('table.personal-honor').DataTable({
-  searching: false,
-  paging:   false,
-  ordering: false,
-  info:     false
-});
+$('table.personal-honor').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
+    });
+  }
+});;
 </script>
\ No newline at end of file
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
+    });
+  }
+});;
 </script>
\ No newline at end of file
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
+    });
+  }
+});;
 </script>
\ 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 @@
+<div id="{{update_id}}" class="bus_widget1" data-list="bus_infos" data-level="0">
+  <div class="bus_info" id="{{bus_id}}">
+    <div class="row mt-10">
+      <div class="col-sm-12 bus_title">
+        <i class="fa fa-bus"></i>
+        <strong>{{bus_title}}</strong>
+      </div>
+    </div>
+    <div class="row bus_data" data-list="bus_data" data-level="1">
+        <div class="col-sm-6">
+          <div>
+            <strong class="route_name">{{route_name}}:</strong>
+            <span class="bus_time">{{time_to_arrive}}</span>
+          </div>
+        </div>
+    </div>
+  </div>
+</div>
+<script type="text/javascript">
+  function update_bus(ele){
+    var $self = $(ele);
+    var bus_info_ids = $.map($self.find('.bus_info'),function(v){
+      return $(v).attr('id');
+    });
+    $.{{update_method}}( "{{update_url}}",
+      {
+        bus_info_ids: bus_info_ids
+      }, function( data ) {
+        $.each(data,function(k,v){
+          var bus_info = $self.find('#'+k);
+          var bus_route_names = $.map(bus_info.find('.route_name'),function(v1){
+            return $(v1).text().slice(0,-1)
+          });
+          var bus_time_span = bus_info.find('.bus_time');
+          $.each(v,function(k,v1){
+            var i = bus_route_names.indexOf(v1.route_name);
+            if (i>=0){
+              bus_time_span.eq(i).html(v1.time_to_arrive);
+            }
+          })
+        })
+        window.setTimeout(function(){
+          update_bus(ele);
+        },{{update_interval}});
+    });
+  }
+  function update_interval_bus(ele) {
+    window.setTimeout(function(){
+      update_bus(ele);
+    },{{update_interval}});
+  }
+  update_interval_bus($('#{{update_id}}[data-list="bus_infos"]')[0]);
+</script>
+<style type="text/css">
+  .bus_widget1 {margin-top: 1em;}
+  .bus_info {line-height: 1.8;}
+</style>
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/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 @@
 	<a id="accesskey_sitemenu" accesskey="S" href="/<%= "#{locale.to_s}" %>/accesskey" title="Sitemenu">:::</a>
 	<h3 class="sitemenu-title">{{widget_title}}</h3>
 	<ul data-list="pages" class="sitemenu-list level-1 list-unstyled" data-level="0">
-		<li class="sitemenu-item level-1">
+		<li class="sitemenu-item level-1 {{active_class}}">
 			<a class="sitemenu-link level-1" href="{{url}}" target="{{target}}">{{page_name}}</a>
 			<ul class="sitemenu-list level-2" data-list="children" data-level="1">
 				<li class="sitemenu-item level-2" style="position: relative;">
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 @@
 	<a id="accesskey_sitemenu" accesskey="S" href="/<%= "#{locale.to_s}" %>/accesskey" title="Sitemenu">:::</a>
 	<h3 class="sitemenu-title">{{widget_title}}</h3>
 	<ul data-list="pages" class="sitemenu-list level-1 list-unstyled" data-level="0">
-		<li class="sitemenu-item level-1">
+		<li class="sitemenu-item level-1 {{active_class}}">
 			<a class="sitemenu-link level-1" href="{{url}}" target="{{target}}">{{page_name}}</a>
 			<ul class="sitemenu-list level-2" data-list="children" data-level="1">
 				<li class="sitemenu-item level-2" style="position: relative;">