Déplacement de Import/export dans gestion des abonnements + ajout date à côté de Aujourd'hui/Hier

6 files changed, 18 insertions, 3 deletions

diff --git a/app/controllers/configureController.php b/app/controllers/configureController.php
index e807fb06d..9e1c7b2cb 100755
--- a/app/controllers/configureController.php
+++ b/app/controllers/configureController.php
@@ -186,6 +186,10 @@ class configureController extends ActionController {
 			}
 		}
 
+		$feedDAO = new FeedDAO ();
+		$this->view->feeds = $feedDAO->listFeeds ();
+		$this->view->flux = false;
+
 		View::prependTitle ('Importation et exportation OPML - ');
 	}
 
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 1bcb108a4..2f3f6ea7a 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -8,6 +8,10 @@
 		</div>
 	</form></li>
 
+	<li class="item<?php echo Request::actionName () == 'importExport' ? ' active' : ''; ?>"><a href="<?php echo _url ('configure', 'importExport'); ?>">Import / Export OPML</a></li>
+
+	<li class="separator"></li>
+
 	<?php if (!empty ($this->feeds)) { ?>
 	<?php foreach ($this->feeds as $feed) { ?>
 	<li class="item<?php echo ($this->flux && $this->flux->id () == $feed->id ()) ? ' active' : ''; ?>">
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 852170b64..77cd1b50a 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -36,7 +36,6 @@
 				<li class="item"><a href="<?php echo _url ('configure', 'categorize'); ?>">Catégories</a></li>
 				<li class="item"><a href="<?php echo _url ('configure', 'shortcut'); ?>">Raccourcis</a></li>
 				<li class="separator"></li>
-				<li class="item"><a href="<?php echo _url ('configure', 'importExport'); ?>">Import / Export OPML</a></li>
 				<li class="item"><a href="<?php echo _url ('index', 'about'); ?>">À propos</a></li>
 			</ul>
 		</div>
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>
diff --git a/public/theme/base.css b/public/theme/base.css
index e0819a0d2..4d7e80a90 100644
--- a/public/theme/base.css
+++ b/public/theme/base.css
@@ -269,6 +269,12 @@ input, select {
 		font-weight: bold;
 		text-shadow: 0 0 1px #ddd;
 	}
+	.nav.nav-list .separator {
+		display: block;
+		height: 0;
+		margin: 5px 0;
+		border-bottom: 1px solid #ddd;
+	}
 
 	.nav.nav-list .nav-form {
 		padding: 3px;