From 3d60456ea63a22e7dacccb2fa3b266454495d7ef Mon Sep 17 00:00:00 2001
From: bohung <bohung@rulingcom.com>
Date: Fri, 4 Dec 2020 13:19:31 +0800
Subject: [PATCH] Edit template.

---
 .../event_news/_event_news_widget1.html.erb   |  4 ++-
 .../event_news/_event_news_widget16.html.erb  |  2 ++
 .../event_news/_event_news_widget17.html.erb  | 35 +++++++++++++++++++
 modules/event_news/info.json                  |  8 +++++
 4 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 modules/event_news/_event_news_widget17.html.erb

diff --git a/modules/event_news/_event_news_widget1.html.erb b/modules/event_news/_event_news_widget1.html.erb
index 5a029e4..9e9a6a8 100644
--- a/modules/event_news/_event_news_widget1.html.erb
+++ b/modules/event_news/_event_news_widget1.html.erb
@@ -23,7 +23,9 @@
       <h4 class="w-event_news__entry-title">
         <a class="w-event_news__title" href="{{link_to_show}}">{{title}}</a>
       </h4>
-      <p class="w-event_news__subtitle">{{subtitle}}</p>
+      <div class="w-event_news__subtitle">{{subtitle}}</div>
+      <div class="w-event_news__speaker">【{{speaker-head}}】 {{speaker}}</div>
+      <div class="w-event_news__host">【{{host-head}}】 {{host}}</div>
     </li>
   </ul>
   <div class="w-event_news__more-wrap clearfix">
diff --git a/modules/event_news/_event_news_widget16.html.erb b/modules/event_news/_event_news_widget16.html.erb
index a5f600c..cbaccfc 100644
--- a/modules/event_news/_event_news_widget16.html.erb
+++ b/modules/event_news/_event_news_widget16.html.erb
@@ -5,6 +5,7 @@
         <th class="w-event_news__th  w-event_news__th--date">{{event_date-head}}</th>
         <th class="w-event_news__th  w-event_news__th--date">{{speaker-head}}</th>
         <th class="w-event_news__th  w-event_news__th--title">{{title-head}}</th>
+        <th class="w-event_news__th  w-event_news__th--title">{{subtitle-head}}</th>
         <th class="w-event_news__th  w-event_news__th--title">{{host-head}}</th>
         <th class="w-event_news__th  w-event_news__th--title">{{notes-head}}</th>
       </tr>
@@ -19,6 +20,7 @@
             </span>
             <a class="w-event_news__title" href="{{link_to_show}}">{{title}}</a>
           </td>
+          <td class="w-event_news_subtitle">{{subtitle}}</td>
           <td class="w-event_news__host">{{host}}</td>
           <td class="w-event_news__notes">{{notes}}</td>
         </tr>
diff --git a/modules/event_news/_event_news_widget17.html.erb b/modules/event_news/_event_news_widget17.html.erb
new file mode 100644
index 0000000..7f6d6dd
--- /dev/null
+++ b/modules/event_news/_event_news_widget17.html.erb
@@ -0,0 +1,35 @@
+<div class="w-event_news  widget-event_news-13">
+  <h3 class="w-event_news__widget-title">
+    <span>{{widget-title}}</span>
+  </h3>
+  <table class="w-event_news__table  table">
+    <thead>
+      <tr>
+        <th class="w-event_news__th  w-event_news__th--date">{{event_date-head}}</th>
+        <th class="w-event_news__th  w-event_news__th--title">{{title-head}}</th>
+        <th class="w-event_news__th  w-event_news__th--title">{{subtitle-head}}</th>
+        <th class="w-event_news__th  w-event_news__th--date">{{speaker-head}}</th>        
+        <th class="w-event_news__th  w-event_news__th--title">{{host-head}}</th>
+        <th class="w-event_news__th  w-event_news__th--title">{{notes-head}}</th>
+      </tr>
+    </thead>
+    <tbody data-level="0" data-list="event_news">
+        <tr>
+          <td class="w-event_news__postdate" date-format="%Y-%m-%d">{{postdate}}</td>
+          <td class="w-event_news_content">
+            <span class="w-event_news__status-wrap" data-list="statuses" data-level="1">
+              <span class="w-event_news__status label status {{status-class}}">{{status}}</span>
+            </span>
+            <a class="w-event_news__title" href="{{link_to_show}}">【講題】{{title}}</a>
+          </td>
+          <td class="w-event_news__speaker">【講者】{{speaker}}</td>
+          <td class="w-event_news__host">{{host}}</td>
+          <td class="w-event_news__subtitle">{{subtitle}}</td>
+          <td class="w-event_news__notes">【備註】{{notes}}</td>
+        </tr>
+    </tbody>
+  </table>
+  <div class="w-event_news__more-wrap clearfix">
+    <a class="w-event_news__more btn btn-primary pull-right" href="{{more_url}}"><%= (I18n.locale.to_s =="zh_tw") ? "更多→" : "More NEWS" %></a>
+  </div>
+</div>
\ No newline at end of file
diff --git a/modules/event_news/info.json b/modules/event_news/info.json
index df7a3cb..adfa13d 100644
--- a/modules/event_news/info.json
+++ b/modules/event_news/info.json
@@ -273,6 +273,14 @@
 				"en" : "15. Standard Table List (EventDate, speaker, status, title, host, notes)"
 				},
 			"thumbnail" : "event_news_widget13_thumbs.png"
+		},
+		{
+			"filename" : "event_news_widget17",
+			"name" : {
+				"zh_tw" : "16. 標準表格列表-3 ( 日期, 狀態, 標題, 演講者, 主持人, 備註 )",
+				"en" : "16. Standard Table List (EventDate, status, title, speaker, host, notes)"
+				},
+			"thumbnail" : "event_news_widget13_thumbs.png"
 		}
 	]
 }
\ No newline at end of file