From 2715dfa8bc7e4a4a3cd3639bfda87cacf1d25a21 Mon Sep 17 00:00:00 2001
From: v02202 <v0220225@gmail.com>
Date: Mon, 18 Jan 2021 15:17:55 +0800
Subject: [PATCH 1/2] modify taibif helpdesk

---
 src/occurrence/OccurrenceDownload.js |  1 -
 templates/dataset.html               | 22 ++++------------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/src/occurrence/OccurrenceDownload.js b/src/occurrence/OccurrenceDownload.js
index 7bb01a1a..8d783599 100644
--- a/src/occurrence/OccurrenceDownload.js
+++ b/src/occurrence/OccurrenceDownload.js
@@ -9,7 +9,6 @@ function OccurrenceDownload(props) {
   
   //const Occur = props.data.results;
   //const length = Occur.length;
-
   //console.log(queryString);
   //if (length < 5000) {
   //} else {
diff --git a/templates/dataset.html b/templates/dataset.html
index 46d9b857..43433e8f 100644
--- a/templates/dataset.html
+++ b/templates/dataset.html
@@ -106,33 +106,19 @@ <h4 class="heading-md-ul">資料集說明</h4>
       <資料集說明 end -->
 
       <!-- 聯絡資訊 begin -->
-      <h4 class="heading-md-ul">TaiBIF 聯絡資訊</h4>
+      <h4 class="heading-md-ul">TaiBIF 官方諮詢 (helpdesk)</h4>
       <!-- row contact-info begin -->
       <div class="row">
 
         <div class="col-md-6 col-xs-12">
           <div class="contact-info-wrapper">
             <p class="heading-md-ul">
-              端木茂甯
-              <span class="heading-footnote">節點經理</span>
+              TaiBIF 官方諮詢
+              <span class="heading-footnote">helpdesk</span>
             </p>
             <ul>
               <li><span class="myicon icon-pin"></span> 11574 台北市南港區研究院路二段70巷28號<br>跨領域科技研究大樓 C301室</li>
-              <li><span class="myicon icon-mail"></span> mntuanmu@gate.sinica.edu.tw</a></li>
-              <li><a href="#"><span class="myicon icon-link"></span> https://portal.taibif.tw/</a></li>
-            </ul>
-          </div>
-        </div>
-
-        <div class="col-md-6 col-xs-12">
-          <div class="contact-info-wrapper">
-            <p class="heading-md-ul">
-              劉璟儀
-              <span class="heading-footnote">內容經理</span>
-            </p>
-            <ul>
-              <li><span class="myicon icon-pin"></span> 11574 台北市南港區研究院路二段70巷28號<br>跨領域科技研究大樓 C301室</li>
-              <li><span class="myicon icon-mail"></span> melissaliu0520@gmail.com</a></li>
+              <li><span class="myicon icon-mail"></span> taibif.brcas@gmail.com</a></li>
               <li><a href="#"><span class="myicon icon-link"></span> https://portal.taibif.tw/</a></li>
             </ul>
           </div>

From 06165a91543b24f0534b28daca1c2f0b17a95173 Mon Sep 17 00:00:00 2001
From: v02202 <v0220225@gmail.com>
Date: Fri, 22 Jan 2021 11:01:17 +0800
Subject: [PATCH 2/2] update markdown in article-list

---
 templates/article-list.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/article-list.html b/templates/article-list.html
index 0086233f..87fcb7f4 100644
--- a/templates/article-list.html
+++ b/templates/article-list.html
@@ -142,17 +142,17 @@ <h1 class="heading-lg-ul">
         <span class="listbox-inner-date">{{ article.created|date:'Y/m/d' }}</span>
         <h3 class="listbox-inner-title"><a href="{{ article.get_absolute_url }}" target="_blank" rel="noreferrer noopener">{{ article.title }}</a></h3>
         <p class="listbox-inner-summary hidden-xs">
-            {% if article.memo|slice:"0:4" == "nid:" %}
+          {% if article.memo|slice:"0:4" == "nid:" %}
             {# old article content #}
             {% if article.category == "UPDATE" %}
             {% else %}
-            {{ article.content|striptags|truncatechars:150 }}
-            <p><a href="{% url 'article-detail-id' pk=article.id %}" target="_blank" rel="noreferrer noopener">閱讀更多</a></p>
-            {% endif %}
-            {% else %}
-            {{ article.content | linebreaks | truncatechars:150}}
+            {{ article.content | markdown  | striptags | truncatechars:150 }}
             <p><a href="{% url 'article-detail-id' pk=article.id %}" target="_blank" rel="noreferrer noopener">閱讀更多</a></p>
             {% endif %}
+          {% else %}
+          {{ article.content | markdown | safe | linebreaks | truncatechars:150 }}
+          <p><a href="{% url 'article-detail-id' pk=article.id %}" target="_blank" rel="noreferrer noopener">閱讀更多</a></p>
+          {% endif %}
         </p>
       </div>
       {% if article.cover %}