Fix issue #130 : amélioration vue globale

Désormais, en cliquant sur une catégorie ou un flux, une "popup" s'ouvre
nous proposant les flux à lire directement. Les mêmes actions que la vue
normale sont alors possibles

Cela a impliqué de gros changements javascript en aval puisque les
articles n'étaient plus repérés en fonction de la fenêtre, mais en
fonction du popup (#panel)

Le code va vraiment devoir être repris pour avoir une architecture
logique (voir issue #121)

4 files changed, 115 insertions, 6 deletions

diff --git a/public/scripts/endless_mode.js b/public/scripts/endless_mode.js
index 6b3ef41d5..713247428 100644
--- a/public/scripts/endless_mode.js
+++ b/public/scripts/endless_mode.js
@@ -1,9 +1,11 @@
 var url_load_more = "";
 var load_more = false;
+var container = null;
 
-function init_load_more() {
+function init_load_more(block) {
 	url_load_more = $("a#load_more").attr("href");
-	
+	container = block;
+
 	$("#load_more").click (function () {
 		load_more_posts ();
 		
@@ -19,10 +21,10 @@ function load_more_posts () {
 	load_more = true;
 	$("#load_more").addClass("loading");
 	$.get (url_load_more, function (data) {
-		$("#stream .flux:last").after($("#stream .flux", data));
+		container.children(".flux:last").after($("#stream .flux", data));
 		$(".pagination").html($(".pagination", data).html());
-		
-		init_load_more();
+
+		init_load_more(container);
 		init_posts();
 		
 		$("#load_more").removeClass("loading");
@@ -31,5 +33,5 @@ function load_more_posts () {
 }
 
 $(document).ready (function () {
-	init_load_more();
+	init_load_more($("#stream"));
 });
\ No newline at end of file
diff --git a/public/scripts/global_view.js b/public/scripts/global_view.js
new file mode 100644
index 000000000..b23e6680c
--- /dev/null
+++ b/public/scripts/global_view.js
@@ -0,0 +1,48 @@
+var panel_loading = false;
+
+function load_panel(link) {
+	if(panel_loading) {
+		return;
+	}
+
+	panel_loading = true;
+
+	$.get (link, function (data) {
+		$("#panel").append($(".nav_menu, #stream .day, #stream .flux, #stream .pagination", data));
+
+		$("#panel .nav_menu").children().not("#nav_menu_read_all").remove();
+
+		init_load_more($("#panel"));
+		init_posts();
+
+		$("#panel").slideToggle();
+
+		panel_loading = false;
+	});
+}
+
+function init_close_panel() {
+	$("#panel .close").click(function() {
+		$("#panel").html('<a class="close" href="#"><i class="icon i_close"></i></a>');
+		init_close_panel();
+		$("#panel").slideToggle();
+	});
+}
+
+function init_global_view() {
+	$("#stream .category a").click(function() {
+		var link = $(this).attr("href");
+
+		load_panel(link);
+
+		return false;
+	});
+
+	$(".nav_menu #nav_menu_read_all, .nav_menu .toggle_aside").remove();
+}
+
+
+$(document).ready (function () {
+	init_global_view();
+	init_close_panel();
+});
\ No newline at end of file
diff --git a/public/themes/default/freshrss.css b/public/themes/default/freshrss.css
index 107318dde..89212ab1e 100644
--- a/public/themes/default/freshrss.css
+++ b/public/themes/default/freshrss.css
@@ -389,6 +389,30 @@
 			margin: 0;
 		}
 
+#panel {
+	display: none;
+	position: fixed;
+	top: 10px; bottom: 10px;
+	left: 100px; right: 100px;
+	overflow: auto;
+	background: #fff;
+	border: 1px solid #95a5a6;
+	border-radius: 5px;
+}
+	#panel .close {
+		position: absolute;
+		top: 10px; right: 0;
+		display: inline-block;
+		width: 26px;
+		height: 26px;
+		margin: 0 10px 0 0;
+		border: 1px solid #ccc;
+		border-radius: 20px;
+		text-align: center;
+		line-height: 26px;
+		background: #fff;
+	}
+
 .flux_content .bottom {
 	font-size: 90%;
 	text-align: center;
@@ -614,4 +638,8 @@
 	.nav_entries {
 		width: 100%;
 	}
+
+	#panel {
+		left: 5px; right: 5px;
+	}
 }
diff --git a/public/themes/flat-design/freshrss.css b/public/themes/flat-design/freshrss.css
index 193fa3d6f..a9fd22230 100644
--- a/public/themes/flat-design/freshrss.css
+++ b/public/themes/flat-design/freshrss.css
@@ -283,6 +283,7 @@ body {
 				}
 
 #stream.reader .flux {
+	position: relative;
 	padding: 0 0 30px;
 	border: none;
 	background: #ecf0f1;
@@ -385,6 +386,32 @@ body {
 			margin: 0;
 		}
 
+#panel {
+	display: none;
+	position: fixed;
+	top: 10px; bottom: 10px;
+	left: 100px; right: 100px;
+	overflow: auto;
+	background: #fff;
+	border: 1px solid #95a5a6;
+	border-radius: 5px;
+}
+	#panel .close {
+		position: absolute;
+		top: 10px; right: 0px;
+		display: inline-block;
+		width: 26px;
+		height: 26px;
+		margin: 0 10px 0 0;
+		border-radius: 3px;
+		text-align: center;
+		line-height: 24px;
+		background: #95a5a6;
+	}
+		#panel .close:hover {
+			background: #7f8c8d;
+		}
+
 .flux_content .bottom {
 	font-size: 90%;
 	text-align: center;
@@ -633,4 +660,8 @@ body {
 	.nav_menu .stick .btn {
 		margin: 10px 0;
 	}
+
+	#panel {
+		left: 5px; right: 5px;
+	}
 }