Updated.

assets/stylesheets/template/layout/content.scss

@@ -463,6 +463,8 @@ body{
   }
   .w-event_news__list{
     padding: 0;
+    display: flex;
+    flex-wrap: wrap;
     li{
       width: 100%;
       float: left;

assets/stylesheets/template/modules/ad_banner.scss

@@ -293,7 +293,7 @@ ul.button-mid{
 }
 // Widget 6
 .ba-banner-widget-6 {
-     height: 100%;
+   height: 100% !important;
    .w-ba-banner__wrap{
      height: 100%;
     }

assets/stylesheets/template/modules/announcement.scss

@@ -216,22 +216,18 @@
     }
   }
   .w-annc__img-wrap {
-    height: 25em;
-    margin: 0.5em;
-    @media(max-width:$screen-xs){
-      height:20em;
-    }
-    @media(min-width:1920px){
-      height: 30em;
-    }
     img{
       width: auto!important;
+      position: relative !important;
+      width: 100% !important;
       height: 100%!important;
       margin: 0 !important;
       max-width: fit-content;
     }
   }
-  .w
+  .w-annc__item{
+     margin-bottom: 0em;
+  }
 
   .w-annc__title {
     font-family: $main-font;
@@ -239,10 +235,18 @@
     font-size: 1.2rem;
   }
   .w-annc__list{
-    @media(min-width:$screen-xs){
+    @media(min-width: $screen-sm){
       display: grid;
-      grid-template: auto auto/repeat(12, 1fr);
+      grid-template-areas:
-      grid-gap: 0 10px;
+        "g1 g2 g3"
+	    "g1 g4 g5";
+      grid-gap: 2% 1%;
+      grid-template-columns: 35% 31.5% 31.5%;
+    }
+    @media(max-width: $screen-sm-max){
+      .w-annc__item{
+        margin-bottom: 1em;
+      }
     }
     li{
       &:hover{
@@ -259,43 +263,35 @@
        flex: 0 0 50%;
       }
       &:nth-child(1){
-        grid-area: 1 / 1 / 3 / 5;
+        grid-area: g1;
         -ms-grid-row: 1;
         -ms-grid-column: 1;
         -ms-grid-row-span: 3;
         -ms-grid-column-span: 7;
-        .w-annc__img-wrap{
-          height: 53em;
-        }
-        @media(max-width:$screen-xs){
-          .w-annc__img-wrap{
-            height: 40em;
-          }
-        }
       }
       &:nth-child(2){
-        grid-area: 1 / 5 / 2 / 9;
+        grid-area: g2;
        -ms-grid-row: 1;
        -ms-grid-column: 9;
        -ms-grid-row-span: 1;
        -ms-grid-column-span: 7;
       }
       &:nth-child(3){
-        grid-area: 1 / 9 / 2 / 13;
+        grid-area: g3;
        -ms-grid-row: 1;
        -ms-grid-column: 17;
        -ms-grid-row-span: 1;
        -ms-grid-column-span: 7;
       }
       &:nth-child(4){
-        grid-area: 2 / 5 / 3 / 9;
+        grid-area: g4;
         -ms-grid-row: 3;
         -ms-grid-column: 9;
         -ms-grid-row-span: 1;
         -ms-grid-column-span: 7;
       }
       &:nth-child(5){
-        grid-area: 2 / 9 / 3 / 13;
+        grid-area: g5;
        -ms-grid-row: 3;
        -ms-grid-column: 17;
        -ms-grid-row-span: 1;
@@ -310,7 +306,6 @@
   .card{
     position: absolute;
     z-index: 2;
-    margin:0 0.5em;
     padding: 20px 25px;
     bottom: 0;
     left: 0;

modules/archive/_archive_widget3.html.erb

@@ -9,7 +9,7 @@
               <span class="w-archive__title" href="{{archive_url}}">{{archive-title}}</span>
               <ul class="w-archive__list level-4" data-list="files" data-level="2">
                 <li class="w-archive__item level-4">
-                  <a href="{{file-url}}" class="widget-archive-files-item w-archive__link" target="_blank" title="{{file-name}}">{{file-name}}</a>
+                  <a href="{{file-url}}" class="widget-archive-files-item w-archive__link" target="{{target}}" title="{{file-name}}">{{file-name}}</a>
                   <span class="label label-primary {{file-type}}">{{file-type}}</span>
                 </li>
               </ul>

modules/archive/_archive_widget4.html.erb

@@ -25,7 +25,7 @@
             </dt>
             <dl class="widget-archive-files-list" data-list="files"  data-level="2">
               <dd>
-                <a href="{{file-url}}" class="widget-archive-files-item" target="_blank" title="{{file-name}}">{{file-name}}</a>
+                <a href="{{file-url}}" class="widget-archive-files-item" target="{{target}}" title="{{file-name}}">{{file-name}}</a>
                 <span class="label label-primary {{file-type}}">{{file-type}}</span>
               </dd>
             </dl>

modules/archive/archive_index1.html.erb

@@ -13,7 +13,7 @@
           </dt>
           <dl class="i-archive__file-list" data-list="files"  data-level="2">
             <dd class="i-archive__file-wrap">
-              <a class="i-archive__file-name" href="{{file-url}}" target="_blank" title="{{file-name}}">{{file-name}}</a>
+              <a class="i-archive__file-name" href="{{file-url}}" target="{{target}}" title="{{file-name}}">{{file-name}}</a>
               <span class="i-archive__file-type  label label-primary {{file-type}}">{{file-type}}</span>
             </dd>
           </dl>

modules/archive/archive_index12.html.erb

@@ -1,4 +1,4 @@
-<div class="i-archive index-archive-2">
+<div class="i-archive index-archive-2 index-archive-12">
   <h3 class="i-archive-title">
     <span>{{page-title}}</span>
   </h3>
@@ -25,7 +25,7 @@
             </dt>
             <dl class="i-archive-files-list" data-list="files"  data-level="2">
               <dd>
-                <a href="{{file-url}}" class="i-archive-files-item" target="_blank" title="{{file-name}}">{{file-name}}</a>
+                <a href="{{file-url}}" class="i-archive-files-item" target="{{target}}" title="{{file-name}}">{{file-name}}</a>
                 <span class="label label-primary {{file-type}}">{{file-type}}</span>
               </dd>
             </dl>
@@ -35,4 +35,10 @@
     </div>
         {{link_to_edit}}
   </div>
+  <style>
+    .index-archive-12 dt.i-archive-item-list{
+      float: none;
+      width: auto;
+    }
+  </style>
 </div>

modules/archive/archive_index13.html.erb

@@ -15,11 +15,11 @@
             <span data-list="statuses" data-level="2">
               <span class="label status {{status-class}}">{{status}}</span>
             </span>
-            <a href="{{archive-file-url}}" target="_blank" title="{{archive-title}}">
+            <a href="{{archive-file-url}}" target="{{target}}" title="{{archive-title}}">
               {{archive-title}}
             </a>
             <span class="i-archive-files-list" data-list="files" data-level="2">
-              <a href="{{file-url}}" class="i-archive-files-item" title="{{file-name}}" data-toggle="tooltip" data-placement="bottom">
+              <a href="{{file-url}}" class="i-archive-files-item" target="{{target}}" title="{{file-name}}" data-toggle="tooltip" data-placement="bottom">
                 <span class="label label-primary {{file-type}}">{{file-type}}</span>
               </a>
             </span>
@@ -32,6 +32,9 @@
   </div>
 </div>
 <style>
+  .i-archive.index-archive-13 .i-archive-files-item{
+    white-space: inherit;
+  }
   .index-archive-13 .archives-ul .archive-li{
     list-style-type: disc;
   }

modules/archive/archive_index14.html.erb

@@ -0,0 +1,36 @@
+<div class="i-archive index-archive-2 index-archive-14">
+  <h3 class="i-archive-title">
+    <span>{{page-title}}</span>
+  </h3>
+  <div class="panel-group" id="index-archive-group" data-list="categories" data-level="0">
+    <div class="panel panel-default" data-list="archives" data-level="1">
+      <div class="panel-heading" style="padding: 0.625em 0.9375em;">
+        <h4 class="panel-title">
+          <i class="fa fa-file-text" aria-hidden="true"></i>
+          <a data-toggle="collapse" data-parent="#index-archive-group" href="#collapse" class="collapsed" style="padding: 0;display: inline-block;">
+            {{archive-title}}
+            <i class="fa fa-chevron-down" aria-hidden="true"></i>
+          </a>
+
+        </h4>
+      </div>
+      <div id="collapse" class="panel-collapse collapse {{in_class}}">
+        <div class="panel-body">
+          <ul class="i-archive-files-list" data-list="files"  data-level="2">
+            <li>
+              <a href="{{file-url}}" class="i-archive-files-item" target="{{target}}" title="{{file-name}}">{{file-name}}</a>
+              <span class="label label-primary {{file-type}}">{{file-type}}</span>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
+        {{link_to_edit}}
+  </div>
+  <style>
+    .index-archive-12 dt.i-archive-item-list{
+      float: none;
+      width: auto;
+    }
+  </style>
+</div>

modules/archive/archive_index15.html.erb

@@ -0,0 +1,41 @@
+<div class="i-archive index-archive-13 index-archive-15">
+  <h3 class="i-archive-title">
+    <span>{{page-title}}</span>
+  </h3>
+  <ul class="archive-categories nav nav-tabs" role="tablist" data-list="categories" data-level="0" data-no-edit="true">
+    <li class="nav-item {{active_class}}" role="presentation">
+      <a href="#{{category-id}}" role="tab" data-toggle="tab" title="{{category-title}}" >{{category-title}}</a>
+    </li>
+  </ul>
+  <div class="tab-content" data-list="categories" data-level="0">
+    <div class="tab-pane {{active_class}}" id="{{category-id}}" role="tabpanel" aria-labelledby="{{category-id}}-tab">
+      <ul class="archives-ul" data-list="archives" data-level="1">
+        <li class="archive-li">
+          <p>
+            <span data-list="statuses" data-level="2">
+              <span class="label status {{status-class}}">{{status}}</span>
+            </span>
+            <a href="{{archive-file-url}}" target="{{target}}" title="{{archive-title}}">
+              {{archive-title}}
+            </a>
+            <span class="i-archive-files-list" data-list="files" data-level="2">
+              <a href="{{file-url}}" class="i-archive-files-item" target="{{target}}" title="{{file-name}}" data-toggle="tooltip" data-placement="bottom">
+                {{file-name}}<span class="label label-primary {{file-type}}">{{file-type}}</span>
+              </a>
+            </span>
+          </p>
+          <div class="archive-description">{{description}}</div>
+        </li>
+      </ul>
+      {{link_to_edit}}
+    </div>
+  </div>
+</div>
+<style>
+  .index-archive-13 .archives-ul .archive-li{
+    list-style-type: disc;
+  }
+  .index-archive-13 .archive-description{
+    color: #9b9b9b;
+  }
+</style>

modules/archive/archive_index2.html.erb

@@ -12,19 +12,19 @@
           </a>
         </h4>
       </div>
-      <div id="collapse" class="panel-collapse collapse">
+      <div id="collapse" class="panel-collapse collapse {{in_class}}">
         <div class="panel-body">
           <dl class="dl-horizontal i-archive-item-group" data-list="archives" data-level="1">
-            <dt class="i-archive-item-list col-sm-5">
+            <dt class="i-archive-item-list col-sm-3">
               <sapn class="i-archive-item-title">{{archive-title}}</span>
               <span data-list="statuses" data-level="2">
                 <span class="label status {{status-class}}">{{status}}</span>
               </span>
             </dt>
-            <dl class="i-archive-files-list col-sm-7" data-list="files"  data-level="2">
+            <dl class="i-archive-files-list col-sm-9" data-list="files"  data-level="2">
               <dd>
-                <a href="{{file-url}}" class="i-archive-files-item" target="_blank" title="{{file-name}}">{{file-name}}</a>
+                <a href="{{file-url}}" class="i-archive-files-item" target="{{target}}" title="{{file-name}}">{{file-name}}</a>
-                <span class="label label-primary">{{file-type}}</span>
+                <span class="label label-primary {{file-type}}">{{file-type}}</span>
               </dd>
             </dl>
           </dl>
@@ -33,4 +33,11 @@
     </div>
         {{link_to_edit}}
   </div>
+  <style>
+    @media (min-width: 769px){
+      .index-archive-2 .dl-horizontal dt.col-sm-3{
+        width: 25%;
+      }
+    }
+  </style>
 </div>

modules/archive/archive_index3.html.erb

@@ -12,7 +12,7 @@
           </dt>
           <dl class="i-archive__file-list" data-list="files"  data-level="2">
             <dd class="i-archive__file-wrap">
-              <a class="i-archive__file-name" href="{{file-url}}" target="_blank" title="{{file-name}}">{{file-name}}</a>
+              <a class="i-archive__file-name" href="{{file-url}}" target="{{target}}" title="{{file-name}}">{{file-name}}</a>
               <span class="i-archive__file-type  label label-primary {{file-type}}">{{file-type}}</span>
             </dd>
           </dl>

modules/archive/archive_index4.html.erb

@@ -11,7 +11,7 @@
           </a>
         </h4>
       </div>
-      <div id="collapse" class="panel-collapse collapse">
+      <div id="collapse" class="panel-collapse collapse {{in_class}}">
         <div class="panel-body">
           <dl class="dl-horizontal i-archive-item-group" data-list="archives" data-level="1">
             <dt class="i-archive-item-list col-sm-5">
@@ -21,8 +21,8 @@
             </dt>
             <dl class="i-archive-files-list col-sm-7" data-list="files"  data-level="2">
               <dd>
-                <a href="{{file-url}}" class="i-archive-files-item" target="_blank" title="{{file-name}}">{{file-name}}</a>
+                <a href="{{file-url}}" class="i-archive-files-item" target="{{target}}" title="{{file-name}}">{{file-name}}</a>
-                <span class="label label-primary">{{file-type}}</span>
+                <span class="label label-primary {{file-type}}">{{file-type}}</span>
               </dd>
             </dl>
           </dl>

modules/archive/archive_index9.html.erb

@@ -19,7 +19,7 @@
                 {{file-name}}
               </td>
               <td class="col-sm-4">
-                <a href="{{file-url}}" class="i-archive-files-item" target="_blank"  data-toggle="tooltip" data-placement="bottom" title="{{file-name}}"><span class="label label-primary {{file-type}}">{{file-type}}</span></a>
+                <a href="{{file-url}}" class="i-archive-files-item" target="{{target}}"  data-toggle="tooltip" data-placement="bottom" title="{{file-name}}"><span class="label label-primary {{file-type}}">{{file-type}}</span></a>
               </td>
             </tr>
           </span>

modules/archive/info.json

@@ -99,8 +99,24 @@
     {
       "filename": "archive_index13",
       "name": {
-        "zh_tw": "13. 頁籤式 ( 模組標題, 類別標題, 標題, 檔案名稱, 下載連結, 描述 )",
+        "zh_tw": "13. 頁籤式 ( 模組標題, 類別標題, 標題, 下載連結, 描述 )",
-        "en": "13. Tab list  (widget-title, category, title, filename, download link, description)"
+        "en": "13. Tab list  (widget-title, category, title, download link, description)"
+      },
+      "thumbnail": "ar-tab1.png"
+    },
+    {
+      "filename": "archive_index14",
+      "name": {
+        "zh_tw": "14. 手風琴式列表 - 有下拉 - 針對各筆資料 ( 模組標題, 標題, 檔案名稱, 下載連結 )",
+        "en": "14. Accordion list - with drop down - For every data  (widget-title, title, filename, download link)"
+      },
+      "thumbnail": "ar2.png"
+    },
+    {
+      "filename": "archive_index15",
+      "name": {
+        "zh_tw": "15. 頁籤式 ( 模組標題, 類別標題, 標題, 完整檔案名稱, 下載連結, 描述 )",
+        "en": "15. Tab list  (widget-title, category, title, full filename, download link, description)"
       },
       "thumbnail": "ar-tab1.png"
     }

modules/ask/_ask_widget_form.html.erb

@@ -41,6 +41,9 @@
     .ask-question .form-horizontal input[type="text"],.ask-question  .form-horizontal select{
       width: 97%;
     }
+    .ask-question .form-horizontal input[type="text"].hasDatepicker{
+      width: auto;
+    }
     .ask-question .form-horizontal .form-actions{
       position: relative;
       padding: 1em 0 0 0;

modules/web_resource/_web_res_widget2.html.erb

@@ -1,4 +1,4 @@
-<div class="widget-link widget1">
+<div class="widget-link widget1 widget2">
   <h3 class="widget-title">
     <span>{{widget-title}}</span>
   </h3>