From f31747ee7bdaebf02e7e58d51c27102e0c7c9ef1 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Fri, 14 Mar 2014 06:15:52 -0400
Subject: Refresh page after getting new articles.

Change the URL to the refresh link. Before it was redirecting to the home page.
Now it is redirecting to the same page, which make more sense.

See #457
---
 app/layout/nav_menu.phtml | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

(limited to 'app/layout')

diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 097809e08..ffdc95b24 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -99,17 +99,6 @@
 	</div>
 	<?php } ?>
 
-	<?php
-		$params = Minz_Request::params ();
-		if (isset ($params['search'])) {
-			$params['search'] = urlencode ($params['search']);
-		}
-		$url = array (
-			'c' => 'index',
-			'a' => 'index',
-			'params' => $params
-		);
-	?>
 	<div class="dropdown" id="nav_menu_views">
 		<div id="dropdown-views" class="dropdown-target"></div>
 		<a class="dropdown-toggle btn" href="#dropdown-views"><?php echo Minz_Translate::t ('display'); ?> <?php echo FreshRSS_Themes::icon('down'); ?></a>
@@ -117,7 +106,7 @@
 			<li class="dropdown-close"><a href="#close">❌</a></li>
 
 			<?php
-				$url_output = $url;
+				$url_output = $this->url;
 				if ($actual_view !== 'normal') { ?>
 			<li class="item">
 				<?php $url_output['params']['output'] = 'normal'; ?>
@@ -144,7 +133,7 @@
 			<li class="separator"></li>
 
 			<?php
-				$url_state = $url;
+				$url_state = $this->url;
 				$url_state['params']['state'] = 'all';
 			?>
 			<li class="item" role="checkbox" aria-checked="<?php echo ($this->state === 'all') ? 'true' :'false'; ?>">
@@ -181,7 +170,7 @@
 
 			<li class="item">
 				<?php
-					$url_order = $url;
+					$url_order = $this->url;
 					if ($this->order === 'DESC') {
 						$url_order['params']['order'] = 'ASC';
 				?>
@@ -201,7 +190,8 @@
 			<li class="separator"></li>
 
 			<li class="item">
-				<a class="view_rss" target="_blank" href="<?php echo Minz_Url::display ($this->rss_url); ?>">
+				<?php $url_output['params']['output'] = 'rss'; ?>
+				<a class="view_rss" target="_blank" href="<?php echo Minz_Url::display ($url_output); ?>">
 					<?php echo Minz_Translate::t ('rss_view'); ?>
 				</a>
 			</li>
-- 
cgit v1.2.3