Merge branch 'dev'

Conflicts:
	CHANGELOG
	README.fr.md
	README.md
	app/Controllers/feedController.php
	app/Controllers/indexController.php
	app/i18n/en.php
	app/i18n/fr.php
	app/views/helpers/view/normal_view.phtml
	app/views/stats/index.phtml
	app/views/stats/repartition.phtml
	constants.php
	p/scripts/main.js

1 files changed, 9 insertions, 8 deletions

diff --git a/p/scripts/global_view.js b/p/scripts/global_view.js
index 7105520a6..7d7ba22b5 100644
--- a/p/scripts/global_view.js
+++ b/p/scripts/global_view.js
@@ -9,7 +9,7 @@ function load_panel(link) {
 	panel_loading = true;
 
 	$.get(link, function (data) {
-		$("#panel").append($(".nav_menu, #stream .day, #stream .flux, #stream .pagination", data));
+		$("#panel").append($(".nav_menu, #stream .day, #stream .flux, #stream .pagination, #stream.prompt", data));
 
 		$("#panel .nav_menu").children().not("#nav_menu_read_all").remove();
 
@@ -24,12 +24,13 @@ function load_panel(link) {
 		// en en ouvrant une autre ensuite, on se retrouve au même point de scroll
 		$("#panel").scrollTop(0);
 
-		$('#panel').on('click', '#nav_menu_read_all > a, #nav_menu_read_all .item > a, #bigMarkAsRead', function () {
+		$('#panel').on('click', '#nav_menu_read_all button, #bigMarkAsRead', function () {
+			console.log($(this).attr("formaction"));
 			$.ajax({
-				url: $(this).attr("href"),
+				type: "POST",
+				url: $(this).attr("formaction"),
 				async: false
 			});
-			//$("#panel .close").first().click();
 			window.location.reload(false);
 			return false;
 		});
@@ -39,9 +40,8 @@ function load_panel(link) {
 }
 
 function init_close_panel() {
-	$("#panel .close").click(function () {
-		$("#panel").html('<a class="close" href="#">' + window.iconClose + '</a>');
-		init_close_panel();
+	$("#overlay .close").click(function () {
+		$("#panel").html('');
 		$("#panel").slideToggle();
 		$("#overlay").fadeOut();
 
@@ -50,7 +50,8 @@ function init_close_panel() {
 }
 
 function init_global_view() {
-	$("#stream .box-category a").click(function () {
+	// TODO: should be based on generic classes.
+	$(".box a").click(function () {
 		var link = $(this).attr("href");
 
 		load_panel(link);