Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #95

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Develop #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c5c84a
Merge remote-tracking branch 'upstream/develop' into develop
v02202 Jan 7, 2021
2715dfa
modify taibif helpdesk
v02202 Jan 18, 2021
06165a9
update markdown in article-list
v02202 Jan 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions apps/data/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,10 +302,6 @@ def species_view(request, pk):
if test:
context['map_view'] = test[0]





#if n:
# context['map_view'] = [lat/n, lng/n]
#n =
Expand Down
2 changes: 1 addition & 1 deletion php_build/src/coordinateConverter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@
<li><strong>y:</strong> Y 坐標</li>
</ul>
<p>範例：</p>
<pre>http://taibif.org.tw/BDTools/proj4/convert.php?<strong>source</strong>=5&amp;<strong>destination</strong>=1&amp;<strong>x</strong>=123456&amp;<strong>y</strong>=2234567</pre>
<pre>https://portal.taibif.tw/BDTools/proj4/convert.php?<strong>source</strong>=5&amp;<strong>destination</strong>=1&amp;<strong>x</strong>=123456&amp;<strong>y</strong>=2234567</pre>
</div>


Expand Down
1 change: 0 additions & 1 deletion src/occurrence/OccurrenceDownload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ function OccurrenceDownload(props) {

//const Occur = props.data.results;
//const length = Occur.length;

//console.log(queryString);
//if (length < 5000) {
//} else {
Expand Down
12 changes: 6 additions & 6 deletions templates/article-list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
30 changes: 8 additions & 22 deletions templates/dataset.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ <h4 class="heading-md-ul">簡介</h4>
<!-- row end -->
<!-- 簡介 end -->

<!-- 地理分佈 begin -->
<!-- 地理分佈 begin >
<h4 class="heading-md-ul">地理分佈</h4>
<p>特有種。台東大漢山，新化農場至屏東茶茶牙賴一帶山區之闊葉林中。</p>
<p>
Expand All @@ -97,42 +97,28 @@ <h4 class="heading-md-ul">地理分佈</h4>
<a href="#"><img src="images/bynchorizontal.png"></a>
</p>
<img src="https://fakeimg.pl/600x300/?text=map" alt="" class="img-responsive">
<!-- 地理分佈 end -->
< 地理分佈 end -->

<!-- 資料集說明 begin -->
<!-- 資料集說明 begin >
<h4 class="heading-md-ul">資料集說明</h4>
<p>台灣是在地質活動頻繁的大陸島，於 200-300 萬年前形成於四塊板塊所組成的聚合板塊邊緣之上。在這篇台灣植物相的研究中，研究者運用了 GBIF 整合之東亞與南亞開花植物類群分布的點位資料，再區分特有種與非特有種後，推測出後者潛在的播遷來源。許多豆科植物的生長與繁殖需仰賴與固氮菌(根瘤菌)的共生，這共生關係由六千萬年前的單一起源逐步演化而來。然而，此與微生物的共生關係會促進或減少植物分布範圍仍屬未知。</p>
<p><a href="#"><span class="myicon icon-link"></span>http://collections.nmnh.si.edu/search/botany/</a></p>
<!-- 資料集說明 end -->
<資料集說明 end -->

<!-- 聯絡資訊 begin -->
<h4 class="heading-md-ul">聯絡資訊</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> [email protected]</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> [email protected]</a></li>
<li><span class="myicon icon-mail"></span> [email protected]</a></li>
<li><a href="#"><span class="myicon icon-link"></span> https://portal.taibif.tw/</a></li>
</ul>
</div>
Expand Down