Skip to content

Commit 5a52469

Browse files
authored
Merge pull request #228 from nfsnfs/modify_2024_to_2025
Update 2025 links for base.html, expense_lists.html, and index.html
2 parents adca219 + 8f90c95 commit 5a52469

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

templates/base.html

+11-11
Original file line numberDiff line numberDiff line change
@@ -86,32 +86,32 @@
8686
<div class="navbar-start">
8787
{% if g.user and g.user.data %}
8888
<div class="navbar-item has-dropdown is-hoverable">
89-
<a class="navbar-link has-text-weight-medium" href="/project/2024/">
89+
<a class="navbar-link has-text-weight-medium" href="/project/2025/">
9090
<span class="icon"><i class="fas fa-star"></i></span>
91-
<span>2024</span>
91+
<span>2025</span>
9292
</a>
9393
<div class="navbar-dropdown">
9494
<a
9595
class="navbar-item has-text-weight-medium"
96-
href="/project/2024/"
96+
href="/project/2025/"
9797
>
9898
<span class="icon"><i class="far fa-bookmark"></i></span>
99-
<span>COSCUP 2024</span>
99+
<span>COSCUP 2025</span>
100100
</a>
101-
<a class="navbar-item has-text-weight-medium" href="/tasks/2024">
101+
<a class="navbar-item has-text-weight-medium" href="/tasks/2025">
102102
<span class="icon"><i class="fas fa-pizza-slice"></i></span>
103-
<span>2024 解任務!</span>
103+
<span>2025 解任務!</span>
104104
</a>
105105
</div>
106106
</div>
107107
{% else %}
108-
<a class="navbar-item has-text-weight-medium" href="/tasks/2024">
108+
<a class="navbar-item has-text-weight-medium" href="/tasks/2025">
109109
<span class="icon"><i class="fas fa-pizza-slice"></i></span>
110-
<span>2024 解任務!</span>
110+
<span>2025 解任務!</span>
111111
</a>
112-
<a class="navbar-item has-text-weight-medium" href="/project/2024/">
112+
<a class="navbar-item has-text-weight-medium" href="/project/2025/">
113113
<span class="icon"><i class="far fa-bookmark"></i></span>
114-
<span>COSCUP 2024</span>
114+
<span>COSCUP 2025</span>
115115
</a>
116116
{% endif %}
117117
<div class="navbar-item has-dropdown is-hoverable">
@@ -379,7 +379,7 @@
379379
<hr style="border: 3px solid #e1e1e1; border-radius: 3px" />
380380
<p>
381381
<span class="icon"><i class="fas fa-rocket"></i></span>
382-
<span>2020, 2021, 2022, 2023, 2024</span>
382+
<span>2020, 2021, 2022, 2023, 2024, 2025</span>
383383
</p>
384384
</div>
385385
<div class="column"></div>

templates/expense_lists.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
<div class="notification is-warning is-light" v-if="bank_alert === 0">
2727
<span class="icon"><i class="fas fa-exclamation-circle"></i></span>
2828
<span>申請預算撥款需要相關的匯款銀行資訊,可以到「<strong><a href="/setting/profile_real">真實個人資訊</a></strong>」預先設定,讓系動自動帶入,感謝!</span><br>
29-
<span>第一次請款請先詳細閱讀 <strong><a href="https://docs.google.com/document/d/1hBh8U0xZcy3u55jqd3v0jQzo6O7sHuCkK7X-iRNFiY8/edit">COSCUP 2024 請款說明</a></strong></span><br>
30-
<span>申請完請款需要將單據照片上傳至<strong><a href="https://forms.gle/CfMmqMJe7tkw5kei6">COSCUP 2024 單據上傳區</a></strong> 後,再將實體單據提供給財務組</span><br>
29+
<span>第一次請款請先詳細閱讀 <strong><a href="https://docs.google.com/document/d/11EHj8SSLnv8mSOyeuEO64m-4cnlciZ9b8_sMpU_S5ME/edit?usp=sharing">COSCUP 2025 請款說明</a></strong></span><br>
30+
<span>申請完請款需要將單據照片上傳至<strong><a href="https://docs.google.com/forms/d/e/1FAIpQLSfRf1bIR3EXFmTHz-vqW-_OXHBnemVq75ETz0L_CI_WEmvowA/viewform">COSCUP 2025 單據上傳區</a></strong> 後,再將實體單據提供給財務組</span><br>
3131
</div>
3232
<table class="table is-fullwidth">
3333
<thead>

templates/index.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
<div class="column is-4">
4444
<article class="message is-warning">
4545
<div class="message-header">
46-
<p><span class="icon"><i class="fas fa-tree"></i></span> 2024 籌備團隊已開始招募</p>
46+
<p><span class="icon"><i class="fas fa-tree"></i></span> 2025 籌備團隊已開始招募</p>
4747
</div>
4848
<div class="message-body">
49-
請參考各組的招募資訊與遴選方式,選擇感興趣的組別加入!→ <a href="/project/2024/"><strong>2024 組別列表</strong></a>
49+
請參考各組的招募資訊與遴選方式,選擇感興趣的組別加入!→ <a href="/project/2025/"><strong>2025 組別列表</strong></a>
5050
</div>
5151
</article>
5252
</div>
@@ -66,7 +66,7 @@
6666
<div class="column"></div>
6767
<div class="column">
6868
<div class="has-text-centered">
69-
<a href="/project/2024" class="button is-large is-info is-outlined is-light is-rounded">
69+
<a href="/project/2025" class="button is-large is-info is-outlined is-light is-rounded">
7070
<span class="icon"><i class="far fa-check-circle"></i></span>
7171
<span>加入志工夥伴</span>
7272
</a>

0 commit comments

Comments
 (0)