Merge pull request #1233 from FreshRSS/dev1.5.0

Release 1.5.0

1 files changed, 6 insertions, 3 deletions

diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 0f303beb8..23255f04f 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -22,7 +22,7 @@
 		?>
 		<a id="toggle-<?php echo $state_str; ?>"
 		   class="btn <?php echo $state_enabled ? 'active' : ''; ?>"
-		   aria-checked="<?php echo $state_enabled ? 'true' : 'false'; ?>"
+		   role="checkbox" aria-checked="<?php echo $state_enabled ? 'true' : 'false'; ?>"
 		   title="<?php echo _t('index.menu.' . $state_str); ?>"
 		   href="<?php echo Minz_Url::display($url_state); ?>"><?php echo _i($state_str); ?></a>
 		<?php } ?>
@@ -75,13 +75,14 @@
 				'get' => $get,
 				'nextGet' => FreshRSS_Context::$next_get,
 				'idMax' => FreshRSS_Context::$id_max,
+				'search' => FreshRSS_Context::$search,
+				'state' => FreshRSS_Context::$state,
 			)
 		);
 	?>
 
-	<form id="mark-read-menu" method="post" aria-hidden="true"></form>
-
 	<div class="stick" id="nav_menu_read_all">
+		<form id="mark-read-menu" method="post">
 		<?php $confirm = FreshRSS_Context::$user_conf->reading_confirm ? 'confirm' : ''; ?>
 		<button class="read_all btn <?php echo $confirm; ?>"
 		        form="mark-read-menu"
@@ -89,6 +90,7 @@
 		        type="submit"><?php echo _t('gen.action.mark_read'); ?></button>
 
 		<div class="dropdown">
+			<input type="hidden" name="_csrf" value="<?php echo FreshRSS_Auth::csrfToken(); ?>" />
 			<div id="dropdown-read" class="dropdown-target"></div>
 
 			<a class="dropdown-toggle btn" href="#dropdown-read"><?php echo _i('down'); ?></a>
@@ -123,6 +125,7 @@
 				</li>
 			</ul>
 		</div>
+		</form>
 	</div>
 	<?php } ?>