Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
jackeyGao committed Jan 4, 2018
1 parent 79e7870 commit 593722a
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 4 deletions.
4 changes: 4 additions & 0 deletions assets/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ body {
letter-spacing: 5px;
}

#pcontent {
white-space: pre;
}

.calendar-wrapper {
padding-left: 1em;
padding-right: 1em;
Expand Down
14 changes: 14 additions & 0 deletions assets/js/web.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,17 @@ function monDay(d) {
diff = d.getDate() - day + (day == 0 ? -6:1);
return new Date(d.setDate(diff));
}

function weekNumber(d) {
// Copy date so don't modify original
d = new Date(Date.UTC(d.getFullYear(), d.getMonth(), d.getDate()));
// Set to nearest Thursday: current date + 4 - current day number
// Make Sunday's day number 7
d.setUTCDate(d.getUTCDate() + 4 - (d.getUTCDay()||7));
// Get first day of year
var yearStart = new Date(Date.UTC(d.getUTCFullYear(),0,1));
// Calculate full weeks to nearest Thursday
var weekNo = Math.ceil(( ( (d - yearStart) / 86400000) + 1)/7);
// Return array of year and week number
return [d.getUTCFullYear(), weekNo];
}
19 changes: 19 additions & 0 deletions assets/js/诗词表.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
var weekPoetry = {
1: {
"title": "清平乐·别来春半",
"author": "李煜",
"content": "别来春半,\n触目柔肠断。\n砌下落梅如雪乱,\n拂了一身还满。\n雁来音信无凭,\n路遥归梦难成。\n离恨恰如春草,\n更行更远还生。"
},

2: {
"title": "问刘十九",
"author": "白居易",
"content": "绿蚁新醅酒,\n红泥小火炉。\n晚来天欲雪,\n能饮一杯无?"
},

3: {
"title": "江城子·十年生死两茫茫",
"author": "苏轼",
"content": "十年生死两茫茫,\n不思量,自难忘。\n千里孤坟,无处话凄凉。\n纵使相逢应不识,\n尘满面,鬓如霜。\n夜来幽梦忽还乡,\n小轩窗,正梳妆。\n相顾无言,惟有泪千行。\n料得年年肠断处,\n明月夜,短松冈。"
}
}
17 changes: 13 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<table style="width: 100%;">
<tr>
<td valign="middle" align="center" class="poetry-content">
<div class="uu">
<div id="pcontent" class="uu">
别来春半,<br/>
触目柔肠断。<br/>
砌下落梅如雪乱,<br/>
Expand All @@ -34,8 +34,8 @@
</table>
</div>
<div class="two wide column poetry-title uu" style="padding: 0;">
<div class="title">清平乐·别来春半</div>
<div class="author">李煜</div>
<div id="ptitle" class="title">清平乐·别来春半</div>
<div id="pauthor" class="author">李煜</div>
</div>
</div>

Expand Down Expand Up @@ -80,9 +80,11 @@
<script src="assets/js/calendar.js"></script>
<script src="assets/js/web.js"></script>
<script src="assets/js/节日表.js"></script>
<script src="assets/js/诗词表.js"></script>

<script>
var t = new Date();
var currentWeekNumber = weekNumber(t);
var currentMonday = monDay(t);
var currentWeeks = weekDays(currentMonday);

Expand All @@ -94,6 +96,14 @@
document.getElementById("todayLunar").innerHTML = lunarDate
document.getElementById("todaySolar").innerHTML = solarDate

// Poetry
var poetry = weekPoetry[currentWeekNumber[1]]
if (poetry) {
document.getElementById("pcontent").innerHTML = poetry.content
document.getElementById("ptitle").innerHTML = poetry.title
document.getElementById("pauthor").innerHTML = poetry.author
}

var weekIds = ["w1", "w2", "w3", "w4", "w5", "w6", "w7"]

for (var i in weekIds) {
Expand Down Expand Up @@ -139,7 +149,6 @@
continue
}

console.log(lunar.cMonth + '.' + lunar.cDay)
if (lunar.cMonth + '.' + lunar.cDay in solarDayMap) {
lunarElement.innerHTML = solarDayMap[lunar.cMonth + '.' + lunar.cDay]
continue
Expand Down

0 comments on commit 593722a

Please sign in to comment.