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 0000000..0a58044 Binary files /dev/null and b/modules/active/thumbs/active_index1_thumbs.png differ diff --git a/modules/active/thumbs/active_index2_thumbs.png b/modules/active/thumbs/active_index2_thumbs.png new file mode 100644 index 0000000..b69abd9 Binary files /dev/null and b/modules/active/thumbs/active_index2_thumbs.png differ 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 @@ -
-
+
-
- +
-
- +
+ -
+
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}}