From adc704c3d75518fd7ed7a32b9ed21d9b7eb71c99 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 7 Dec 2012 21:44:39 +0100
Subject: git diff Attention git diff À partir de ce commit, les contenus des
 articles sont compressés dans la base de données - pas compatible avec les
 anciennes versions, pour cela il faut mettre à jour la BDD
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/index/index.phtml | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'app/views/index')

diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml
index 86352f6ad..0ddf4efdd 100644
--- a/app/views/index/index.phtml
+++ b/app/views/index/index.phtml
@@ -18,32 +18,29 @@
 		<h1 class="title"><a target="_blank" href="<?php echo $item->link (); ?>"> <?php echo $item->title (); ?></a></h1>
 		
 		<div class="before">
-		</div>
-		
-		<div class="content"><?php echo $item->content (); ?></div>
-		
-		<div class="after">
 			<?php $author = $item->author (); ?>
 			<?php $feed = $item->feed (true); ?>
 			Le <?php echo $item->date (); ?>
 			<?php echo $author != '' ? ' par ' . $author : ''; ?>
 			sur <a target="_blank" href="<?php echo $feed->website (); ?>"><?php echo $feed->name (); ?> <img src="http://www.google.com/s2/favicons?domain=<?php echo get_domain ($feed->website ()); ?>" alt="" /></a>,
-			
-			<div class="options">
+		</div>
+		
+		<div class="content"><?php echo $item->content (); ?></div>
+		
+		<div class="after">
 			<?php if (!login_is_conf ($this->conf) || is_logged ()) { ?>
 			<?php if (!$item->isRead ()) { ?>
-			<a class="read" href="<?php echo Url::display (array ('c' => 'entry', 'a' => 'read', 'params' => array ('id' => $item->id (), 'is_read' => 1))); ?>">J'ai fini de lire l'article</a><!--
+			<a class="read" href="<?php echo Url::display (array ('c' => 'entry', 'a' => 'read', 'params' => array ('id' => $item->id (), 'is_read' => 1))); ?>">J'ai fini de lire l'article</a>
 			<?php } else { ?>
-			<a class="read" href="<?php echo Url::display (array ('c' => 'entry', 'a' => 'read', 'params' => array ('id' => $item->id (), 'is_read' => 0))); ?>">Marquer comme non lu</a><!--
+			<a class="read" href="<?php echo Url::display (array ('c' => 'entry', 'a' => 'read', 'params' => array ('id' => $item->id (), 'is_read' => 0))); ?>">Marquer comme non lu</a>
 			<?php } ?>
-			
+			-
 			<?php if (!$item->isFavorite ()) { ?>
-			--><a class="bookmark" href="<?php echo Url::display (array ('c' => 'entry', 'a' => 'bookmark', 'params' => array ('id' => $item->id (), 'is_favorite' => 1))); ?>">Ajouter l'article à mes favoris</a>
+			<a class="bookmark" href="<?php echo Url::display (array ('c' => 'entry', 'a' => 'bookmark', 'params' => array ('id' => $item->id (), 'is_favorite' => 1))); ?>">Ajouter l'article à mes favoris</a>
 			<?php } else { ?>
-			--><a class="bookmark" href="<?php echo Url::display (array ('c' => 'entry', 'a' => 'bookmark', 'params' => array ('id' => $item->id (), 'is_favorite' => 0))); ?>">Retirer l'article de mes favoris</a>
+			<a class="bookmark" href="<?php echo Url::display (array ('c' => 'entry', 'a' => 'bookmark', 'params' => array ('id' => $item->id (), 'is_favorite' => 0))); ?>">Retirer l'article de mes favoris</a>
 			<?php } ?>
 			<?php } ?>
-			</div>
 		</div>
 	</div>
 	<?php } ?>
-- 
cgit v1.2.3