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/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss index 2e7afd8..83422d4 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/modules/active/active_index.html.erb b/modules/active/active_index.html.erb index d35bb2a..3bb4e90 100644 --- a/modules/active/active_index.html.erb +++ b/modules/active/active_index.html.erb @@ -1,6 +1,6 @@ @@ -14,10 +14,15 @@ - - - - + + + +
-

{{page-title}}

+

{{page-title}}
{{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 @@ -
-
+
-
- +
-
- +
+
-
+
{{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/faq/faq_index3.html.erb b/modules/faq/faq_index3.html.erb new file mode 100644 index 0000000..cce43c1 --- /dev/null +++ b/modules/faq/faq_index3.html.erb @@ -0,0 +1,31 @@ +
+

+ {{page-title}} +

+
    +
  • +

    + {{question}} + + {{status}} + +

    +
    +

    {{answer}}

    + +
    +
    • +
+
+{{pagination_goes_here}} + + \ No newline at end of file diff --git a/modules/faq/info.json b/modules/faq/info.json index 08be0b4..9af6193 100644 --- a/modules/faq/info.json +++ b/modules/faq/info.json @@ -1,30 +1,38 @@ { - "frontend": [ - { - "filename" : "faq_index1", - "name" : { - "zh_tw" : "1. 列表 ( 模組標題, 問題 )", - "en" : "1. Thumbnail ( widget-title, question )" - }, - "thumbnail" : "thumb.png" - }, - { - "filename" : "faq_index2", - "name" : { - "zh_tw" : "2. 列表 ( 模組標題, 問題, 答案 )", - "en" : "2. Thumbnail ( widget-title, question, answer )" - }, - "thumbnail" : "thumb.png" - } - ], - "widgets" : [ - { - "filename" : "faq_widget1", - "name" : { - "zh_tw" : "1. 列表 ( 模組標題, 問題 )", - "en" : "1. List (widget-title, question)" - }, - "thumbnail" : "thumb.png" - } - ] + "frontend": [ + { + "filename": "faq_index1", + "name": { + "zh_tw": "1. 列表 ( 模組標題, 問題 )", + "en": "1. Thumbnail ( widget-title, question )" + }, + "thumbnail": "thumb.png" + }, + { + "filename": "faq_index2", + "name": { + "zh_tw": "2. 列表 ( 模組標題, 問題, 答案 )", + "en": "2. Thumbnail ( widget-title, question, answer )" + }, + "thumbnail": "thumb.png" + }, + { + "filename": "faq_index3", + "name": { + "zh_tw": "3. 手風琴列表 ( 模組標題, 問題 )", + "en": "3. Accordion list ( widget-title, question )" + }, + "thumbnail": "thumb.png" + } + ], + "widgets": [ + { + "filename": "faq_widget1", + "name": { + "zh_tw": "1. 列表 ( 模組標題, 問題 )", + "en": "1. List (widget-title, question)" + }, + "thumbnail": "thumb.png" + } + ] } \ No newline at end of file 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_college_project/index.html.erb b/modules/personal_college_project/index.html.erb index 3bc497f..45e79de 100644 --- a/modules/personal_college_project/index.html.erb +++ b/modules/personal_college_project/index.html.erb @@ -38,10 +38,15 @@ {{pagination_goes_here}} \ No newline at end of file diff --git a/modules/personal_college_project/index_search1.html.erb b/modules/personal_college_project/index_search1.html.erb index 2935f42..cf5a5e3 100644 --- a/modules/personal_college_project/index_search1.html.erb +++ b/modules/personal_college_project/index_search1.html.erb @@ -63,10 +63,15 @@ $( ".selectbox" ).ready(function() { {{pagination_goes_here}} \ No newline at end of file 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_create_design/index.html.erb b/modules/personal_create_design/index.html.erb index fd9be57..10c16dc 100644 --- a/modules/personal_create_design/index.html.erb +++ b/modules/personal_create_design/index.html.erb @@ -30,10 +30,15 @@ {{pagination_goes_here}} \ No newline at end of file diff --git a/modules/personal_create_design/index_search1.html.erb b/modules/personal_create_design/index_search1.html.erb index 128d0cc..e6703bb 100644 --- a/modules/personal_create_design/index_search1.html.erb +++ b/modules/personal_create_design/index_search1.html.erb @@ -55,10 +55,15 @@ $( ".selectbox" ).ready(function() { {{pagination_goes_here}} \ 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_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_tec_transfer/index.html.erb b/modules/personal_tec_transfer/index.html.erb index f67683a..8a5f33c 100644 --- a/modules/personal_tec_transfer/index.html.erb +++ b/modules/personal_tec_transfer/index.html.erb @@ -34,10 +34,15 @@ {{pagination_goes_here}} \ No newline at end of file diff --git a/modules/personal_tec_transfer/index_search1.html.erb b/modules/personal_tec_transfer/index_search1.html.erb index 33ae884..cc8419f 100644 --- a/modules/personal_tec_transfer/index_search1.html.erb +++ b/modules/personal_tec_transfer/index_search1.html.erb @@ -59,10 +59,15 @@ $( ".selectbox" ).ready(function() { {{pagination_goes_here}} \ 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 d5c63ae..b6ccb63 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) %> @@ -8,14 +9,8 @@ <%= 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 "plugin/jquery.mobile.custom.min.js"%> <%= 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 "app"%> @@ -23,6 +18,5 @@ <%= 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}}