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/content.scss b/assets/stylesheets/template/layout/content.scss index 7e6d611..8a296a9 100644 --- a/assets/stylesheets/template/layout/content.scss +++ b/assets/stylesheets/template/layout/content.scss @@ -7,6 +7,8 @@ padding-bottom: 6em; background-color: #fff; background-image: linear-gradient(180deg, transparent 0, rgba(191,139,61,0.1) 100%); + -pie-background: linear-gradient(180deg, transparent 0, rgba(191,139,61,0.1) 100%); + behavior: url("/assets/ie_support/PIE2/PIE.htc"); .container { @extend .response-container; } diff --git a/assets/stylesheets/template/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss index 0a0fbbd..08bf5b4 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, 0.5) 20%, #000000a3); + -pie-background:linear-gradient(180deg, transparent 0, rgba(0, 0, 0, 0.5) 20%, #000000a3); + behavior: url("/assets/ie_support/PIE2/PIE.htc"); padding: 1.5em 1em; h3 { margin: 0; @@ -84,6 +86,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 840ed61..e17b700 100644 --- a/assets/stylesheets/template/modules/announcement.scss +++ b/assets/stylesheets/template/modules/announcement.scss @@ -873,6 +873,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 } @@ -893,6 +894,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% } @@ -914,6 +916,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 } @@ -967,6 +970,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 4aa4bc5..8c32071 100644 --- a/modules/ad_banner/_ad_banner_widget1.html.erb +++ b/modules/ad_banner/_ad_banner_widget1.html.erb @@ -1,5 +1,5 @@ -
-
+
-
- -
-
+
- - -
+ \ 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 003f7d8..0c82e07 100644 --- a/modules/ad_banner/_ad_banner_widget2_video.html.erb +++ b/modules/ad_banner/_ad_banner_widget2_video.html.erb @@ -1,8 +1,7 @@ -
-
+
{{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 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/info.json b/modules/announcement/info.json index 5666e86..561f63b 100644 --- a/modules/announcement/info.json +++ b/modules/announcement/info.json @@ -1,262 +1,278 @@ { - "frontend": [ - { - "filename" : "annc_index1", - "name" : { - "zh_tw" : "1. 標準標題列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )", - "en" : "1. Standard Title List-1 (widget-title, category, status, title, postdate)" - }, - "thumbnail" : "annc_index1_thumbs.png" - }, - { - "filename" : "annc_index2", - "name" : { - "zh_tw" : "2. 標準標題列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )", - "en" : "2. Standard Title List-2 (widget-title, postdate, status, title, category)" - }, - "thumbnail" : "annc_index2_thumbs.png" - }, - { - "filename" : "annc_index3", - "name" : { - "zh_tw" : "3. 精簡標題列表-1 ( 模組標題, 狀態, 標題, 日期 )", - "en" : "3. Simple Title List-1 (widget-title, status, title, postdate)" - }, - "thumbnail" : "annc_index3_thumbs.png" - }, - { - "filename" : "annc_index4", - "name" : { - "zh_tw" : "4. 精簡標題列表-2 ( 模組標題, 日期, 狀態, 標題 )", - "en" : "4. Simple Title List-2 (widget-title, postdate, status, title)" - }, - "thumbnail" : "annc_index4_thumbs.png" - }, - { - "filename" : "annc_index5", - "name" : { - "zh_tw" : "5. 左圖右文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", - "en" : "5. Balanced Image + Text(Left) (widget-title, image, status, postdate, category, title, subtitle)" - }, - "thumbnail" : "annc_index5_thumbs.png" - }, - { - "filename" : "annc_index6", - "name" : { - "zh_tw" : "6. 右圖左文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", - "en" : "6. Balanced Image + Text(Right) (widget-title, image, status, postdate, category, title, subtitle)" - }, - "thumbnail" : "annc_index6_thumbs.png" - }, - { - "filename" : "annc_index7", - "name" : { - "zh_tw" : "7. 三欄圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", - "en" : "7. 3-Column Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)" - }, - "thumbnail" : "annc_index7_thumbs.png" - }, - { - "filename" : "annc_index8", - "name" : { - "zh_tw" : "8. 標準文字列表 ( 模組標題, 日期, 類別, 狀態, 標題, 副標題 )", - "en" : "8. Standard Text List (widget-title, postdate, category, status, title, subtitle)" - }, - "thumbnail" : "annc_index8_thumbs.png" - }, - { - "filename" : "annc_index9", - "name" : { - "zh_tw" : "9. 標準文字列表三欄 ( 模組標題, 日期, 類別, 狀態, 標題, 副標題 )", - "en" : "9. 3-Column Standard Text List (widget-title, postdate, category, status, title, subtitle)" - }, - "thumbnail" : "annc_index9_thumbs.png" - }, - { - "filename" : "annc_index10", - "name" : { - "zh_tw" : "10. 連結 + 附件表格列表 ( 模組標題, 類別, 狀態, 標題 )", - "en" : "10. Table List including Links and attachments (widget-title, category, status, title, view-count)" - }, - "thumbnail" : "annc_index10_thumbs.png" - }, - { - "filename" : "annc_index11", - "name" : { - "zh_tw" : "11. 標準表格列表-1 ( 模組標題, 日期, 狀態, 標題, 類別 )", - "en" : "11. Standard Table List-1 (widget-title, postdate, status, title, category)" - }, - "thumbnail" : "annc_index11_thumbs.png" - }, - { - "filename" : "annc_index12", - "name" : { - "zh_tw" : "12. 標準表格列表-2 ( 模組標題, 日期, 狀態, 標題, 類別, 瀏覽人次 )", - "en" : "12. Standard Table List-2 (widget-title, postdate, status, title, category, view-count)" - }, - "thumbnail" : "annc_index12_thumbs.png" - }, - { - "filename" : "annc_index13", - "name" : { - "zh_tw" : "13. 精簡表格列表-1 ( 模組標題, 狀態, 標題, 日期 )", - "en" : "13. Simple Table List (widget-title, status, title, postdate)" - }, - "thumbnail" : "annc_index13_thumbs.png" - }, - { - "filename" : "annc_index14", - "name" : { - "zh_tw" : "14. 精簡表格列表-2 ( 模組標題, 日期, 狀態, 標題 )", - "en" : "14. Simple Table List (widget-title, postdate, status, title)" - }, - "thumbnail" : "annc_index14_thumbs.png" - }, - { - "filename" : "annc_index15", - "name" : { - "zh_tw" : "15. 精簡表格列表-3 ( 模組標題, 日期, 狀態, 標題, 瀏覽人次 )", - "en" : "15. Simple Table List (widget-title, postdate, status, title, view-count)" - }, - "thumbnail" : "annc_index15_thumbs.png" - }, - { - "filename" : "annc_index16", - "name" : { - "zh_tw" : "16. 連結 + 附件表格列表 ( 模組標題, 類別, 狀態, 標題 )", - "en" : "16. Table List including Links and attachments (widget-title, category, status, title, view-count)" - }, - "thumbnail" : "annc_index16_thumbs.png" - } - ], - "widgets" : [ - { - "filename" : "annc_widget1", - "name" : { - "zh_tw" : "1. 標準圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", - "en" : "1. Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)" - }, - "thumbnail" : "annc_widget1_thumbs.png" - }, - { - "filename" : "annc_widget2", - "name" : { - "zh_tw" : "2. 左圖右文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", - "en" : "2. Balanced Image + Text(Left) (widget-title, image, status, postdate, category, title, subtitle)" - }, - "thumbnail" : "annc_widget2_thumbs.png" - }, - { - "filename" : "annc_widget3", - "name" : { - "zh_tw" : "3. 右圖左文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", - "en" : "3. Balanced Image + Text(Right) (widget-title, image, status, postdate, category, title, subtitle)" - }, - "thumbnail" : "annc_widget3_thumbs.png" - }, - { - "filename" : "annc_widget4", - "name" : { - "zh_tw" : "4. 三欄圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", - "en" : "4. 3-Column Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)" - }, - "thumbnail" : "annc_widget4_thumbs.png" - }, - { - "filename" : "annc_widget15", - "name" : { - "zh_tw" : "4.5. 三欄圖文-slide ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", - "en" : "4.5. 3-Column Standard Image + Text -slide(widget-title, image, status, postdate, category, title, subtitle)" - }, - "thumbnail" : "annc_widget4_thumbs.png" - }, - { - "filename" : "annc_widget5", - "name" : { - "zh_tw" : "5. 標準文字列表 ( 模組標題, 日期, 類別, 狀態, 標題, 副標題 )", - "en" : "5. Standard Text List (widget-title, postdate, category, status, title, subtitle)" - }, - "thumbnail" : "annc_widget5_thumbs.png" - }, - { - "filename" : "annc_widget6", - "name" : { - "zh_tw" : "6. 標準標題列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )", - "en" : "6. Standard Title List-1 (widget-title, category, status, title, postdate)" - }, - "thumbnail" : "annc_widget6_thumbs.png" - }, - { - "filename" : "annc_widget7", - "name" : { - "zh_tw" : "7. 標準標題列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )", - "en" : "7. Standard Title List-2 (widget-title, postdate, status, title, category)" - }, - "thumbnail" : "annc_widget7_thumbs.png" - }, - { - "filename" : "annc_widget8", - "name" : { - "zh_tw" : "8. 標準表格列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )", - "en" : "8. Standard Table List-1 (widget-title, category, status, title, postdate)" - }, - "thumbnail" : "annc_widget8_thumbs.png" - }, - { - "filename" : "annc_widget9", - "name" : { - "zh_tw" : "9. 標準表格列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )", - "en" : "9. Standard Table List-2 (widget-title, postdate, status, title, category)" - }, - "thumbnail" : "annc_widget9_thumbs.png" - }, - { - "filename" : "annc_widget10", - "name" : { - "zh_tw" : "10. 精簡標題列表-1 ( 模組標題, 狀態, 標題, 日期 )", - "en" : "10. Simple Title List-1 (widget-title, status, title, postdate)" - }, - "thumbnail" : "annc_widget10_thumbs.png" - }, - { - "filename" : "annc_widget11", - "name" : { - "zh_tw" : "11. 精簡標題列表-2 ( 模組標題, 日期, 狀態, 標題 )", - "en" : "11. Simple Title List-2 (widget-title, postdate, status, title)" - }, - "thumbnail" : "annc_widget11_thumbs.png" - }, - { - "filename" : "annc_widget12", - "name" : { - "zh_tw" : "12. 精簡表格列表-1 ( 模組標題, 狀態, 標題, 日期 )", - "en" : "12. Simple Table List (widget-title, status, title, postdate)" - }, - "thumbnail" : "annc_widget12_thumbs.png" - }, - { - "filename" : "annc_widget13", - "name" : { - "zh_tw" : "13. 精簡表格列表-2 ( 模組標題, 日期, 狀態, 標題 )", - "en" : "13. Simple Table List (widget-title, postdate, status, title)" - }, - "thumbnail" : "annc_widget13_thumbs.png" - }, - { - "filename" : "annc_widget14", - "name" : { - "zh_tw" : "14. 一圖 + 標題列表 ( 模組標題, 圖片, 狀態, 標題, 日期 )", - "en" : "14. 1 Image + Title List (widget-title, image, status, title, postdate)" - }, - "thumbnail" : "annc_widget14_thumbs.png" - }, - { - "filename" : "annc_widget16", - "name" : { - "zh_tw" : "16. 單欄圖文輪播 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題 )", - "en" : "16. Image + Text slide (widget-title, image, status, postdate, category, title)" - }, - "thumbnail" : "annc_widget1_thumbs.png" - } - ] + "frontend": [ + { + "filename": "annc_index1", + "name": { + "zh_tw": "1. 標準標題列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )", + "en": "1. Standard Title List-1 (widget-title, category, status, title, postdate)" + }, + "thumbnail": "annc_index1_thumbs.png" + }, + { + "filename": "annc_index2", + "name": { + "zh_tw": "2. 標準標題列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )", + "en": "2. Standard Title List-2 (widget-title, postdate, status, title, category)" + }, + "thumbnail": "annc_index2_thumbs.png" + }, + { + "filename": "annc_index3", + "name": { + "zh_tw": "3. 精簡標題列表-1 ( 模組標題, 狀態, 標題, 日期 )", + "en": "3. Simple Title List-1 (widget-title, status, title, postdate)" + }, + "thumbnail": "annc_index3_thumbs.png" + }, + { + "filename": "annc_index4", + "name": { + "zh_tw": "4. 精簡標題列表-2 ( 模組標題, 日期, 狀態, 標題 )", + "en": "4. Simple Title List-2 (widget-title, postdate, status, title)" + }, + "thumbnail": "annc_index4_thumbs.png" + }, + { + "filename": "annc_index5", + "name": { + "zh_tw": "5. 左圖右文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", + "en": "5. Balanced Image + Text(Left) (widget-title, image, status, postdate, category, title, subtitle)" + }, + "thumbnail": "annc_index5_thumbs.png" + }, + { + "filename": "annc_index6", + "name": { + "zh_tw": "6. 右圖左文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", + "en": "6. Balanced Image + Text(Right) (widget-title, image, status, postdate, category, title, subtitle)" + }, + "thumbnail": "annc_index6_thumbs.png" + }, + { + "filename": "annc_index7", + "name": { + "zh_tw": "7. 三欄圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", + "en": "7. 3-Column Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)" + }, + "thumbnail": "annc_index7_thumbs.png" + }, + { + "filename": "annc_index8", + "name": { + "zh_tw": "8. 標準文字列表 ( 模組標題, 日期, 類別, 狀態, 標題, 副標題 )", + "en": "8. Standard Text List (widget-title, postdate, category, status, title, subtitle)" + }, + "thumbnail": "annc_index8_thumbs.png" + }, + { + "filename": "annc_index9", + "name": { + "zh_tw": "9. 標準文字列表三欄 ( 模組標題, 日期, 類別, 狀態, 標題, 副標題 )", + "en": "9. 3-Column Standard Text List (widget-title, postdate, category, status, title, subtitle)" + }, + "thumbnail": "annc_index9_thumbs.png" + }, + { + "filename": "annc_index10", + "name": { + "zh_tw": "10. 連結 + 附件表格列表 ( 模組標題, 類別, 狀態, 標題 )", + "en": "10. Table List including Links and attachments (widget-title, category, status, title, view-count)" + }, + "thumbnail": "annc_index10_thumbs.png" + }, + { + "filename": "annc_index11", + "name": { + "zh_tw": "11. 標準表格列表-1 ( 模組標題, 日期, 狀態, 標題, 類別 )", + "en": "11. Standard Table List-1 (widget-title, postdate, status, title, category)" + }, + "thumbnail": "annc_index11_thumbs.png" + }, + { + "filename": "annc_index12", + "name": { + "zh_tw": "12. 標準表格列表-2 ( 模組標題, 日期, 狀態, 標題, 類別, 瀏覽人次 )", + "en": "12. Standard Table List-2 (widget-title, postdate, status, title, category, view-count)" + }, + "thumbnail": "annc_index12_thumbs.png" + }, + { + "filename": "annc_index13", + "name": { + "zh_tw": "13. 精簡表格列表-1 ( 模組標題, 狀態, 標題, 日期 )", + "en": "13. Simple Table List (widget-title, status, title, postdate)" + }, + "thumbnail": "annc_index13_thumbs.png" + }, + { + "filename": "annc_index14", + "name": { + "zh_tw": "14. 精簡表格列表-2 ( 模組標題, 日期, 狀態, 標題 )", + "en": "14. Simple Table List (widget-title, postdate, status, title)" + }, + "thumbnail": "annc_index14_thumbs.png" + }, + { + "filename": "annc_index15", + "name": { + "zh_tw": "15. 精簡表格列表-3 ( 模組標題, 日期, 狀態, 標題, 瀏覽人次 )", + "en": "15. Simple Table List (widget-title, postdate, status, title, view-count)" + }, + "thumbnail": "annc_index15_thumbs.png" + }, + { + "filename": "annc_index16", + "name": { + "zh_tw": "16. 連結 + 附件表格列表 ( 模組標題, 類別, 狀態, 標題 )", + "en": "16. Table List including Links and attachments (widget-title, category, status, title, view-count)" + }, + "thumbnail": "annc_index16_thumbs.png" + } + ], + "widgets": [ + { + "filename": "annc_widget1", + "name": { + "zh_tw": "1. 標準圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", + "en": "1. Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)" + }, + "thumbnail": "annc_widget1_thumbs.png" + }, + { + "filename": "annc_widget2", + "name": { + "zh_tw": "2. 左圖右文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", + "en": "2. Balanced Image + Text(Left) (widget-title, image, status, postdate, category, title, subtitle)" + }, + "thumbnail": "annc_widget2_thumbs.png" + }, + { + "filename": "annc_widget3", + "name": { + "zh_tw": "3. 右圖左文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", + "en": "3. Balanced Image + Text(Right) (widget-title, image, status, postdate, category, title, subtitle)" + }, + "thumbnail": "annc_widget3_thumbs.png" + }, + { + "filename": "annc_widget4", + "name": { + "zh_tw": "4. 三欄圖文 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", + "en": "4. 3-Column Standard Image + Text (widget-title, image, status, postdate, category, title, subtitle)" + }, + "thumbnail": "annc_widget4_thumbs.png" + }, + { + "filename": "annc_widget15", + "name": { + "zh_tw": "4.5. 三欄圖文-slide ( 模組標題, 圖片, 狀態, 日期, 類別, 標題, 副標題 )", + "en": "4.5. 3-Column Standard Image + Text -slide(widget-title, image, status, postdate, category, title, subtitle)" + }, + "thumbnail": "annc_widget4_thumbs.png" + }, + { + "filename": "annc_widget5", + "name": { + "zh_tw": "5. 標準文字列表 ( 模組標題, 日期, 類別, 狀態, 標題, 副標題 )", + "en": "5. Standard Text List (widget-title, postdate, category, status, title, subtitle)" + }, + "thumbnail": "annc_widget5_thumbs.png" + }, + { + "filename": "annc_widget6", + "name": { + "zh_tw": "6. 標準標題列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )", + "en": "6. Standard Title List-1 (widget-title, category, status, title, postdate)" + }, + "thumbnail": "annc_widget6_thumbs.png" + }, + { + "filename": "annc_widget7", + "name": { + "zh_tw": "7. 標準標題列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )", + "en": "7. Standard Title List-2 (widget-title, postdate, status, title, category)" + }, + "thumbnail": "annc_widget7_thumbs.png" + }, + { + "filename": "annc_widget8", + "name": { + "zh_tw": "8. 標準表格列表-1 ( 模組標題, 類別, 狀態, 標題, 日期 )", + "en": "8. Standard Table List-1 (widget-title, category, status, title, postdate)" + }, + "thumbnail": "annc_widget8_thumbs.png" + }, + { + "filename": "annc_widget9", + "name": { + "zh_tw": "9. 標準表格列表-2 ( 模組標題, 日期, 狀態, 標題, 類別 )", + "en": "9. Standard Table List-2 (widget-title, postdate, status, title, category)" + }, + "thumbnail": "annc_widget9_thumbs.png" + }, + { + "filename": "annc_widget10", + "name": { + "zh_tw": "10. 精簡標題列表-1 ( 模組標題, 狀態, 標題, 日期 )", + "en": "10. Simple Title List-1 (widget-title, status, title, postdate)" + }, + "thumbnail": "annc_widget10_thumbs.png" + }, + { + "filename": "annc_widget11", + "name": { + "zh_tw": "11. 精簡標題列表-2 ( 模組標題, 日期, 狀態, 標題 )", + "en": "11. Simple Title List-2 (widget-title, postdate, status, title)" + }, + "thumbnail": "annc_widget11_thumbs.png" + }, + { + "filename": "annc_widget12", + "name": { + "zh_tw": "12. 精簡表格列表-1 ( 模組標題, 狀態, 標題, 日期 )", + "en": "12. Simple Table List (widget-title, status, title, postdate)" + }, + "thumbnail": "annc_widget12_thumbs.png" + }, + { + "filename": "annc_widget13", + "name": { + "zh_tw": "13. 精簡表格列表-2 ( 模組標題, 日期, 狀態, 標題 )", + "en": "13. Simple Table List (widget-title, postdate, status, title)" + }, + "thumbnail": "annc_widget13_thumbs.png" + }, + { + "filename": "annc_widget14", + "name": { + "zh_tw": "14. 一圖 + 標題列表 ( 模組標題, 圖片, 狀態, 標題, 日期 )", + "en": "14. 1 Image + Title List (widget-title, image, status, title, postdate)" + }, + "thumbnail": "annc_widget14_thumbs.png" + }, + { + "filename": "annc_widget16", + "name": { + "zh_tw": "16. 單欄圖文輪播 ( 模組標題, 圖片, 狀態, 日期, 類別, 標題 )", + "en": "16. Image + Text slide (widget-title, image, status, postdate, category, title)" + }, + "thumbnail": "annc_widget1_thumbs.png" + }, + { + "filename": "annc_widget17", + "name": { + "zh_tw": "17. 三欄圖文精簡版 ( 模組標題, 標題, 副標題(只顯示15字) )", + "en": "17. 3-Column Standard Image + Text Lite (widget-title, title, subtitle(only display 15 words))" + }, + "thumbnail": "annc_widget4_thumbs.png" + }, + { + "filename": "annc_widget18", + "name": { + "zh_tw": "18. 含搜尋功能之精簡標題列表-2 ( 模組標題, 日期, 狀態, 標題 )", + "en": "18. Simple Title List-2 (widget-title, postdate, status, title), including search" + }, + "thumbnail": "annc_widget11_thumbs.png" + } + ] } \ No newline at end of file diff --git a/modules/announcement/show.html.erb b/modules/announcement/show.html.erb index 1caf227..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,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 3d68c23..e3fa484 100644 --- a/modules/archive/info.json +++ b/modules/archive/info.json @@ -1,70 +1 @@ -{ - "frontend": [ - { - "filename" : "archive_index1", - "name" : { - "zh_tw" : "1. 列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )", - "en" : "1. List (widget-title, category, filename, download link)" - }, - "thumbnail" : "ar1.png" - }, - { - "filename" : "archive_index2", - "name" : { - "zh_tw" : "2. 手風琴式列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )", - "en" : "2. Accordion list (widget-title, category, filename, download link)" - }, - "thumbnail" : "ar2.png" - }, - { - "filename" : "archive_index3", - "name" : { - "zh_tw" : "3. 列表( 無檔案名稱 ) ( 模組標題, 類別標題, 下載連結 )", - "en" : "3. List(no filename) (widget-title, category, download link)" - }, - "thumbnail" : "ar3.png" - }, - { - "filename" : "archive_index4", - "name" : { - "zh_tw" : "4. 手風琴式列表( 無檔案名稱 ( 模組標題, 類別標題, 下載連結 )", - "en" : "4. Accordion list(no filename) (widget-title, category, download link)" - }, - "thumbnail" : "ar4.png" - }, - { - "filename" : "archive_index5", - "name" : { - "zh_tw" : "5. 表格列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )", - "en" : "5. Table list (widget-title, category, filename, download link)" - }, - "thumbnail" : "ar5.png" - }, - { - "filename" : "archive_index6", - "name" : { - "zh_tw" : "6. 表格列表 ( 模組標題, 檔案名稱, 下載連結 )", - "en" : "6. 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 +{"frontend":[{"filename":"archive_index1","name":{"zh_tw":"1. 列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )","en":"1. List (widget-title, category, filename, download link)"},"thumbnail":"ar1.png"},{"filename":"archive_index2","name":{"zh_tw":"2. 手風琴式列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )","en":"2. Accordion list (widget-title, category, filename, download link)"},"thumbnail":"ar2.png"},{"filename":"archive_index3","name":{"zh_tw":"3. 列表( 無檔案名稱 ) ( 模組標題, 類別標題, 下載連結 )","en":"3. List(no filename) (widget-title, category, download link)"},"thumbnail":"ar3.png"},{"filename":"archive_index4","name":{"zh_tw":"4. 手風琴式列表( 無檔案名稱 ( 模組標題, 類別標題, 下載連結 )","en":"4. Accordion list(no filename) (widget-title, category, download link)"},"thumbnail":"ar4.png"},{"filename":"archive_index5","name":{"zh_tw":"5. 表格列表 ( 模組標題, 類別標題, 檔案名稱, 下載連結 )","en":"5. Table list (widget-title, category, filename, download link)"},"thumbnail":"ar5.png"},{"filename":"archive_index6","name":{"zh_tw":"6. 表格列表 ( 模組標題, 檔案名稱, 下載連結 )","en":"6. Table list (widget-title, filename, download link)"},"thumbnail":"ar5.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/faq_index2.html.erb b/modules/faq/faq_index2.html.erb index 5617e68..cce43c1 100644 --- a/modules/faq/faq_index2.html.erb +++ b/modules/faq/faq_index2.html.erb @@ -1,30 +1,31 @@ -
-

- {{page-title}} -

- -
-{{pagination_goes_here}} - - \ No newline at end of file diff --git a/modules/gallery/_gallery_widget3.html.erb b/modules/gallery/_gallery_widget3.html.erb index 8cf0af3..1778e3e 100644 --- a/modules/gallery/_gallery_widget3.html.erb +++ b/modules/gallery/_gallery_widget3.html.erb @@ -1,33 +1,19 @@ -
- -
- -
-
-
-
{{image_description}}
-
-
-
-
-
-
- {{alt_title}} -
- - -
-
- <%= locale == :en ? 'more' : '更多照片' %> -
-
+
+

+ {{widget-title}} +

+
+
+ + {{alt_title}} + + {{link_text}} +
+
+
\ 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"}]) %> -