mirror/FreshRSS
0
0 Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-10-23 11:38:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Marien Fressinaud committed 2013-11-08 19:51:22 +01:00
1 parent 7de22cdf4c
commit f3a91fb819
10 files changed
+37 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/controllers/configureController.php
+2
View File
@@ -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') . ' - ');
}
app/i18n/en.php
+1
View File
@@ -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',
app/i18n/fr.php
+1
View File
@@ -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',
app/layout/aside_configure.phtml
-6
View File
@@ -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>
app/layout/aside_feed.phtml
+7 -1
View File
@@ -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>
app/layout/aside_flux.phtml
+1 -19
View File
@@ -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 } ?>
app/layout/header.phtml
-2
View File
@@ -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>
app/layout/nav_menu.phtml
+23
View File
@@ -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>
app/views/configure/categorize.phtml
+2 -2
View File
@@ -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>
app/views/configure/feed.phtml
-1
View File
@@ -66,7 +66,6 @@
</option>
<?php } ?>
</select>
<a href="<?php echo _url ('configure', 'categorize'); ?>"><?php echo Translate::t ('categories_management'); ?></a>
</div>
</div>