diff options
Diffstat (limited to 'app')
42 files changed, 106 insertions, 109 deletions
diff --git a/app/i18n/cz/admin.php b/app/i18n/cz/admin.php index 52ccfb004..a78e1caa0 100644 --- a/app/i18n/cz/admin.php +++ b/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', diff --git a/app/i18n/cz/sub.php b/app/i18n/cz/sub.php index 62b32883a..f075cfbac 100644 --- a/app/i18n/cz/sub.php +++ b/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 ), diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php index 609f07fb4..031710b46 100644 --- a/app/i18n/de/admin.php +++ b/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', diff --git a/app/i18n/de/sub.php b/app/i18n/de/sub.php index b67c1ee24..9c6e91e46 100644 --- a/app/i18n/de/sub.php +++ b/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', ), diff --git a/app/i18n/en-us/admin.php b/app/i18n/en-us/admin.php index 2823b0fad..5a832786f 100644 --- a/app/i18n/en-us/admin.php +++ b/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', diff --git a/app/i18n/en-us/sub.php b/app/i18n/en-us/sub.php index 67bb11654..7af715d95 100644 --- a/app/i18n/en-us/sub.php +++ b/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', ), diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php index 6d03110a9..113e5daac 100644 --- a/app/i18n/en/admin.php +++ b/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', diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php index 4dd7bf312..a412884fa 100644 --- a/app/i18n/en/sub.php +++ b/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', ), diff --git a/app/i18n/es/admin.php b/app/i18n/es/admin.php index 0c85ba5ce..a90fb50c6 100755 --- a/app/i18n/es/admin.php +++ b/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', diff --git a/app/i18n/es/sub.php b/app/i18n/es/sub.php index 3f4ae9d70..8113abe7a 100755 --- a/app/i18n/es/sub.php +++ b/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 ), diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php index 42de367ab..a6bb90bf8 100644 --- a/app/i18n/fr/admin.php +++ b/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', diff --git a/app/i18n/fr/sub.php b/app/i18n/fr/sub.php index 41eb37752..8a1323968 100644 --- a/app/i18n/fr/sub.php +++ b/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', ), diff --git a/app/i18n/he/admin.php b/app/i18n/he/admin.php index 627bb06ce..4227fcc18 100644 --- a/app/i18n/he/admin.php +++ b/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' => '%% מסך הכל', diff --git a/app/i18n/he/sub.php b/app/i18n/he/sub.php index 2a55d8b7f..16e55a483 100644 --- a/app/i18n/he/sub.php +++ b/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 ), diff --git a/app/i18n/it/admin.php b/app/i18n/it/admin.php index 146e9032d..9942c867f 100644 --- a/app/i18n/it/admin.php +++ b/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', diff --git a/app/i18n/it/sub.php b/app/i18n/it/sub.php index bdb64ed7b..e3af2cfcd 100644 --- a/app/i18n/it/sub.php +++ b/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 ), diff --git a/app/i18n/ja/admin.php b/app/i18n/ja/admin.php index 9df54dc82..6f66db237 100644 --- a/app/i18n/ja/admin.php +++ b/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' => '%% 総計', diff --git a/app/i18n/ja/sub.php b/app/i18n/ja/sub.php index 3b0c64619..2b265e169 100644 --- a/app/i18n/ja/sub.php +++ b/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' => '購読ツール', ), diff --git a/app/i18n/kr/admin.php b/app/i18n/kr/admin.php index c40d1a4bd..497a50ecd 100644 --- a/app/i18n/kr/admin.php +++ b/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' => '전체에서의 비율 (%%)', diff --git a/app/i18n/kr/sub.php b/app/i18n/kr/sub.php index 6f6558c4e..21fcf782a 100644 --- a/app/i18n/kr/sub.php +++ b/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' => '구독 도구', ), diff --git a/app/i18n/nl/admin.php b/app/i18n/nl/admin.php index c6f8458f0..e3f31cca6 100644 --- a/app/i18n/nl/admin.php +++ b/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', diff --git a/app/i18n/nl/sub.php b/app/i18n/nl/sub.php index 3a774455d..766dd4bc4 100644 --- a/app/i18n/nl/sub.php +++ b/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', ), diff --git a/app/i18n/oc/admin.php b/app/i18n/oc/admin.php index 71b663847..047e24fda 100644 --- a/app/i18n/oc/admin.php +++ b/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', diff --git a/app/i18n/oc/sub.php b/app/i18n/oc/sub.php index 41ac1a55f..e9ba96f35 100644 --- a/app/i18n/oc/sub.php +++ b/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', ), diff --git a/app/i18n/pl/admin.php b/app/i18n/pl/admin.php index eb95bfe7b..340c0a944 100644 --- a/app/i18n/pl/admin.php +++ b/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', diff --git a/app/i18n/pl/sub.php b/app/i18n/pl/sub.php index 1837d964b..dd9781873 100644 --- a/app/i18n/pl/sub.php +++ b/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', ), diff --git a/app/i18n/pt-br/admin.php b/app/i18n/pt-br/admin.php index f3fbeec1f..2660c6d49 100644 --- a/app/i18n/pt-br/admin.php +++ b/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', diff --git a/app/i18n/pt-br/sub.php b/app/i18n/pt-br/sub.php index 35f5f8db8..c4e594279 100644 --- a/app/i18n/pt-br/sub.php +++ b/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', ), diff --git a/app/i18n/ru/admin.php b/app/i18n/ru/admin.php index bea2a797d..7ae758326 100644 --- a/app/i18n/ru/admin.php +++ b/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' => '%% от всего', diff --git a/app/i18n/ru/sub.php b/app/i18n/ru/sub.php index 664247bac..81b768fb0 100644 --- a/app/i18n/ru/sub.php +++ b/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' => 'Инструменты подписки', ), diff --git a/app/i18n/sk/admin.php b/app/i18n/sk/admin.php index 174a654a6..9af3507ba 100644 --- a/app/i18n/sk/admin.php +++ b/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: %%', diff --git a/app/i18n/sk/sub.php b/app/i18n/sk/sub.php index db980c2bb..098f09371 100644 --- a/app/i18n/sk/sub.php +++ b/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', ), diff --git a/app/i18n/tr/admin.php b/app/i18n/tr/admin.php index f8745e5f8..2dd4123f8 100644 --- a/app/i18n/tr/admin.php +++ b/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', diff --git a/app/i18n/tr/sub.php b/app/i18n/tr/sub.php index 4c237e186..56a1f7145 100644 --- a/app/i18n/tr/sub.php +++ b/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ı', ), diff --git a/app/i18n/zh-cn/admin.php b/app/i18n/zh-cn/admin.php index 1535a01f2..6fc83b5a9 100644 --- a/app/i18n/zh-cn/admin.php +++ b/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' => '%%', diff --git a/app/i18n/zh-cn/sub.php b/app/i18n/zh-cn/sub.php index 68a1fc5be..58ecabf79 100644 --- a/app/i18n/zh-cn/sub.php +++ b/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' => '订阅工具', ), diff --git a/app/layout/aside_stats.phtml b/app/layout/aside_stats.phtml deleted file mode 100644 index 1b13b8002..000000000 --- a/app/layout/aside_stats.phtml +++ /dev/null @@ -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> diff --git a/app/layout/aside_subscription.phtml b/app/layout/aside_subscription.phtml index 74da63966..ee1454220 100644 --- a/app/layout/aside_subscription.phtml +++ b/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> diff --git a/app/layout/header.phtml b/app/layout/header.phtml index 17e290417..cffb0e009 100644 --- a/app/layout/header.phtml +++ b/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') ?> diff --git a/app/views/stats/idle.phtml b/app/views/stats/idle.phtml index 8b5317c2b..a8dea1a6f 100644 --- a/app/views/stats/idle.phtml +++ b/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"> diff --git a/app/views/stats/index.phtml b/app/views/stats/index.phtml index ced0544c7..db1ccd601 100644 --- a/app/views/stats/index.phtml +++ b/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"> diff --git a/app/views/stats/repartition.phtml b/app/views/stats/repartition.phtml index e30a02edc..88086213e 100644 --- a/app/views/stats/repartition.phtml +++ b/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"> |