From 250c75de2a28d5bd7b724fd170e75e5910c79ddc Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Mon, 3 Dec 2012 21:19:28 +0100
Subject: Correction design (issue #6), début correction bug #16 (à voir où ça
 en est)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

(limited to 'app/views/index')

diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml
index 08c3aa721..2e6d75ae8 100644
--- a/app/views/index/index.phtml
+++ b/app/views/index/index.phtml
@@ -15,18 +15,21 @@
 	
 	<?php foreach ($items as $item) { ?>
 	<div class="post flux<?php echo !$item->isRead () ? ' not_read' : ''; ?><?php echo $item->isFavorite () ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id (); ?>">
-		<?php $author = $item->author (); ?>
+		<h1 class="title"><a target="_blank" href="<?php echo $item->link (); ?>"> <?php echo $item->title (); ?></a></h1>
+		
 		<div class="before">
-			<?php $feed = $item->feed (true); ?>
-			<?php echo $author != '' ? $author . ' a écrit' : ''; ?>
-			le <?php echo $item->date (); ?>
-			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>
 		
-		<h1 class="title"><a target="_blank" href="<?php echo $item->link (); ?>"> <?php echo $item->title (); ?></a></h1>
 		<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">
 			<?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><!--
@@ -40,6 +43,7 @@
 			--><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