diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-03-17 13:23:09 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-03-17 13:23:09 +0100 |
| commit | 001c425acd3345e363fe36c014f776069dd587dc (patch) | |
| tree | d071acc21568ebff31c2194da6e3cb618f981814 /app/views | |
| parent | d6309fb17e3a90eec103a3c4e5de37cf9625a69d (diff) | |
Déplacement de Import/export dans gestion des abonnements + ajout date à côté de Aujourd'hui/Hier
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/configure/importExport.phtml | 2 | ||||
| -rw-r--r-- | app/views/index/index.phtml | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/views/configure/importExport.phtml b/app/views/configure/importExport.phtml index fd274b5b2..c39b85a5c 100644 --- a/app/views/configure/importExport.phtml +++ b/app/views/configure/importExport.phtml @@ -11,6 +11,8 @@ </body> </opml> <?php } else { ?> +<?php $this->partial ('aside_feed'); ?> + <div class="post "> <form method="post" action="<?php echo Url::display (array ('c' => 'configure', 'a' => 'importExport', 'params' => array ('q' => 'import'))); ?>" enctype="multipart/form-data"> <legend>Import / export au format OPML</legend> diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml index 7734630ef..0db9dac5b 100644 --- a/app/views/index/index.phtml +++ b/app/views/index/index.phtml @@ -15,10 +15,10 @@ if (isset ($this->entryPaginator)) { <?php foreach ($items as $item) { ?> <?php if ($display_today && $item->isDay (Days::TODAY)) { ?> - <div class="day">Aujourd'hui</div> + <div class="day">Aujourd'hui - <?php echo timestamptodate (time (), false); ?></div> <?php $display_today = false; } ?> <?php if ($display_yesterday && $item->isDay (Days::YESTERDAY)) { ?> - <div class="day">Hier</div> + <div class="day">Hier - <?php echo timestamptodate (time () - 86400, false); ?></div> <?php $display_yesterday = false; } ?> <?php if ($display_others && $item->isDay (Days::BEFORE_YESTERDAY)) { ?> <div class="day">À partir d'avant-hier</div> |