improve sub navigation on config page

Don't hide the active element, it annoying to use the navigation if the menu items changing there position with every click. Indicate the active menu item instead, similar to the header navigation. May I've worked to long with windows systems, but help and about have to be the last menu items :-). I've reorderd the menu items to what I think user need more often. A sub-navigation should not change its parent heading. Changed that as well.
2015-01-13 22:03:24 +01:00 · 2015-01-13 22:03:24 +01:00 · 360fc9076e
commit 360fc9076e
parent cfaa25f667
15 changed files with 79 additions and 74 deletions
--- a/assets/css/app.css
+++ b/assets/css/app.css
@ -395,6 +395,7 @@ header a {
 nav .active a {
    color: #333;
    font-weight: bold;
+    text-decoration: none;
 }

 .logo {
--- a/controllers/config.php
+++ b/controllers/config.php
@ -179,7 +179,7 @@ Router\get_action('help', function() {
        'config' => Model\Config\get_all(),
        'nb_unread_items' => Model\Item\count_by_status('unread'),
        'menu' => 'config',
-        'title' => t('Help')
+        'title' => t('Preferences')
    )));
 });

@ -191,7 +191,7 @@ Router\get_action('about', function() {
        'config' => Model\Config\get_all(),
        'nb_unread_items' => Model\Item\count_by_status('unread'),
        'menu' => 'config',
-        'title' => t('About')
+        'title' => t('Preferences')
    )));
 });

@ -204,7 +204,7 @@ Router\get_action('database', function() {
        'db_size' => filesize(\Model\Database\get_path()),
        'nb_unread_items' => Model\Item\count_by_status('unread'),
        'menu' => 'config',
-        'title' => t('Database')
+        'title' => t('Preferences')
    )));
 });

@ -215,7 +215,7 @@ Router\get_action('api', function() {
        'config' => Model\Config\get_all(),
        'nb_unread_items' => Model\Item\count_by_status('unread'),
        'menu' => 'config',
-        'title' => t('API')
+        'title' => t('Preferences')
    )));
 });

@ -226,7 +226,7 @@ Router\get_action('services', function() {
        'errors' => array(),
        'values' => Model\Config\get_all() + array('csrf' => Model\Config\generate_csrf()),
        'menu' => 'config',
-        'title' => t('External services')
+        'title' => t('Preferences')
    )));
 });

--- a/locales/cs_CZ/translations.php
+++ b/locales/cs_CZ/translations.php
@ -84,7 +84,6 @@ return array(
    'Confirmation' => 'Potvrzení',
    'Language' => 'Jazyk',
    'Save' => 'Uložit',
-    'Database' => 'Databáze',
    'Database size:' => 'Velikost databáze:',
    'Optimize the database' => 'Optimalizovat databázi',
    '(VACUUM command)' => '(příkaz VACUUM)',
@ -204,7 +203,6 @@ return array(
    // 'FAQ' => '',
    // 'settings' => '',
    // 'help' => '',
-    // 'API' => '',
    // 'api' => '',
    // 'about' => '',
    // 'This action will update Miniflux with the last development version, are you sure?' => '',
@ -218,7 +216,6 @@ return array(
    // 'Remove automatically unread items' => '',
    // 'Toggle RTL mode' => '',
    // 'external services' => '',
-    // 'External services' => '',
    // 'Send bookmarks to Pinboard' => '',
    // 'Pinboard API token' => '',
    // 'Pinboard tags' => '',
@ -233,4 +230,5 @@ return array(
    // 'Enable image proxy' => '',
    // 'Avoid mixed content warnings with HTTPS' => '',
    // 'Download favicons' => '',
+    // 'general' => '',
 );
--- a/locales/de_DE/translations.php
+++ b/locales/de_DE/translations.php
@ -84,7 +84,6 @@ return array(
    'Confirmation' => 'Bestätigung',
    'Language' => 'Sprache',
    'Save' => 'Speichern',
-    'Database' => 'Datenbank',
    'Database size:' => 'Größe der Datenbank:',
    'Optimize the database' => 'Datenbank optimieren',
    '(VACUUM command)' => '(Befehl: SQL VACUUM)',
@ -204,7 +203,6 @@ return array(
    'FAQ' => 'FAQ',
    'settings' => 'Einstellungen',
    'help' => 'Hilfe',
-    'API' => 'API',
    'api' => 'api',
    'about' => 'über',
    'This action will update Miniflux with the last development version, are you sure?' => 'Miniflux wird auf die aktuelle Entwicklungsversion aktualisiert. Bist du sicher?',
@ -218,7 +216,6 @@ return array(
    'Remove automatically unread items' => 'Ungelesene Artikel automatisch entfernen',
    'Toggle RTL mode' => 'Textrichtung umschalten',
    'external services' => 'externe Dienste',
-    'External services' => 'Externe Dienste',
    'Send bookmarks to Pinboard' => 'Sende Lesezeichen an Pinboard',
    'Pinboard API token' => 'Pinboard API Token',
    'Pinboard tags' => 'Pinboard Tags',
@ -233,4 +230,5 @@ return array(
    'Enable image proxy' => 'Verwende Proxyserver für Bilder',
    'Avoid mixed content warnings with HTTPS' => 'Vermeidet Warnungen wegen gemischtem Inhalt bei HTTPS',
    'Download favicons' => 'Favicons herunterladen',
+    'general' => 'allgemein',
 );
--- a/locales/es_ES/translations.php
+++ b/locales/es_ES/translations.php
@ -84,7 +84,6 @@ return array(
    'Confirmation' => 'Confirmación',
    'Language' => 'Idioma',
    'Save' => 'Guardar',
-    'Database' => 'Base de datos',
    'Database size:' => 'Tamaño de la base de datos:',
    'Optimize the database' => 'Optimizar la base de datos',
    '(VACUUM command)' => '(comando SQL VACUUM)',
@ -204,7 +203,6 @@ return array(
    // 'FAQ' => '',
    // 'settings' => '',
    // 'help' => '',
-    // 'API' => '',
    // 'api' => '',
    // 'about' => '',
    // 'This action will update Miniflux with the last development version, are you sure?' => '',
@ -218,7 +216,6 @@ return array(
    // 'Remove automatically unread items' => '',
    // 'Toggle RTL mode' => '',
    // 'external services' => '',
-    // 'External services' => '',
    // 'Send bookmarks to Pinboard' => '',
    // 'Pinboard API token' => '',
    // 'Pinboard tags' => '',
@ -233,4 +230,5 @@ return array(
    // 'Enable image proxy' => '',
    // 'Avoid mixed content warnings with HTTPS' => '',
    // 'Download favicons' => '',
+    // 'general' => '',
 );
--- a/locales/fr_FR/translations.php
+++ b/locales/fr_FR/translations.php
@ -84,7 +84,6 @@ return array(
    'Confirmation' => 'Confirmation',
    'Language' => 'Langue',
    'Save' => 'Sauvegarder',
-    'Database' => 'Base de données',
    'Database size:' => 'Taille de la base de données :',
    'Optimize the database' => 'Optimiser la base de données',
    '(VACUUM command)' => '(commande SQL VACUUM)',
@ -204,7 +203,6 @@ return array(
    'FAQ' => 'Questions fréquentes',
    'settings' => 'préférences',
    'help' => 'aide',
-    'API' => 'API',
    'api' => 'api',
    'about' => 'a propos',
    'This action will update Miniflux with the last development version, are you sure?' => 'Cette action va mettre à jour Miniflux avec la dernière version en cours de développement, êtes-vous certain ?',
@ -218,7 +216,6 @@ return array(
    'Remove automatically unread items' => 'Supprimer automatiquement les éléments non lus',
    'Toggle RTL mode' => 'Basculer entre le mode RTL',
    'external services' => 'services externes',
-    'External services' => 'Services externes',
    'Send bookmarks to Pinboard' => 'Envoyer les favoris vers Pinboard',
    'Pinboard API token' => 'Jeton d\'accès à l\'API de Pinboard',
    'Pinboard tags' => 'Tags Pinboard',
@ -233,4 +230,5 @@ return array(
    'Enable image proxy' => 'Activer le proxy pour les images',
    'Avoid mixed content warnings with HTTPS' => 'Évite les alertes du navigateur web en HTTPS',
    'Download favicons' => 'Télécharger les icônes des sites web',
+    'general' => 'general',
 );
--- a/locales/it_IT/translations.php
+++ b/locales/it_IT/translations.php
@ -84,7 +84,6 @@ return array(
    'Confirmation' => 'Conferma',
    'Language' => 'Lingua',
    'Save' => 'Salva',
-    'Database' => 'Database',
    'Database size:' => 'Dimensione database:',
    'Optimize the database' => 'Ottimizza il database',
    '(VACUUM command)' => '(comando VACUUM)',
@ -204,7 +203,6 @@ return array(
    // 'FAQ' => '',
    // 'settings' => '',
    // 'help' => '',
-    // 'API' => '',
    // 'api' => '',
    // 'about' => '',
    // 'This action will update Miniflux with the last development version, are you sure?' => '',
@ -218,7 +216,6 @@ return array(
    // 'Remove automatically unread items' => '',
    // 'Toggle RTL mode' => '',
    // 'external services' => '',
-    // 'External services' => '',
    // 'Send bookmarks to Pinboard' => '',
    // 'Pinboard API token' => '',
    // 'Pinboard tags' => '',
@ -233,4 +230,5 @@ return array(
    // 'Enable image proxy' => '',
    // 'Avoid mixed content warnings with HTTPS' => '',
    // 'Download favicons' => '',
+    // 'general' => '',
 );
--- a/locales/pt_BR/translations.php
+++ b/locales/pt_BR/translations.php
@ -84,7 +84,6 @@ return array(
    'Confirmation' => 'Repetir Senha',
    'Language' => 'Linguagem',
    'Save' => 'Salvar',
-    'Database' => 'Banco de dados',
    'Database size:' => 'Tamanho do Banco de dados:',
    'Optimize the database' => 'Otimizar o banco de dados',
    '(VACUUM command)' => '(Comando SQL VACUUM)',
@ -204,7 +203,6 @@ return array(
    'FAQ' => 'FAQ',
    'settings' => 'configurações',
    'help' => 'ajuda',
-    'API' => 'API',
    'api' => 'api',
    'about' => 'sobre',
    'This action will update Miniflux with the last development version, are you sure?' => 'Esta ação irá atualizar o Miniflux com a última versão de desenvolvimento, você tem certeza?',
@ -218,7 +216,6 @@ return array(
    'Remove automatically unread items' => 'Remover automaticamente itens não lidos',
    'Toggle RTL mode' => 'Alternar modo RTL',
    'external services' => 'serviços externos',
-    'External services' => 'Serviços externos',
    'Send bookmarks to Pinboard' => 'Enviar bookmarks para Pinboard',
    'Pinboard API token' => 'Token da API Pinboard',
    'Pinboard tags' => 'Tags Pinboard',
@ -233,4 +230,5 @@ return array(
    'Enable image proxy' => 'Habilitar proxy de imagens',
    'Avoid mixed content warnings with HTTPS' => 'Evita alertas de mistura de conteúdo HTTPS',
    'Download favicons' => 'Download favicon',
+    // 'general' => '',
 );
--- a/locales/zh_CN/translations.php
+++ b/locales/zh_CN/translations.php
@ -84,7 +84,6 @@ return array(
    'Confirmation' => '确认密码',
    'Language' => '语言',
    'Save' => '保存',
-    'Database' => '数据库',
    'Database size:' => '数据库大小:',
    'Optimize the database' => '数据库优化',
    '(VACUUM command)' => '(VACUUM 命令)',
@ -204,7 +203,6 @@ return array(
    // 'FAQ' => '',
    // 'settings' => '',
    // 'help' => '',
-    // 'API' => '',
    // 'api' => '',
    // 'about' => '',
    // 'This action will update Miniflux with the last development version, are you sure?' => '',
@ -218,7 +216,6 @@ return array(
    // 'Remove automatically unread items' => '',
    // 'Toggle RTL mode' => '',
    // 'external services' => '',
-    // 'External services' => '',
    // 'Send bookmarks to Pinboard' => '',
    // 'Pinboard API token' => '',
    // 'Pinboard tags' => '',
@ -233,4 +230,5 @@ return array(
    // 'Enable image proxy' => '',
    // 'Avoid mixed content warnings with HTTPS' => '',
    // 'Download favicons' => '',
+    // 'general' => '',
 );
--- a/templates/about.php
+++ b/templates/about.php
@ -1,12 +1,15 @@
 <div class="page-header">
-    <h2><?= t('About') ?></h2>
-    <ul>
-        <li><a href="?action=config"><?= t('settings') ?></a></li>
-        <li><a href="?action=services"><?= t('external services') ?></a></li>
-        <li><a href="?action=help"><?= t('help') ?></a></li>
-        <li><a href="?action=database"><?= t('database') ?></a></li>
-        <li><a href="?action=api"><?= t('api') ?></a></li>
-    </ul>
+    <h2><?= $title ?></h2>
+    <nav>
+        <ul>
+            <li><a href="?action=config"><?= t('general') ?></a></li>
+            <li><a href="?action=services"><?= t('external services') ?></a></li>
+            <li><a href="?action=api"><?= t('api') ?></a></li>
+            <li><a href="?action=database"><?= t('database') ?></a></li>
+            <li><a href="?action=help"><?= t('help') ?></a></li>
+            <li class="active"><a href="?action=about"><?= t('about') ?></a></li>
+        </ul>
+    </nav>
 </div>
 <section>
    <div class="alert alert-normal">
--- a/templates/api.php
+++ b/templates/api.php
@ -1,12 +1,15 @@
 <div class="page-header">
-    <h2><?= t('API') ?></h2>
-    <ul>
-        <li><a href="?action=config"><?= t('settings') ?></a></li>
-        <li><a href="?action=services"><?= t('external services') ?></a></li>
-        <li><a href="?action=about"><?= t('about') ?></a></li>
-        <li><a href="?action=help"><?= t('help') ?></a></li>
-        <li><a href="?action=database"><?= t('database') ?></a></li>
-    </ul>
+    <h2><?= $title ?></h2>
+    <nav>
+        <ul>
+            <li><a href="?action=config"><?= t('general') ?></a></li>
+            <li><a href="?action=services"><?= t('external services') ?></a></li>
+            <li class="active"><a href="?action=api"><?= t('api') ?></a></li>
+            <li><a href="?action=database"><?= t('database') ?></a></li>
+            <li><a href="?action=help"><?= t('help') ?></a></li>
+            <li><a href="?action=about"><?= t('about') ?></a></li>
+        </ul>
+    </nav>
 </div>
 <section>
    <div class="alert alert-normal">
--- a/templates/config.php
+++ b/templates/config.php
@ -1,12 +1,15 @@
 <div class="page-header">
-    <h2><?= t('Preferences') ?></h2>
-    <ul>
-        <li><a href="?action=services"><?= t('external services') ?></a></li>
-        <li><a href="?action=about"><?= t('about') ?></a></li>
-        <li><a href="?action=help"><?= t('help') ?></a></li>
-        <li><a href="?action=database"><?= t('database') ?></a></li>
-        <li><a href="?action=api"><?= t('api') ?></a></li>
-    </ul>
+    <h2><?= $title ?></h2>
+    <nav>
+        <ul>
+            <li class="active"><a href="?action=config"><?= t('general') ?></a></li>
+            <li><a href="?action=services"><?= t('external services') ?></a></li>
+            <li><a href="?action=api"><?= t('api') ?></a></li>
+            <li><a href="?action=database"><?= t('database') ?></a></li>
+            <li><a href="?action=help"><?= t('help') ?></a></li>
+            <li><a href="?action=about"><?= t('about') ?></a></li>
+        </ul>
+    </nav>
 </div>
 <section>
 <form method="post" action="?action=config" autocomplete="off">
--- a/templates/database.php
+++ b/templates/database.php
@ -1,12 +1,15 @@
 <div class="page-header">
-    <h2><?= t('Database') ?></h2>
-    <ul>
-        <li><a href="?action=config"><?= t('settings') ?></a></li>
-        <li><a href="?action=services"><?= t('external services') ?></a></li>
-        <li><a href="?action=about"><?= t('about') ?></a></li>
-        <li><a href="?action=help"><?= t('help') ?></a></li>
-        <li><a href="?action=api"><?= t('api') ?></a></li>
-    </ul>
+    <h2><?= $title ?></h2>
+    <nav>
+        <ul>
+            <li><a href="?action=config"><?= t('general') ?></a></li>
+            <li><a href="?action=services"><?= t('external services') ?></a></li>
+            <li><a href="?action=api"><?= t('api') ?></a></li>
+            <li class="active"><a href="?action=database"><?= t('database') ?></a></li>
+            <li><a href="?action=help"><?= t('help') ?></a></li>
+            <li><a href="?action=about"><?= t('about') ?></a></li>
+        </ul>
+    </nav>
 </div>
 <section>
    <div class="alert alert-normal">
--- a/templates/help.php
+++ b/templates/help.php
@ -1,12 +1,15 @@
 <div class="page-header">
-    <h2><?= t('Help') ?></h2>
-    <ul>
-        <li><a href="?action=config"><?= t('settings') ?></a></li>
-        <li><a href="?action=services"><?= t('external services') ?></a></li>
-        <li><a href="?action=about"><?= t('about') ?></a></li>
-        <li><a href="?action=database"><?= t('database') ?></a></li>
-        <li><a href="?action=api"><?= t('api') ?></a></li>
-    </ul>
+    <h2><?= $title ?></h2>
+    <nav>
+        <ul>
+            <li><a href="?action=config"><?= t('general') ?></a></li>
+            <li><a href="?action=services"><?= t('external services') ?></a></li>
+            <li><a href="?action=api"><?= t('api') ?></a></li>
+            <li><a href="?action=database"><?= t('database') ?></a></li>
+            <li class="active"><a href="?action=help"><?= t('help') ?></a></li>
+            <li><a href="?action=about"><?= t('about') ?></a></li>
+        </ul>
+    </nav>
 </div>
 <section>
    <?= \PicoFarad\Template\load('keyboard_shortcuts') ?>
--- a/templates/services.php
+++ b/templates/services.php
@ -1,12 +1,15 @@
 <div class="page-header">
-    <h2><?= t('External services') ?></h2>
-    <ul>
-        <li><a href="?action=config"><?= t('settings') ?></a></li>
-        <li><a href="?action=about"><?= t('about') ?></a></li>
-        <li><a href="?action=help"><?= t('help') ?></a></li>
-        <li><a href="?action=database"><?= t('database') ?></a></li>
-        <li><a href="?action=api"><?= t('api') ?></a></li>
-    </ul>
+    <h2><?= $title ?></h2>
+    <nav>
+        <ul>
+            <li><a href="?action=config"><?= t('general') ?></a></li>
+            <li class="active"><a href="?action=services"><?= t('external services') ?></a></li>
+            <li><a href="?action=api"><?= t('api') ?></a></li>
+            <li><a href="?action=database"><?= t('database') ?></a></li>
+            <li><a href="?action=help"><?= t('help') ?></a></li>
+            <li><a href="?action=about"><?= t('about') ?></a></li>
+        </ul>
+    </nav>
 </div>
 <section>