diff options
| author | ArthurHoaro <arthur@hoa.ro> | 2019-06-08 14:09:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-08 14:09:07 +0200 |
| commit | bd231539e93649bf623bb91703131682ad0b0db7 (patch) | |
| tree | 2c3db0d64bcc6564b23e843c048c789216d3ae2e /tpl | |
| parent | 86aa2486541660a78ab3e347ba12e25aae232b7c (diff) | |
| parent | 5321f704b563df03232e2f8a1d2a26ecb8297428 (diff) | |
| download | Shaarli-bd231539e93649bf623bb91703131682ad0b0db7.tar.gz Shaarli-bd231539e93649bf623bb91703131682ad0b0db7.tar.zst Shaarli-bd231539e93649bf623bb91703131682ad0b0db7.zip | |
Merge pull request #1308 from ArthurHoaro/feature/daily-date
Daily - display the current day instead of the previous one
Diffstat (limited to 'tpl')
| -rw-r--r-- | tpl/default/daily.html | 7 | ||||
| -rw-r--r-- | tpl/vintage/daily.html | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/tpl/default/daily.html b/tpl/default/daily.html index 359ecbd0..6b5103a4 100644 --- a/tpl/default/daily.html +++ b/tpl/default/daily.html | |||
| @@ -44,7 +44,12 @@ | |||
| 44 | </div> | 44 | </div> |
| 45 | </div> | 45 | </div> |
| 46 | <div> | 46 | <div> |
| 47 | <h3 class="window-subtitle">{function="format_date($dayDate, false)"}</h3> | 47 | <h3 class="window-subtitle"> |
| 48 | {if="!empty($dayDesc)"} | ||
| 49 | {$dayDesc} - | ||
| 50 | {/if} | ||
| 51 | {function="format_date($dayDate, false)"} | ||
| 52 | </h3> | ||
| 48 | 53 | ||
| 49 | <div id="plugin_zone_about_daily" class="plugin_zone"> | 54 | <div id="plugin_zone_about_daily" class="plugin_zone"> |
| 50 | {loop="$daily_about_plugin"} | 55 | {loop="$daily_about_plugin"} |
diff --git a/tpl/vintage/daily.html b/tpl/vintage/daily.html index 71d84475..00f18e26 100644 --- a/tpl/vintage/daily.html +++ b/tpl/vintage/daily.html | |||
| @@ -35,6 +35,9 @@ | |||
| 35 | 35 | ||
| 36 | <div class="dailyDate"> | 36 | <div class="dailyDate"> |
| 37 | <span class="nomobile">———————————</span> | 37 | <span class="nomobile">———————————</span> |
| 38 | {if="!empty($dayDesc)"} | ||
| 39 | {$dayDesc} - | ||
| 40 | {/if} | ||
| 38 | {function="strftime('%A %d, %B %Y', $day)"} | 41 | {function="strftime('%A %d, %B %Y', $day)"} |
| 39 | <span class="nomobile">———————————</span> | 42 | <span class="nomobile">———————————</span> |
| 40 | </div> | 43 | </div> |