Fix global view mark as read

3 files changed, 12 insertions, 11 deletions

diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml
index 0975a5a00..ae7f5ffbc 100644
--- a/app/views/index/global.phtml
+++ b/app/views/index/global.phtml
@@ -47,7 +47,8 @@
 ?>
 </div>
 
-<div id="overlay"></div>
-<div id="panel"<?php echo FreshRSS_Context::$conf->display_posts ? '' : ' class="hide_posts"'; ?>>
+<div id="overlay">
 	<a class="close" href="#"><?php echo _i('close'); ?></a>
 </div>
+<div id="panel"<?php echo FreshRSS_Context::$conf->display_posts ? '' : ' class="hide_posts"'; ?>>
+</div>
diff --git a/p/scripts/global_view.js b/p/scripts/global_view.js
index 14909f44e..7d7ba22b5 100644
--- a/p/scripts/global_view.js
+++ b/p/scripts/global_view.js
@@ -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="#">' + icons['close'] + '</a>');
-		init_close_panel();
+	$("#overlay .close").click(function () {
+		$("#panel").html('');
 		$("#panel").slideToggle();
 		$("#overlay").fadeOut();
 
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 79fe506f2..5ba621415 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -645,13 +645,13 @@ br + br + br {
 	overflow: auto;
 	background: #fff;
 }
-#panel .close {
+#overlay .close {
 	position: fixed;
 	top: 0; bottom: 0;
 	left: 0; right: 0;
 	display: block;
 }
-#panel .close img {
+#overlay .close img {
 	display: none;
 }
 
@@ -762,7 +762,7 @@ br + br + br {
 	}
 
 	#panel {
-		top: 0; bottom: 0;
+		top: 25px; bottom: 30px;
 		left: 0; right: 0;
 	}
 	#panel .close {