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 219888e..4119e0b 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: 1;
&:hover {
diff --git a/assets/stylesheets/template/layout/content.scss b/assets/stylesheets/template/layout/content.scss
index d5a5b55..2c07f7b 100644
--- a/assets/stylesheets/template/layout/content.scss
+++ b/assets/stylesheets/template/layout/content.scss
@@ -45,6 +45,7 @@
clear: both;
display: table;
border-radius: 5px 5px 0 0 ;
+ behavior: url("/assets/ie_support/PIE2/PIE.htc");
line-height: 1;
}
}
@@ -326,6 +327,7 @@
li {
float: left;
border-radius: 5px 5px 0 0;
+ behavior: url("/assets/ie_support/PIE2/PIE.htc");
padding: 6px 10px;
margin-left: 3px;
font-size: $font-15;
@@ -451,6 +453,7 @@
float: left;
width: 46%;
border-radius: 13px;
+ behavior: url("/assets/ie_support/PIE2/PIE.htc");
margin: 2%;
&:hover{}
img{
diff --git a/assets/stylesheets/template/layout/header.scss b/assets/stylesheets/template/layout/header.scss
index e0144d9..b543511 100644
--- a/assets/stylesheets/template/layout/header.scss
+++ b/assets/stylesheets/template/layout/header.scss
@@ -21,6 +21,7 @@
padding: 9px 10px;
border-top: 0;
border-radius: 3px;
+ behavior: url("/assets/ie_support/PIE2/PIE.htc");
background-color: #a25a05;
}
& > *:not(p) {
@@ -61,6 +62,7 @@
.navbar-toggle {
padding: 18px 20px;
border-radius: 2px;
+ behavior: url("/assets/ie_support/PIE2/PIE.htc");
border-width: 2px;
border-color: #fff;
diff --git a/assets/stylesheets/template/modules/ad_banner.scss b/assets/stylesheets/template/modules/ad_banner.scss
index ccfcb17..eb4779b 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 3a5ac03..7c371eb 100644
--- a/assets/stylesheets/template/modules/announcement.scss
+++ b/assets/stylesheets/template/modules/announcement.scss
@@ -393,6 +393,7 @@
img.w-annc__img{
border: 5px solid #ddd;
border-radius: 50%;
+ behavior: url("/assets/ie_support/PIE2/PIE.htc");
@media (max-width: $screen-xs){
max-width: 290px;
@@ -783,6 +784,7 @@
color: #fff;
font-size: 0.6875em;
border-radius: 4px;
+ behavior: url("/assets/ie_support/PIE2/PIE.htc");
padding: 2px 6px;
background-color: $theme-color-main;
}
diff --git a/assets/stylesheets/template/modules/archives.scss b/assets/stylesheets/template/modules/archives.scss
index db3eb03..781a970 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 ba0df8b..cb2e755 100644
--- a/assets/stylesheets/template/modules/member.scss
+++ b/assets/stylesheets/template/modules/member.scss
@@ -84,6 +84,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 85c7081..80ed3fa 100644
--- a/assets/stylesheets/template/modules/menu.scss
+++ b/assets/stylesheets/template/modules/menu.scss
@@ -52,6 +52,7 @@
font-size: 1em;
text-align: center;
border-radius: 2px;
+ behavior: url("/assets/ie_support/PIE2/PIE.htc");
}
.dropdown-toggle-icon.level-1 {
diff --git a/assets/stylesheets/template/modules/question.scss b/assets/stylesheets/template/modules/question.scss
index bfd0d3d..123d23b 100644
--- a/assets/stylesheets/template/modules/question.scss
+++ b/assets/stylesheets/template/modules/question.scss
@@ -29,6 +29,7 @@
.o-question-list {
border: 1px solid #e2e2e2;
border-radius: 3px;
+ behavior: url("/assets/ie_support/PIE2/PIE.htc");
box-shadow: 5px 5px 15px rgba(0, 0, 0, 0.1);
clear: both;
font-weight: bold;
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 @@
+
+{{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 @@
-