From 1c202b9364c766d1bd28a22a04b3f70077f23e84 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 2 May 2013 09:44:34 +0200
Subject: Correction code + ajout commentaires + à l'ajout d'un flux, on
 n'ajoute plus les trop vieux articles
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/index/index.phtml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'app/views/index/index.phtml')

diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml
index c39775fd7..0e09f84df 100644
--- a/app/views/index/index.phtml
+++ b/app/views/index/index.phtml
@@ -1,18 +1,16 @@
 <?php
-if (Request::param ('output', '') == 'rss') {
-	$this->renderHelper ('rss');
-	return;
-}
-?>
+$output = Request::param ('output', 'normal');
 
-<?php $this->partial ('aside_flux'); ?>
-
-<?php $this->partial ('nav_menu'); ?>
+if ($output == 'rss') {
+	$this->renderHelper ('rss');
+} else {
+	$this->partial ('aside_flux');
+	$this->partial ('nav_menu');
 
-<?php
-if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) {
-	$items = $this->entryPaginator->items ();
+	if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) {
+		$items = $this->entryPaginator->items ();
 ?>
+
 <div id="stream">
 	<?php
 		$display_today = true;
@@ -113,8 +111,10 @@ if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) {
 	
 	<?php $this->entryPaginator->render ('pagination.phtml', 'next'); ?>
 </div>
-<?php } else { ?>
+
+	<?php } else { ?>
 <div class="alert alert-warn">
 	<span class="alert-head"><?php echo Translate::t ('no_feed_to_display'); ?></span>
 </div>
+	<?php } ?>
 <?php } ?>
-- 
cgit v1.2.3