Menu: move stats into subscription management (#3803)

* add stats menu into subscription management menu
* delete stats menu entry from dropdown menu
* Delete aside_stats.phtml
* Update aside_subscription.phtml

app/i18n/cz/admin.php

@@ -135,11 +135,6 @@ return array(
 		'idle' => 'Neaktivní kanály',
 		'main' => 'Přehled',
 		'main_stream' => 'Všechny kanály',
-		'menu' => array(
-			'idle' => 'Neaktivní kanály',
-			'main' => 'Přehled',
-			'repartition' => 'Rozdělení článků',
-		),
 		'no_idle' => 'Žádné neaktivní kanály!',
 		'number_entries' => '%d článků',
 		'percent_of_total' => '%% ze všech',

app/i18n/cz/sub.php

@@ -111,6 +111,11 @@ return array(
 		'add' => 'Add a feed or category',	// TODO - Translation
 		'import_export' => 'Import / export',	// TODO - Translation
 		'label_management' => 'Label management',	// TODO - Translation
+		'stats' => array(
+			'idle' => 'Neaktivní kanály',
+			'main' => 'Přehled',
+			'repartition' => 'Rozdělení článků',
+		),
 		'subscription_management' => 'Správa subskripcí',
 		'subscription_tools' => 'Subscription tools',	// TODO - Translation
 	),

app/i18n/de/admin.php

@@ -135,11 +135,6 @@ return array(
 		'idle' => 'Inaktive Feeds',
 		'main' => 'Haupt-Statistiken',
 		'main_stream' => 'Haupt-Feeds',
-		'menu' => array(
-			'idle' => 'Inaktive Feeds',
-			'main' => 'Haupt-Statistiken',
-			'repartition' => 'Artikel-Verteilung',
-		),
 		'no_idle' => 'Es gibt keinen inaktiven Feed!',
 		'number_entries' => '%d Artikel',
 		'percent_of_total' => '%% Gesamt',

app/i18n/de/sub.php

@@ -111,6 +111,11 @@ return array(
 		'add' => 'Feed oder Kategorie hinzufügen',
 		'import_export' => 'Importieren / Exportieren',
 		'label_management' => 'Labelverwaltung',
+		'stats' => array(
+			'idle' => 'Inaktive Feeds',
+			'main' => 'Haupt-Statistiken',
+			'repartition' => 'Artikel-Verteilung',
+		),
 		'subscription_management' => 'Abonnementverwaltung',
 		'subscription_tools' => 'Abonnement-Tools',
 	),

app/i18n/en-us/admin.php

@@ -135,11 +135,6 @@ return array(
 		'idle' => 'Idle feeds',
 		'main' => 'Main statistics',
 		'main_stream' => 'Main stream',
-		'menu' => array(
-			'idle' => 'Idle feeds',
-			'main' => 'Main statistics',
-			'repartition' => 'Articles repartition',
-		),
 		'no_idle' => 'There are no idle feeds!',
 		'number_entries' => '%d articles',
 		'percent_of_total' => '%% of total',

app/i18n/en-us/sub.php

@@ -111,6 +111,11 @@ return array(
 		'add' => 'Add a feed or category',
 		'import_export' => 'Import / export',
 		'label_management' => 'Label management',
+		'stats' => array(
+			'idle' => 'Idle feeds',
+			'main' => 'Main statistics',
+			'repartition' => 'Articles repartition',
+		),
 		'subscription_management' => 'Subscription management',
 		'subscription_tools' => 'Subscription tools',
 	),

app/i18n/en/admin.php

@@ -135,11 +135,6 @@ return array(
 		'idle' => 'Idle feeds',
 		'main' => 'Main statistics',
 		'main_stream' => 'Main stream',
-		'menu' => array(
-			'idle' => 'Idle feeds',
-			'main' => 'Main statistics',
-			'repartition' => 'Articles repartition',
-		),
 		'no_idle' => 'There are no idle feeds!',
 		'number_entries' => '%d articles',
 		'percent_of_total' => '%% of total',

app/i18n/en/sub.php

@@ -111,6 +111,11 @@ return array(
 		'add' => 'Add a feed or category',
 		'import_export' => 'Import / export',
 		'label_management' => 'Label management',
+		'stats' => array(
+			'idle' => 'Idle feeds',
+			'main' => 'Main statistics',
+			'repartition' => 'Articles repartition',
+		),
 		'subscription_management' => 'Subscription management',
 		'subscription_tools' => 'Subscription tools',
 	),

app/i18n/es/admin.php

@@ -135,11 +135,6 @@ return array(
 		'idle' => 'Fuentes inactivas',
 		'main' => 'Estadísticas principales',
 		'main_stream' => 'Salida principal',
-		'menu' => array(
-			'idle' => 'Fuentes inactivas',
-			'main' => 'Estadísticas principañes',
-			'repartition' => 'Reparto de artículos',
-		),
 		'no_idle' => 'No hay fuentes inactivas',
 		'number_entries' => '%d artículos',
 		'percent_of_total' => '%% del total',

app/i18n/es/sub.php

@@ -111,6 +111,11 @@ return array(
 		'add' => 'Add a feed or category',	// TODO - Translation
 		'import_export' => 'Importar / exportar',
 		'label_management' => 'Label management',	// TODO - Translation
+		'stats' => array(
+			'idle' => 'Fuentes inactivas',
+			'main' => 'Estadísticas principañes',
+			'repartition' => 'Reparto de artículos',
+		),
 		'subscription_management' => 'Administración de suscripciones',
 		'subscription_tools' => 'Subscription tools',	// TODO - Translation
 	),

app/i18n/fr/admin.php

@@ -135,11 +135,6 @@ return array(
 		'idle' => 'Flux inactifs',
 		'main' => 'Statistiques principales',
 		'main_stream' => 'Flux principal',
-		'menu' => array(
-			'idle' => 'Flux inactifs',
-			'main' => 'Statistiques principales',
-			'repartition' => 'Répartition des articles',
-		),
 		'no_idle' => 'Il n’y a aucun flux inactif !',
 		'number_entries' => '%d articles',
 		'percent_of_total' => '%% du total',

app/i18n/fr/sub.php

@@ -111,6 +111,11 @@ return array(
 		'add' => 'Ajouter un flux/une catégorie',
 		'import_export' => 'Importer / exporter',
 		'label_management' => 'Gestion des étiquettes',
+		'stats' => array(
+			'idle' => 'Flux inactifs',
+			'main' => 'Statistiques principales',
+			'repartition' => 'Répartition des articles',
+		),
 		'subscription_management' => 'Gestion des abonnements',
 		'subscription_tools' => 'Outils d’abonnement',
 	),

app/i18n/he/admin.php

@@ -134,12 +134,7 @@ return array(
 		'feed_per_category' => 'הזנות על פי קטגוריה',
 		'idle' => 'הזנות שלא עודכנו',
 		'main' => 'סטטיסטיקות ראשיות',
-		'main_stream' => 'הזנה ראשית',
-		'menu' => array(
-			'idle' => 'הזנות שלא עודכנו',
-			'main' => 'סטטיסטיקות ראשיות',
-			'repartition' => 'חלוקת המאמרים',
-		),
+		'main_stream' => 'הזנה ראשית',		
 		'no_idle' => 'אין הזנות מובטלות!',
 		'number_entries' => '%d מאמרים',
 		'percent_of_total' => '%% מסך הכל',

app/i18n/he/sub.php

@@ -111,6 +111,11 @@ return array(
 		'add' => 'Add a feed or category',	// TODO - Translation
 		'import_export' => 'יבוא / יצוא ',
 		'label_management' => 'Label management',	// TODO - Translation
+		'stats' => array(
+			'idle' => 'הזנות שלא עודכנו',
+			'main' => 'סטטיסטיקות ראשיות',
+			'repartition' => 'חלוקת המאמרים',
+		),
 		'subscription_management' => 'ניהול הרשמות',
 		'subscription_tools' => 'Subscription tools',	// TODO - Translation
 	),

app/i18n/it/admin.php

@@ -135,11 +135,6 @@ return array(
 		'idle' => 'Feeds non aggiornati',
 		'main' => 'Statistiche principali',
 		'main_stream' => 'Flusso principale',
-		'menu' => array(
-			'idle' => 'Feeds non aggiornati',
-			'main' => 'Statistiche principali',
-			'repartition' => 'Ripartizione articoli',
-		),
 		'no_idle' => 'Non ci sono feed non aggiornati',
 		'number_entries' => '%d articoli',
 		'percent_of_total' => '%% del totale',

app/i18n/it/sub.php

@@ -111,6 +111,11 @@ return array(
 		'add' => 'Add a feed or category',	// TODO - Translation
 		'import_export' => 'Importa / esporta',
 		'label_management' => 'Label management',	// TODO - Translation
+		'stats' => array(
+			'idle' => 'Feeds non aggiornati',
+			'main' => 'Statistiche principali',
+			'repartition' => 'Ripartizione articoli',
+		),
 		'subscription_management' => 'Gestione sottoscrizioni',
 		'subscription_tools' => 'Subscription tools',	// TODO - Translation
 	),

app/i18n/ja/admin.php

@@ -135,11 +135,6 @@ return array(
 		'idle' => '未使用のフィード',
 		'main' => '主な統計',
 		'main_stream' => '主なストリーム',
-		'menu' => array(
-			'idle' => '未使用のフィード',
-			'main' => '主な統計',
-			'repartition' => '記事の仕切り',
-		),
 		'no_idle' => '未使用のフィードはありません!',
 		'number_entries' => '%d 記事',
 		'percent_of_total' => '%% 総計',

app/i18n/ja/sub.php

@@ -111,6 +111,11 @@ return array(
 		'add' => 'フィード化カテゴリを追加します',
 		'import_export' => 'インポート / エクスポート',
 		'label_management' => 'ラベル管理',
+		'stats' => array(
+			'idle' => '未使用のフィード',
+			'main' => '主な統計',
+			'repartition' => '記事の仕切り',
+		),
 		'subscription_management' => '購読されたものの管理',
 		'subscription_tools' => '購読ツール',
 	),

app/i18n/kr/admin.php

@@ -135,11 +135,6 @@ return array(
 		'idle' => '유휴 피드',
 		'main' => '주요 통계',
 		'main_stream' => '메인 스트림',
-		'menu' => array(
-			'idle' => '유휴 피드',
-			'main' => '주요 통계',
-			'repartition' => '글 분류',
-		),
 		'no_idle' => '유휴 피드가 없습니다!',
 		'number_entries' => '%d 개의 글',
 		'percent_of_total' => '전체에서의 비율 (%%)',

app/i18n/kr/sub.php

@@ -111,6 +111,11 @@ return array(
 		'add' => 'Add a feed or category',	// TODO - Translation
 		'import_export' => '불러오기 / 내보내기',
 		'label_management' => 'Label management',	// TODO - Translation
+		'stats' => array(
+			'idle' => '유휴 피드',
+			'main' => '주요 통계',
+			'repartition' => '글 분류',
+		),
 		'subscription_management' => '구독 관리',
 		'subscription_tools' => '구독 도구',
 	),

app/i18n/nl/admin.php

@@ -135,11 +135,6 @@ return array(
 		'idle' => 'Gepauzeerde feeds',
 		'main' => 'Hoofd statistieken',
 		'main_stream' => 'Overzicht',
-		'menu' => array(
-			'idle' => 'Gepauzeerde feeds',
-			'main' => 'Hoofd statistieken',
-			'repartition' => 'Artikelen verdeling',
-		),
 		'no_idle' => 'Er is geen gepauzeerde feed!',
 		'number_entries' => '%d artikelen',
 		'percent_of_total' => '%% van totaal',

app/i18n/nl/sub.php

@@ -111,6 +111,11 @@ return array(
 		'add' => 'Feed of categorie toevoegen',
 		'import_export' => 'Importeer / exporteer',
 		'label_management' => 'Labelbeheer',
+		'stats' => array(
+			'idle' => 'Gepauzeerde feeds',
+			'main' => 'Hoofd statistieken',
+			'repartition' => 'Artikelen verdeling',
+		),
 		'subscription_management' => 'Abonnementenbeheer',
 		'subscription_tools' => 'Hulpmiddelen voor abonnementen',
 	),

app/i18n/oc/admin.php

@@ -135,11 +135,6 @@ return array(
 		'idle' => 'Fluxes inactius',
 		'main' => 'Estatisticas principalas',
 		'main_stream' => 'Flux màger',
-		'menu' => array(
-			'idle' => 'Fluxes inactius',
-			'main' => 'Estatisticas principalas',
-			'repartition' => 'Reparticion dels articles',
-		),
 		'no_idle' => 'I a pas cap d’article inactiu !',
 		'number_entries' => '%d articles',
 		'percent_of_total' => '%% del total',

app/i18n/oc/sub.php

@@ -111,6 +111,11 @@ return array(
 		'add' => 'Ajustar un flux o una categoria',
 		'import_export' => 'Importar / Exportar',
 		'label_management' => 'Gestion de las etiquetas',
+		'stats' => array(
+			'idle' => 'Fluxes inactius',
+			'main' => 'Estatisticas principalas',
+			'repartition' => 'Reparticion dels articles',
+		),
 		'subscription_management' => 'Gestion dels abonaments',
 		'subscription_tools' => 'Aisinas d’abonament',
 	),

app/i18n/pl/admin.php

@@ -135,11 +135,6 @@ return array(
 		'idle' => 'Bezczynne kanały',
 		'main' => 'Główne statystyki',
 		'main_stream' => 'Kanał główny',
-		'menu' => array(
-			'idle' => 'Bezczynne kanały',
-			'main' => 'Główne statystyki',
-			'repartition' => 'Podział wiadomości',
-		),
 		'no_idle' => 'Brak bezczynnych kanałów!',
 		'number_entries' => '%d wiadomości',
 		'percent_of_total' => '%% wszystkich',

app/i18n/pl/sub.php

@@ -111,6 +111,11 @@ return array(
 		'add' => 'Dodaj kanał lub kategorię',
 		'import_export' => 'Import / eksport',
 		'label_management' => 'Zarządzanie etykietami',
+		'stats' => array(
+			'idle' => 'Bezczynne kanały',
+			'main' => 'Główne statystyki',
+			'repartition' => 'Podział wiadomości',
+		),
 		'subscription_management' => 'Zarządzanie subskrypcjami',
 		'subscription_tools' => 'Narzędzia subskrypcji',
 	),

app/i18n/pt-br/admin.php

@@ -135,11 +135,6 @@ return array(
 		'idle' => 'Feeds inativos',
 		'main' => 'Estatísticas principais',
 		'main_stream' => 'Stream principal',
-		'menu' => array(
-			'idle' => 'Feeds inativos',
-			'main' => 'Estatísticas principais',
-			'repartition' => 'Repartição de artigos',
-		),
 		'no_idle' => 'Não há nenhum feed inativo!',
 		'number_entries' => '%d artigos',
 		'percent_of_total' => '%% do total',

app/i18n/pt-br/sub.php

@@ -111,6 +111,11 @@ return array(
 		'add' => 'Add a feed or category',	// TODO - Translation
 		'import_export' => 'Importar / exportar',
 		'label_management' => 'Label management',	// TODO - Translation
+		'stats' => array(
+			'idle' => 'Feeds inativos',
+			'main' => 'Estatísticas principais',
+			'repartition' => 'Repartição de artigos',
+		),
 		'subscription_management' => 'Gerenciamento de inscrições',
 		'subscription_tools' => 'Ferramentas de inscrição',
 	),

app/i18n/ru/admin.php

@@ -135,11 +135,6 @@ return array(
 		'idle' => 'Неактивные ленты',
 		'main' => 'Основная статистика',
 		'main_stream' => 'Основной поток',
-		'menu' => array(
-			'idle' => 'Неактивные ленты',
-			'main' => 'Основная статистика',
-			'repartition' => 'Перерасределение статей',
-		),
 		'no_idle' => 'Нет неактивных лент!',
 		'number_entries' => 'статей: %d',
 		'percent_of_total' => '%% от всего',

app/i18n/ru/sub.php

@@ -111,6 +111,11 @@ return array(
 		'add' => 'Добавить ленту или категорию',
 		'import_export' => 'Импорт / экспорт',
 		'label_management' => 'Управление метками',
+		'stats' => array(
+			'idle' => 'Неактивные ленты',
+			'main' => 'Основная статистика',
+			'repartition' => 'Перерасределение статей',
+		),
 		'subscription_management' => 'Управление подписками',
 		'subscription_tools' => 'Инструменты подписки',
 	),

app/i18n/sk/admin.php

@@ -135,11 +135,6 @@ return array(
 		'idle' => 'Neaktívne kanály',
 		'main' => 'Hlavné štatistiky',
 		'main_stream' => 'Všetky kanály',
-		'menu' => array(
-			'idle' => 'Neaktívne kanály',
-			'main' => 'Hlavné štatistiky',
-			'repartition' => 'Rozdelenie článkov',
-		),
 		'no_idle' => 'Žiadne neaktívne kanály!',
 		'number_entries' => 'Počet článkov: %d',
 		'percent_of_total' => 'Z celkového počtu: %%',

app/i18n/sk/sub.php

@@ -111,6 +111,11 @@ return array(
 		'add' => 'Add a feed or category',	// TODO - Translation
 		'import_export' => 'Import / export',
 		'label_management' => 'Label management',	// TODO - Translation
+		'stats' => array(
+			'idle' => 'Neaktívne kanály',
+			'main' => 'Hlavné štatistiky',
+			'repartition' => 'Rozdelenie článkov',
+		),
 		'subscription_management' => 'Správa odoberaných kanálov',
 		'subscription_tools' => 'Nástroje na odoberanie kanálov',
 	),

app/i18n/tr/admin.php

@@ -135,11 +135,6 @@ return array(
 		'idle' => 'Boştaki akışlar',
 		'main' => 'Ana istatistikler',
 		'main_stream' => 'Ana akış',
-		'menu' => array(
-			'idle' => 'Boştaki akışlar',
-			'main' => 'Ana istatistikler',
-			'repartition' => 'Makale dağılımı',
-		),
 		'no_idle' => 'Boşta akış yok!',
 		'number_entries' => '%d makale',
 		'percent_of_total' => '%% toplamın yüzdesi',

app/i18n/tr/sub.php

@@ -111,6 +111,11 @@ return array(
 		'add' => 'Kategori veya akış ekle',
 		'import_export' => 'İçe / dışa aktar',
 		'label_management' => 'Etiket yönetimi',
+		'stats' => array(
+			'idle' => 'Boştaki akışlar',
+			'main' => 'Ana istatistikler',
+			'repartition' => 'Makale dağılımı',
+		),
 		'subscription_management' => 'Abonelik yönetimi',
 		'subscription_tools' => 'Abonelik araçları',
 	),

app/i18n/zh-cn/admin.php

@@ -135,11 +135,6 @@ return array(
 		'idle' => '长期无更新订阅源',
 		'main' => '主要统计',
 		'main_stream' => '首页',
-		'menu' => array(
-			'idle' => '长期无更新订阅源',
-			'main' => '主要统计',
-			'repartition' => '文章分布',
-		),
 		'no_idle' => '订阅源近期皆有更新！',
 		'number_entries' => '%d 篇文章',
 		'percent_of_total' => '%%',

app/i18n/zh-cn/sub.php

@@ -111,6 +111,11 @@ return array(
 		'add' => '添加订阅源或分类',
 		'import_export' => '导入/导出',
 		'label_management' => '标签管理',
+		'stats' => array(
+			'idle' => '长期无更新订阅源',
+			'main' => '主要统计',
+			'repartition' => '文章分布',
+		),
 		'subscription_management' => '订阅管理',
 		'subscription_tools' => '订阅工具',
 	),

app/layout/aside_stats.phtml

@@ -1,14 +0,0 @@
-<nav class="nav nav-list aside">
-	<ul>
-		<li class="nav-header"><?= _t('admin.stats') ?></li>
-		<li class="item<?= Minz_Request::actionName() == 'index' ? ' active' : '' ?>">
-			<a href="<?= _url('stats', 'index') ?>"><?= _t('admin.stats.menu.main') ?></a>
-		</li>
-		<li class="item<?= Minz_Request::actionName() == 'idle' ? ' active' : '' ?>">
-			<a href="<?= _url('stats', 'idle') ?>"><?= _t('admin.stats.menu.idle') ?></a>
-		</li>
-		<li class="item<?= Minz_Request::actionName() == 'repartition' ? ' active' : '' ?>">
-			<a href="<?= _url('stats', 'repartition') ?>"><?= _t('admin.stats.menu.repartition') ?></a>
-		</li>
-	</ul>
-</nav>

app/layout/aside_subscription.phtml

@@ -21,5 +21,17 @@
 		<li class="item<?= Minz_Request::controllerName() === 'subscription' && Minz_Request::actionName() === 'bookmarklet' ? ' active' : '' ?>">
 			<a href="<?= _url('subscription', 'bookmarklet') ?>"><?= _t('sub.menu.subscription_tools') ?></a>
 		</li>
+		<li class="nav-header"><?= _t('admin.stats') ?></li>
+		<li class="item<?= Minz_Request::controllerName() == 'stats' && Minz_Request::actionName() == 'index' ? ' active' : '' ?>">
+			<a href="<?= _url('stats', 'index') ?>"><?= _t('sub.menu.stats.main') ?></a>
+		</li>
+		<li class="item<?= Minz_Request::actionName() == 'idle' ? ' active' : '' ?>">
+			<a href="<?= _url('stats', 'idle') ?>"><?= _t('sub.menu.stats.idle') ?></a>
+		</li>
+		<li class="item<?= Minz_Request::actionName() == 'repartition' ? ' active' : '' ?>">
+			<a href="<?= _url('stats', 'repartition') ?>"><?= _t('sub.menu.stats.repartition') ?></a>
+		</li>
+
 	</ul>
+
 </nav>

app/layout/header.phtml

@@ -79,7 +79,6 @@ if (FreshRSS_Auth::accessNeedsAction()) {
 				<?php } ?>
 
 				<li class="separator"></li>
-				<li class="item"><a href="<?= _url('stats', 'index') ?>"><?= _t('gen.menu.stats') ?></a></li>
 				<li class="item"><a href="<?= _url('index', 'logs') ?>"><?= _t('gen.menu.logs') ?></a></li>
 				<li class="item"><a href="<?= _url('index', 'about') ?>"><?= _t('gen.menu.about') ?></a></li>
 				<?= Minz_ExtensionManager::callHook('menu_other_entry') ?>

app/views/stats/idle.phtml

@@ -1,4 +1,4 @@
-<?php $this->partial('aside_stats'); ?>
+<?php $this->partial('aside_subscription'); ?>
 
 <div class="post">
 	<div class="link-back-wrapper">

app/views/stats/index.phtml

@@ -1,4 +1,4 @@
-<?php $this->partial('aside_stats'); ?>
+<?php $this->partial('aside_subscription'); ?>
 
 <div class="post">
 	<div class="link-back-wrapper">

app/views/stats/repartition.phtml

@@ -1,4 +1,4 @@
-<?php $this->partial('aside_stats'); ?>
+<?php $this->partial('aside_subscription'); ?>
 
 <div class="post ">
 	<div class="link-back-wrapper">