diff options
| author | nodiscc <nodiscc@gmail.com> | 2015-06-23 15:07:03 +0200 |
|---|---|---|
| committer | nodiscc <nodiscc@gmail.com> | 2015-06-23 15:07:03 +0200 |
| commit | 4a5827ff5adadcd8c1ef9231e485f77c0c376c03 (patch) | |
| tree | b1f7ea8cc4df86ff672e4e17938a23ed4f52cf6b | |
| parent | adb1d6c213e64f7a6f4559adbc4d1f69f5a74e62 (diff) | |
| parent | 4de71445d3d174b5ef3462a1c4470a95cc00017e (diff) | |
| download | Shaarli-4a5827ff5adadcd8c1ef9231e485f77c0c376c03.tar.gz Shaarli-4a5827ff5adadcd8c1ef9231e485f77c0c376c03.tar.zst Shaarli-4a5827ff5adadcd8c1ef9231e485f77c0c376c03.zip | |
Merge remote-tracking branch 'ArthurHoaro/daily-date' into next
| -rw-r--r-- | index.php | 2 | ||||
| -rw-r--r-- | tpl/daily.html | 2 |
2 files changed, 2 insertions, 2 deletions
| @@ -981,7 +981,7 @@ function showDaily() | |||
| 981 | $PAGE->assign('linksToDisplay',$linksToDisplay); | 981 | $PAGE->assign('linksToDisplay',$linksToDisplay); |
| 982 | $PAGE->assign('linkcount',count($LINKSDB)); | 982 | $PAGE->assign('linkcount',count($LINKSDB)); |
| 983 | $PAGE->assign('cols', $columns); | 983 | $PAGE->assign('cols', $columns); |
| 984 | $PAGE->assign('day',utf8_encode(strftime('%A %d, %B %Y',linkdate2timestamp($day.'_000000')))); | 984 | $PAGE->assign('day',linkdate2timestamp($day.'_000000')); |
| 985 | $PAGE->assign('previousday',$previousday); | 985 | $PAGE->assign('previousday',$previousday); |
| 986 | $PAGE->assign('nextday',$nextday); | 986 | $PAGE->assign('nextday',$nextday); |
| 987 | $PAGE->renderPage('daily'); | 987 | $PAGE->renderPage('daily'); |
diff --git a/tpl/daily.html b/tpl/daily.html index 919795bb..0f762490 100644 --- a/tpl/daily.html +++ b/tpl/daily.html | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | <a href="?do=dailyrss" title="1 RSS entry per day"><img src="images/feed-icon-14x14.png#" alt="rss_feed">Daily RSS Feed</a> | 13 | <a href="?do=dailyrss" title="1 RSS entry per day"><img src="images/feed-icon-14x14.png#" alt="rss_feed">Daily RSS Feed</a> |
| 14 | </div> | 14 | </div> |
| 15 | <div class="dailyTitle"><img src="../images/floral_left.png" width="51" height="50" class="nomobile" alt="floral_left"> The Daily Shaarli <img src="../images/floral_right.png" width="51" height="50" class="nomobile" alt="floral_right"></div> | 15 | <div class="dailyTitle"><img src="../images/floral_left.png" width="51" height="50" class="nomobile" alt="floral_left"> The Daily Shaarli <img src="../images/floral_right.png" width="51" height="50" class="nomobile" alt="floral_right"></div> |
| 16 | <div class="dailyDate"><span class="nomobile">———————————</span> {$day} <span class="nomobile">———————————</span></div> | 16 | <div class="dailyDate"><span class="nomobile">———————————</span> {function="strftime('%A %d, %B %Y', $day)"} <span class="nomobile">———————————</span></div> |
| 17 | <div class="clear"></div> | 17 | <div class="clear"></div> |
| 18 | 18 | ||
| 19 | {if="$linksToDisplay"} | 19 | {if="$linksToDisplay"} |