Correction design (issue #6), début correction bug #16 (à voir où ça en est)

3 files changed, 13 insertions, 12 deletions

diff --git a/app/controllers/configureController.php b/app/controllers/configureController.php
index d86cda14c..721ff1e95 100755
--- a/app/controllers/configureController.php
+++ b/app/controllers/configureController.php
@@ -9,6 +9,8 @@ class configureController extends ActionController {
 			);
 		}
 	}
+	
+	public function indexAction () { }
 
 	public function categorizeAction () {
 		$catDAO = new CategoryDAO ();
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 } ?>
diff --git a/app/views/javascript/main.phtml b/app/views/javascript/main.phtml
index e416cad95..a9ce2c5b1 100644
--- a/app/views/javascript/main.phtml
+++ b/app/views/javascript/main.phtml
@@ -24,7 +24,7 @@ function slide (new_active, old_active) {
 		old_active.children (".content").slideUp (200);
 		new_active.children (".content").slideDown (200, function () {
 			$.smoothScroll({
-				offset: new_active.position ().top + 25
+				offset: new_active.position ().top
 			});
 		});
 	} else {
@@ -32,11 +32,6 @@ function slide (new_active, old_active) {
 			offset: new_active.position ().top + 25
 		});
 	}
-	
-	// si le dernier post est actif, on charge les suivants
-	if (new_active.attr ("id") == $(".post.flux:last").attr ("id")) {
-		load_more_posts ();
-	}
 }
 
 function add_not_read (nb) {