From d25afa9def1b02b7989b12c861e33da5c90ccba1 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Sat, 12 Apr 2014 22:46:35 -0400
Subject: Extract RSS feed from menu

The RSS action has now its own button. I also reorganized the button display order to be more natural.

I did not find an appropriate Unicode replacement for the Rss icon.
---
 app/layout/nav_menu.phtml | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

(limited to 'app/layout/nav_menu.phtml')

diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 600d6dfa8..67539c747 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -6,10 +6,6 @@
 	<a class="btn toggle_aside" href="#aside_flux"><?php echo FreshRSS_Themes::icon('category'); ?></a>
 	<?php } ?>
 
-	<?php if ($this->loginOk || Minz_Configuration::allowAnonymousRefresh()) { ?>
-	<a id="actualize" class="btn" href="<?php echo _url ('feed', 'actualize'); ?>"><?php echo FreshRSS_Themes::icon('refresh'); ?></a>
-	<?php } ?>
-
 	<?php if ($this->loginOk) { ?>
 	<?php $url_state = $this->url;
 		if ($this->state & FreshRSS_Configuration::STATE_READ) {
@@ -214,15 +210,6 @@
 				</a>
 				<?php } ?>
 			</li>
-
-			<li class="separator"></li>
-
-			<li class="item">
-				<?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>
 		</ul>
 	</div>
 
@@ -247,4 +234,13 @@
 			<?php } ?>
 		</form>
 	</div>
+	
+	<?php $url_output['params']['output'] = 'rss'; ?>
+	<a class="btn view_rss" target="_blank" href="<?php echo Minz_Url::display ($url_output); ?>" title="<?php echo Minz_Translate::t ('rss_view'); ?>">
+		<?php echo FreshRSS_Themes::icon('rss'); ?>
+	</a>
+	
+	<?php if ($this->loginOk || Minz_Configuration::allowAnonymousRefresh()) { ?>
+	<a id="actualize" class="btn" href="<?php echo _url ('feed', 'actualize'); ?>"><?php echo FreshRSS_Themes::icon('refresh'); ?></a>
+	<?php } ?>
 </div>
-- 
cgit v1.2.3