Ajout d'indicateur de jour dans le flux d'articles + correction de bugs js liés à cet ajout et code mort

6 files changed, 74 insertions, 46 deletions

diff --git a/app/App_FrontController.php b/app/App_FrontController.php
index e288cb32e..55bcfc167 100644
--- a/app/App_FrontController.php
+++ b/app/App_FrontController.php
@@ -24,6 +24,7 @@ class App_FrontController extends FrontController {
 	
 	private function loadModels () {
 		include (APP_PATH . '/models/RSSConfiguration.php');
+		include (APP_PATH . '/models/Days.php');
 		include (APP_PATH . '/models/Category.php');
 		include (APP_PATH . '/models/Feed.php');
 		include (APP_PATH . '/models/Entry.php');
diff --git a/app/models/Days.php b/app/models/Days.php
new file mode 100644
index 000000000..a859cbace
--- /dev/null
+++ b/app/models/Days.php
@@ -0,0 +1,7 @@
+<?php
+
+class Days {
+	const TODAY = 0;
+	const YESTERDAY = 1;
+	const BEFORE_YESTERDAY = 2;
+}
diff --git a/app/models/Entry.php b/app/models/Entry.php
index 2725d265d..0e1d69921 100755
--- a/app/models/Entry.php
+++ b/app/models/Entry.php
@@ -1,6 +1,7 @@
 <?php
 
 class Entry extends Model {
+
 	private $id = null;
 	private $guid;
 	private $title;
@@ -99,6 +100,24 @@ class Entry extends Model {
 	public function _feed ($value) {
 		$this->feed = $value;
 	}
+
+	public function isDay ($day) {
+		$date = getdate ();
+		$today = mktime (0, 0, 0, $date['mon'], $date['mday'], $date['year']);
+		$yesterday = $today - 86400;
+
+		if ($day == Days::TODAY &&
+		    $this->date >= $today && $this->date < $today + 86400) {
+			return true;
+		} elseif ($day == Days::YESTERDAY &&
+		    $this->date >= $yesterday && $this->date < $yesterday + 86400) {
+			return true;
+		} elseif ($day == Days::BEFORE_YESTERDAY && $this->date < $yesterday) {
+			return true;
+		} else {
+			return false;
+		}
+	}
 }
 
 class EntryDAO extends Model_pdo {
diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml
index bccb6588b..6ecbfd72f 100644
--- a/app/views/index/index.phtml
+++ b/app/views/index/index.phtml
@@ -16,7 +16,23 @@
 <?php if (!empty ($items)) { ?>
 
 <div id="stream">
+	<?php
+		$display_today = true;
+		$display_yesterday = true;
+		$display_others = true;
+	?>
 	<?php foreach ($items as $item) { ?>
+
+	<?php if ($display_today && $item->isDay (Days::TODAY)) { ?>
+	<div class="day">Aujourd'hui</div>
+	<?php $display_today = false; } ?>
+	<?php if ($display_yesterday && $item->isDay (Days::YESTERDAY)) { ?>
+	<div class="day">Hier</div>
+	<?php $display_yesterday = false; } ?>
+	<?php if ($display_others && $item->isDay (Days::BEFORE_YESTERDAY)) { ?>
+	<div class="day">À partir d'avant-hier</div>
+	<?php $display_others = false; } ?>
+
 	<div class="flux<?php echo !$item->isRead () ? ' not_read' : ''; ?><?php echo $item->isFavorite () ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id (); ?>">
 		<ul class="flux_header">
 			<li class="item manage">
diff --git a/app/views/javascript/main.phtml b/app/views/javascript/main.phtml
index 8eb7caf2a..0f2c51888 100644
--- a/app/views/javascript/main.phtml
+++ b/app/views/javascript/main.phtml
@@ -19,7 +19,7 @@ function redirect (url, new_tab) {
 function slide (new_active, old_active) {
 	old_active.removeClass ("active");
 	new_active.addClass ("active");
-	
+
 	if (hide_posts) {
 		old_active.children (".content").slideUp (500);
 		new_active.children (".content").slideDown (500, function () {
@@ -34,43 +34,28 @@ function slide (new_active, old_active) {
 	}
 }
 
-function add_not_read (nb) {
-	span_not_read = $("#categories li.all span.nb_not_read");
-	
-	html = span_not_read.html ();
-	
-	regex = /(\d+)/;
-	nb_not_read = parseInt (regex.exec (html)[1]) + nb;
-	
-	span_not_read.html (nb_not_read);
-}
-
 function mark_read (active) {
 	if (active[0] === undefined) {
 		return false;
 	}
-	
+
 	url =  active.find ("a.read").attr ("href");
 	if (url === undefined) {
 		return false;
 	}
-	
+
 	$.ajax ({
 		type: 'POST',
 		url: url,
 		data : { ajax: true }
 	}).done (function (data) {
 		res = jQuery.parseJSON(data);
-		
+
 		active.find ("a.read").attr ("href", res.url);
 		if (active.hasClass ("not_read")) {
 			active.removeClass ("not_read");
-			//active.find ("a.read").html ("Marquer comme non lu");
-			add_not_read (-1);
 		} else {
 			active.addClass ("not_read");
-			//active.find ("a.read").html ("J'ai fini de lire l'article");
-			add_not_read (1);
 		}
 	});
 }
@@ -84,21 +69,19 @@ function mark_favorite (active) {
 	if (url === undefined) {
 		return false;
 	}
-	
+
 	$.ajax ({
 		type: 'POST',
 		url: url,
 		data : { ajax: true }
 	}).done (function (data) {
 		res = jQuery.parseJSON(data);
-		
+
 		active.find ("a.bookmark").attr ("href", res.url);
 		if (active.hasClass ("favorite")) {
 			active.removeClass ("favorite");
-			//active.find ("a.bookmark").html ("Ajouter l'article à mes favoris");
 		} else {
 			active.addClass ("favorite");
-			//active.find ("a.bookmark").html ("Retirer l'article de mes favoris");
 		}
 	});
 }
@@ -121,7 +104,7 @@ function init_posts () {
 	$(".flux").click (function () {
 		old_active = $(".flux.active");
 		new_active = $(this);
-		
+
 		if (old_active[0] != new_active[0]) {
 			slide (new_active, old_active);
 		}
@@ -130,14 +113,14 @@ function init_posts () {
 	$(".flux a.read").click (function () {
 		active = $(this).parents (".flux");
 		mark_read (active);
-	
+
 		return false;
 	});
 
 	$(".flux a.bookmark").click (function () {
 		active = $(this).parents (".flux");
 		mark_favorite (active);
-	
+
 		return false;
 	});
 
@@ -165,14 +148,14 @@ $(document).ready (function () {
 		active = $(".flux.active");
 		mark_favorite (active);
 	});
-	
+
 	// Touches de navigation
 	shortcut.add("<?php echo $s['prev_entry']; ?>", function () {
 		old_active = $(".flux.active");
 		last_active = $(".flux:last");
-		new_active = old_active.prev ();
-		
-		if (new_active[0] instanceof HTMLDivElement) {
+		new_active = old_active.prevAll (".flux:first");
+
+		if (new_active.hasClass("flux")) {
 			slide (new_active, old_active);
 		} else if (new_active[0] === undefined) {
 			slide (last_active, old_active);
@@ -181,17 +164,17 @@ $(document).ready (function () {
 	shortcut.add("shift+<?php echo $s['prev_entry']; ?>", function () {
 		old_active = $(".flux.active");
 		first = $(".flux:first");
-		
-		if (first[0] instanceof HTMLDivElement) {
+
+		if (first.hasClass("flux")) {
 			slide (first, old_active);
 		}
 	});
 	shortcut.add("<?php echo $s['next_entry']; ?>", function () {
 		old_active = $(".flux.active");
 		first_active = $(".flux:first");
-		new_active = old_active.next ();
-		
-		if (new_active[0] instanceof HTMLDivElement) {
+		new_active = old_active.nextAll (".flux:first");
+
+		if (new_active.hasClass("flux")) {
 			slide (new_active, old_active);
 		} else if (new_active[0] === undefined) {
 			slide (first_active, old_active);
@@ -200,8 +183,8 @@ $(document).ready (function () {
 	shortcut.add("shift+<?php echo $s['next_entry']; ?>", function () {
 		old_active = $(".flux.active");
 		last = $(".flux:last");
-		
-		if (last[0] instanceof HTMLDivElement) {
+
+		if (last.hasClass("flux")) {
 			slide (last, old_active);
 		}
 	});
@@ -209,21 +192,13 @@ $(document).ready (function () {
 		url = $(".pager-next a").attr ("href");
 		redirect (url, false);
 	});
-	shortcut.add("shift+<?php echo $s['next_page']; ?>", function () {
-		url = $(".pager-last a").attr ("href");
-		redirect (url, false);
-	});
 	shortcut.add("<?php echo $s['prev_page']; ?>", function () {
 		url = $(".pager-previous a").attr ("href");
 		redirect (url, false);
 	});
-	shortcut.add("shift+<?php echo $s['prev_page']; ?>", function () {
-		url = $(".pager-first a").attr ("href");
-		redirect (url, false);
-	});
 	shortcut.add("<?php echo $s['go_website']; ?>", function () {
 		url = $(".flux.active .link a").attr ("href");
-		
+
 		redirect (url, true);
 	});
 });
diff --git a/public/theme/base.css b/public/theme/base.css
index 5e9b1990d..6f1e52fdf 100644
--- a/public/theme/base.css
+++ b/public/theme/base.css
@@ -393,6 +393,16 @@ input {
 		margin: 10px 0;
 	}
 
+.day {
+	height: 50px;
+	padding: 0 10px;
+	font-size: 130%;
+	font-weight: bold;
+	line-height: 50px;
+	border-top: 1px solid #aaa;
+	border-bottom: 1px solid #aaa;
+}
+
 .flux {
 	border-left: 10px solid #aaa;
 	background: #fafafa;