diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-09-14 20:00:42 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-09-14 20:00:42 +0200 |
| commit | 597a62148a17949a030afed5c62525914de84e11 (patch) | |
| tree | c9c32f8358efd52595af667286cc6319a40617c8 /app/views | |
| parent | b2e02ebf873d5045f91ec71091a556a21501c5fe (diff) | |
| parent | d47137cddd6a02bf609728c76b8adc7cdea1adf3 (diff) | |
Merge branch 'NbUnread' of https://github.com/Alkarex/FreshRSS into Alkarex-NbUnread
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/helpers/view/normal_view.phtml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml index fb4e60cf6..e5d03776c 100644 --- a/app/views/helpers/view/normal_view.phtml +++ b/app/views/helpers/view/normal_view.phtml @@ -16,13 +16,13 @@ if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) { <?php foreach ($items as $item) { ?> <?php if ($display_today && $item->isDay (Days::TODAY)) { ?> - <div class="day"><?php echo Translate::t ('today'); ?> - <?php echo timestamptodate (time (), false); ?></div> + <div class="day"><?php echo Translate::t ('today'); ?> - <?php echo timestamptodate (time (), false); ?> : <em><?php echo $this->currentName; ?></em></div> <?php $display_today = false; } ?> <?php if ($display_yesterday && $item->isDay (Days::YESTERDAY)) { ?> - <div class="day"><?php echo Translate::t ('yesterday'); ?> - <?php echo timestamptodate (time () - 86400, false); ?></div> + <div class="day"><?php echo Translate::t ('yesterday'); ?> - <?php echo timestamptodate (time () - 86400, false); ?> : <em><?php echo $this->currentName; ?></em></div> <?php $display_yesterday = false; } ?> <?php if ($display_others && $item->isDay (Days::BEFORE_YESTERDAY)) { ?> - <div class="day"><?php echo Translate::t ('before_yesterday'); ?></div> + <div class="day"><?php echo Translate::t ('before_yesterday'); ?> : <em><?php echo $this->currentName; ?></em></div> <?php $display_others = false; } ?> <div class="flux<?php echo !$item->isRead () ? ' not_read' : ''; ?><?php echo $item->isFavorite () ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id (); ?>"> |