Fix issue #177: déplacement menu gestion catégories

Le menu de gestion des catégories a été déplacé au niveau de la gestion
des abonnements (le regroupement est plus logique)
Le lien pour accéder au flux RSS a été déplacé dans le menu "affichage"
(peut être sujet à discussion)
Une prochaine pourrait être de splitter le menu "Général et lecture" en
plusieurs vues

10 files changed, 37 insertions, 31 deletions

diff --git a/app/controllers/configureController.php b/app/controllers/configureController.php
index 6295ca8e6..23df09172 100755
--- a/app/controllers/configureController.php
+++ b/app/controllers/configureController.php
@@ -64,6 +64,8 @@ class configureController extends ActionController {
 
 		$this->view->categories = $catDAO->listCategories (false);
 		$this->view->defaultCategory = $catDAO->getDefault ();
+		$this->view->feeds = $feedDAO->listFeeds ();
+		$this->view->flux = false;
 
 		View::prependTitle (Translate::t ('categories_management') . ' - ');
 	}
diff --git a/app/i18n/en.php b/app/i18n/en.php
index f1c1ed64a..fad4f4cce 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -40,6 +40,7 @@ return array (
 	'normal_view'			=> 'Normal view',
 	'reader_view'			=> 'Reading view',
 	'global_view'			=> 'Global view',
+	'rss_view'			=> 'RSS feed',
 	'show_all_articles'		=> 'Show all articles',
 	'show_not_reads'		=> 'Show only unread',
 	'older_first'			=> 'Oldest first',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 9529883cb..2e4fa88c4 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -40,6 +40,7 @@ return array (
 	'normal_view'			=> 'Vue normale',
 	'reader_view'			=> 'Vue lecture',
 	'global_view'			=> 'Vue globale',
+	'rss_view'			=> 'Flux RSS',
 	'show_all_articles'		=> 'Afficher tous les articles',
 	'show_not_reads'		=> 'Afficher les non lus',
 	'older_first'			=> 'Plus anciens en premier',
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index 1e525dd29..0ca2ed099 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -4,12 +4,6 @@
 	<li class="item<?php echo Request::actionName () == 'display' ? ' active' : ''; ?>">
 		<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'display')); ?>"><?php echo Translate::t ('general_and_reading'); ?></a>
 	</li>
-	<li class="item<?php echo Request::actionName () == 'categorize' ? ' active' : ''; ?>">
-		<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'categorize')); ?>"><?php echo Translate::t ('categories'); ?></a>
-	</li>
-	<li class="item<?php echo Request::actionName () === 'feed' ? ' active' : ''; ?>">
-		<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'feed')); ?>"><?php echo Translate::t ('rss_feed_management'); ?></a>
-	</li>
 	<li class="item<?php echo Request::actionName () == 'shortcut' ? ' active' : ''; ?>">
 		<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'shortcut')); ?>"><?php echo Translate::t ('shortcuts'); ?></a>
 	</li>
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index b00c1816c..04893f651 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -38,7 +38,13 @@
 		</div>
 	</form></li>
 
-	<li class="item<?php echo Request::actionName () == 'importExport' ? ' active' : ''; ?>"><a href="<?php echo _url ('configure', 'importExport'); ?>"><?php echo Translate::t ('import_export_opml'); ?></a></li>
+	<li class="item<?php echo Request::actionName () == 'importExport' ? ' active' : ''; ?>">
+		<a href="<?php echo _url ('configure', 'importExport'); ?>"><?php echo Translate::t ('import_export_opml'); ?></a>
+	</li>
+
+	<li class="item<?php echo Request::actionName () == 'categorize' ? ' active' : ''; ?>">
+		<a href="<?php echo _url ('configure', 'categorize'); ?>"><?php echo Translate::t ('categories_management'); ?></a>
+	</li>
 
 	<li class="separator"></li>
 
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index 6ebbbc036..a2465c6cf 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -2,29 +2,11 @@
 	<a class="toggle_aside" href="#close"><i class="icon i_close"></i></a>
 
 	<ul class="categories">
-		<?php
-			$params = Request::params ();
-			$params['output'] = 'rss';
-			if (isset ($params['search'])) {
-				$params['search'] = urlencode ($params['search']);
-			}
-
-			$token = $this->conf->token ();
-			if (login_is_conf($this->conf) && $token != '') {
-				$params['token'] = $token;
-			}
-
-			$url = array (
-				'c' => 'index',
-				'a' => 'index',
-				'params' => $params
-			);
-		?>
 		<?php if (!login_is_conf ($this->conf) || is_logged ()) { ?>
 		<li>
 			<div class="stick">
 				<a class="btn btn-important" href="<?php echo _url ('configure', 'feed'); ?>"><?php echo Translate::t ('subscription_management'); ?></a>
-				<a class="btn btn-important" rel="alternate" type="application/rss+xml" href="<?php echo Url::display ($url); ?>"><i class="icon i_rss"></i></a>
+				<a class="btn btn-important" href="<?php echo _url ('configure', 'categorize'); ?>"><i class="icon i_category"></i></a>
 			</div>
 		</li>
 		<?php } ?>
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 64c60b168..10c05b48e 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -54,8 +54,6 @@
 				<li class="dropdown-close"><a href="#close">&nbsp;</a></li>
 				<li class="dropdown-header"><?php echo Translate::t ('configuration'); ?></li>
 				<li class="item"><a href="<?php echo _url ('configure', 'display'); ?>"><?php echo Translate::t ('general_and_reading'); ?></a></li>
-				<li class="item"><a href="<?php echo _url ('configure', 'categorize'); ?>"><?php echo Translate::t ('categories'); ?></a></li>
-				<li class="item"><a href="<?php echo _url ('configure', 'feed'); ?>"><?php echo Translate::t ('rss_feed_management'); ?></a></li>
 				<li class="item"><a href="<?php echo _url ('configure', 'shortcut'); ?>"><?php echo Translate::t ('shortcuts'); ?></a></li>
 				<li class="separator"></li>
 				<li class="item"><a href="<?php echo _url ('index', 'about'); ?>"><?php echo Translate::t ('about'); ?></a></li>
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index fd7ed550b..4456dff65 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -121,6 +121,29 @@
 				</a>
 			</li>
 			<?php } ?>
+			<li class="item">
+				<?php
+					$params = Request::params ();
+					$params['output'] = 'rss';
+					if (isset ($params['search'])) {
+						$params['search'] = urlencode ($params['search']);
+					}
+
+					$token = $this->conf->token ();
+					if (login_is_conf($this->conf) && $token != '') {
+						$params['token'] = $token;
+					}
+
+					$url = array (
+						'c' => 'index',
+						'a' => 'index',
+						'params' => $params
+					);
+				?>
+				<a class="view_rss" target="_blank" rel="alternate" type="application/rss+xml" href="<?php echo Url::display ($url); ?>">
+					<?php echo Translate::t ('rss_view'); ?>
+				</a>
+			</li>
 
 			<li class="separator"></li>
 
diff --git a/app/views/configure/categorize.phtml b/app/views/configure/categorize.phtml
index 9dac49ff8..d8aa5f31d 100644
--- a/app/views/configure/categorize.phtml
+++ b/app/views/configure/categorize.phtml
@@ -1,10 +1,10 @@
-<?php $this->partial ('aside_configure'); ?>
+<?php $this->partial ('aside_feed'); ?>
 
 <div class="post">
 	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo Translate::t ('back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url ('configure', 'categorize'); ?>">
-		<legend><?php echo Translate::t ('categories_management'); ?> - <a href="<?php echo _url ('configure', 'feed'); ?>"><?php echo Translate::t ('rss_feed_management'); ?></a></legend>
+		<legend><?php echo Translate::t ('categories_management'); ?></legend>
 
 		<p class="alert alert-warn"><?php echo Translate::t ('feeds_moved_category_deleted', $this->defaultCategory->name ()); ?></p>
 
diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml
index 49e2f3cf1..2f88475f1 100644
--- a/app/views/configure/feed.phtml
+++ b/app/views/configure/feed.phtml
@@ -66,7 +66,6 @@
 				</option>
 				<?php } ?>
 				</select>
-				<a href="<?php echo _url ('configure', 'categorize'); ?>"><?php echo Translate::t ('categories_management'); ?></a>
 			</div>
 		</div>