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/base/_go_back_top.scss b/assets/stylesheets/template/base/_go_back_top.scss index 8e93acc..1e3c938 100644 --- a/assets/stylesheets/template/base/_go_back_top.scss +++ b/assets/stylesheets/template/base/_go_back_top.scss @@ -14,6 +14,7 @@ color: $theme-white; font-size: 0.75em; border-radius: 2px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); z-index: 1050; &:hover { diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss index 8ecb517..5f23eb9 100644 --- a/assets/stylesheets/template/layout/header.scss +++ b/assets/stylesheets/template/layout/header.scss @@ -63,6 +63,7 @@ top: 15px; padding: 14px 10px; border-radius: 2px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); border-width: 2px; margin: 0; background-color: $theme-gray-dark; diff --git a/assets/stylesheets/template/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss index e11c74f..1deafd8 100644 --- a/assets/stylesheets/template/modules/ad_banner.scss +++ b/assets/stylesheets/template/modules/ad_banner.scss @@ -45,6 +45,7 @@ width: 0.8em; height: 0.8em; border-radius: 50%; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); opacity: .5; } diff --git a/assets/stylesheets/template/modules/announcement.scss b/assets/stylesheets/template/modules/announcement.scss index f7e58f1..d9e2724 100644 --- a/assets/stylesheets/template/modules/announcement.scss +++ b/assets/stylesheets/template/modules/announcement.scss @@ -142,6 +142,7 @@ float: none; margin: auto; border-radius: 50%; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); width: 200px; height: 200px; } @@ -720,6 +721,7 @@ color: #fff; font-size: 0.6875em; border-radius: 4px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); padding: 2px 6px; background-color: $theme-gray-light; } diff --git a/assets/stylesheets/template/modules/archives.scss b/assets/stylesheets/template/modules/archives.scss index dfbef8e..1e23cf9 100644 --- a/assets/stylesheets/template/modules/archives.scss +++ b/assets/stylesheets/template/modules/archives.scss @@ -94,6 +94,7 @@ margin: 0 0.625rem 15px 0; padding: 8px 12px; border-radius: 2px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); border: 1px solid lighten($theme-gray-light, 10%); } @@ -167,6 +168,7 @@ padding: 10px 12px; margin-right: 5px; border-radius: 4px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); font-size: 0.9375em; &:hover { diff --git a/assets/stylesheets/template/modules/gallery.scss b/assets/stylesheets/template/modules/gallery.scss index 22b1d06..80deffa 100644 --- a/assets/stylesheets/template/modules/gallery.scss +++ b/assets/stylesheets/template/modules/gallery.scss @@ -84,7 +84,7 @@ background: lighten($theme-gray, 60%); margin-bottom: 20px; border-radius: 2px; - + behavior: url("/assets/ie_support/PIE2/PIE.htc"); @media screen and (max-width: $screen-sm) { margin-right: 20px; margin-left: 20px; @@ -97,6 +97,7 @@ .index-img { border-radius: 2px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); } .index-content-title { @@ -128,6 +129,7 @@ width: 100%; height: auto; border-radius: 2px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); } .show-content-inner { diff --git a/assets/stylesheets/template/modules/member.scss b/assets/stylesheets/template/modules/member.scss index 5fa96a5..a230f6c 100644 --- a/assets/stylesheets/template/modules/member.scss +++ b/assets/stylesheets/template/modules/member.scss @@ -90,6 +90,7 @@ .i-member-item { background: #f1f1f1 none repeat scroll 0 0; border-radius: 5px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); float: none; margin: 0 1% 30px; padding: 20px; diff --git a/assets/stylesheets/template/modules/menu.scss b/assets/stylesheets/template/modules/menu.scss index 1dc834c..6644fc3 100644 --- a/assets/stylesheets/template/modules/menu.scss +++ b/assets/stylesheets/template/modules/menu.scss @@ -58,6 +58,7 @@ font-size: 1em; text-align: center; border-radius: 2px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); z-index: 1; } diff --git a/assets/stylesheets/template/modules/text_marquee.scss b/assets/stylesheets/template/modules/text_marquee.scss index dd4ea67..e6cf549 100644 --- a/assets/stylesheets/template/modules/text_marquee.scss +++ b/assets/stylesheets/template/modules/text_marquee.scss @@ -3,6 +3,7 @@ background: rgba(255,255,255,0.1); border: 1px solid rgba(0,0,0,0.1); border-radius: 5px; + behavior: url("/assets/ie_support/PIE2/PIE.htc"); font-size: 0.9375em; list-style: outside none none; margin: 0 0 30px; 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 0c77a25..aa5f20c 100644 --- a/modules/active/info.json +++ b/modules/active/info.json @@ -1,12 +1,28 @@ -{ - "frontend": [ - { - "filename" : "active_index", - "name" : { - "zh_tw" : "1. 列表", - "en" : "1. List" - }, - "thumbnail" : "thumb.png" - } - ] +{ + "frontend": [ + { + "filename" : "active_index", + "name" : { + "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 ef9dd97..8c32071 100644 --- a/modules/ad_banner/_ad_banner_widget1.html.erb +++ b/modules/ad_banner/_ad_banner_widget1.html.erb @@ -1,30 +1,82 @@ -
-
+
-
- + + + +
-
- +
+ + +
- - + + \ 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 2a791ba..0c82e07 100644 --- a/modules/ad_banner/_ad_banner_widget2_video.html.erb +++ b/modules/ad_banner/_ad_banner_widget2_video.html.erb @@ -1,25 +1,37 @@ -
-
+
+ data-cycle-swipe="true" + data-cycle-prev=".banner_prev" + data-cycle-next=".banner_next" + data-cycle-pause-on-hover="true" + style="padding-bottom: 56.25%;" + > {{html}}
- +
+ + +
    + + +
+
\ No newline at end of file + + \ No newline at end of file diff --git a/modules/announcement/_annc_widget15.html.erb b/modules/announcement/_annc_widget15.html.erb index 3d66823..908b2bc 100644 --- a/modules/announcement/_annc_widget15.html.erb +++ b/modules/announcement/_annc_widget15.html.erb @@ -6,8 +6,8 @@ <%= (I18n.locale.to_s =="zh_tw") ? "更多最新消息" : "More NEWS" %>
- - + +
-
+
{{img_description}} {{img_description}}
@@ -44,9 +69,169 @@ +
+
+
+
+ +
+

{{description}}

+
+
+
+
+
+
    + + +
+
+
+

1/{{carousel_count}}

+
    +
  • +
    + {{description_text}} +
    +
    • +
+
    + + +
+
+
{{link_to_edit}} - + \ No newline at end of file diff --git a/modules/archive/info.json b/modules/archive/info.json index 3ccb465..f3147b0 100644 --- a/modules/archive/info.json +++ b/modules/archive/info.json @@ -1,54 +1 @@ -{ - "frontend": [ - { - "filename" : "archive_index1", - "name" : { - "zh_tw" : "1. 列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )", - "en" : "1. List (widget-title, category, filename, download link)" - }, - "thumbnail" : "thumb.png" - }, - { - "filename" : "archive_index2", - "name" : { - "zh_tw" : "2. 手風琴式列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )", - "en" : "2. Accordion list (widget-title, category, filename, download link)" - }, - "thumbnail" : "thumb.png" - }, - { - "filename" : "archive_index3", - "name" : { - "zh_tw" : "3. 列表( 無檔案名稱 ) ( 模組標題, 類別標題, 下載連結 )", - "en" : "3. List(no filename) (widget-title, category, download link)" - }, - "thumbnail" : "thumb.png" - }, - { - "filename" : "archive_index4", - "name" : { - "zh_tw" : "4. 手風琴式列表( 無檔案名稱 ( 模組標題, 類別標題, 下載連結 )", - "en" : "4. Accordion list(no filename) (widget-title, category, download link)" - }, - "thumbnail" : "thumb.png" - } - ], - "widgets" : [ - { - "filename" : "archive_widget1", - "name" : { - "zh_tw" : "1. 列表 ( 模組標題, 類別標題, 檔案名稱, 下載頁面連結 )", - "en" : "1. List (widget-title, category, link of download page)" - }, - "thumbnail" : "thumb.png" - }, - { - "filename" : "archive_widget2", - "name" : { - "zh_tw" : "2. 手風琴式列表 ( 模組標題, 類別標題, 下載頁面連結 )", - "en" : "2. Accordion list (widget-title, category, link of download page)" - }, - "thumbnail" : "thumb.png" - } - ] -} \ No newline at end of file +{"frontend":[{"filename":"archive_index1","name":{"zh_tw":"1. 列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )","en":"1. List (widget-title, category, filename, download link)"},"thumbnail":"thumb.png"},{"filename":"archive_index2","name":{"zh_tw":"2. 手風琴式列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )","en":"2. Accordion list (widget-title, category, filename, download link)"},"thumbnail":"thumb.png"},{"filename":"archive_index3","name":{"zh_tw":"3. 列表( 無檔案名稱 ) ( 模組標題, 類別標題, 下載連結 )","en":"3. List(no filename) (widget-title, category, download link)"},"thumbnail":"thumb.png"},{"filename":"archive_index4","name":{"zh_tw":"4. 手風琴式列表( 無檔案名稱 ( 模組標題, 類別標題, 下載連結 )","en":"4. Accordion list(no filename) (widget-title, category, download link)"},"thumbnail":"thumb.png"},{"filename":"archive_index7","name":{"zh_tw":"7. 表格列表 ( 模組標題, 類別標題, 檔案名稱, 檔案簡介, 下載連結 )","en":"7. Table list (widget-title, category, filename, download link)"},"thumbnail":"ar5.png"},{"filename":"archive_index8","name":{"zh_tw":"8. 表格列表 ( 模組標題, 檔案名稱, 檔案簡介, 下載連結 )","en":"8. Table list (widget-title, filename, download link)"},"thumbnail":"ar5.png"}],"widgets":[{"filename":"archive_widget1","name":{"zh_tw":"1. 列表 ( 模組標題, 類別標題, 檔案名稱, 下載頁面連結 )","en":"1. List (widget-title, category, link of download page)"},"thumbnail":"thumb.png"},{"filename":"archive_widget2","name":{"zh_tw":"2. 手風琴式列表 ( 模組標題, 類別標題, 下載頁面連結 )","en":"2. Accordion list (widget-title, category, link of download page)"},"thumbnail":"thumb.png"}]} \ No newline at end of file diff --git a/modules/faq/info.json b/modules/faq/info.json index 5c9e5fa..c21e0d0 100644 --- a/modules/faq/info.json +++ b/modules/faq/info.json @@ -1,22 +1,30 @@ { - "frontend": [ - { - "filename" : "faq_index1", - "name" : { - "zh_tw" : "1. 列表 ( 模組標題, 問題 )", - "en" : "1. Thumbnail ( widget-title, question )" - }, - "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. 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/gallery/_gallery_widget3.html.erb b/modules/gallery/_gallery_widget3.html.erb index 0400a9b..1778e3e 100644 --- a/modules/gallery/_gallery_widget3.html.erb +++ b/modules/gallery/_gallery_widget3.html.erb @@ -1,33 +1,19 @@ -
- -
- -
-
-
-
{{image_description}}
-
-
-
-
-
-
+
+

+ {{widget-title}} +

+
+
+ {{alt_title}} -
- - + + {{link_text}} +
-
- <%= locale == :en ? 'more' : '更多照片' %> -
-
+
\ No newline at end of file diff --git a/modules/gallery/_gallery_widget4.html.erb b/modules/gallery/_gallery_widget4.html.erb index 67da31d..0400a9b 100644 --- a/modules/gallery/_gallery_widget4.html.erb +++ b/modules/gallery/_gallery_widget4.html.erb @@ -1,38 +1,33 @@ -
-

- {{widget-title}} -

- -
-
-
-
- {{alt_title}} -
-

{{image_short_description}}

+
+ +
+ +
+
+
+
{{image_description}}
-
-
-
-

{{image_short_description}}

- {{image_description}} -
- - - - - - +
+
+ {{alt_title}}
-
+ +
-
\ No newline at end of file +
+ <%= locale == :en ? 'more' : '更多照片' %> +
+
diff --git a/modules/gallery/_gallery_widget5.html.erb b/modules/gallery/_gallery_widget5.html.erb index 70896f8..67da31d 100644 --- a/modules/gallery/_gallery_widget5.html.erb +++ b/modules/gallery/_gallery_widget5.html.erb @@ -1,72 +1,38 @@ -
+

{{widget-title}}

- <% OrbitHelper.render_css_in_head(["theater.css"]) %> - <%= javascript_include_tag "jquery.touchSwipe.min" %> - <%= javascript_include_tag "theater-widget" %> - <% OrbitHelper.render_meta_tags([{"name" => "mobile-web-app-capable","content" => "yes"},{"name" => "apple-mobile-web-app-status-bar-style","content" => "black-translucent"}]) %> -