From 92a0cc39a9790132fe96a1b783a09f13a19631f9 Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Thu, 13 Jun 2013 21:29:34 -0400 Subject: [PATCH 1/8] Add pages titles and the number of unread items --- index.php | 33 ++++++++++++++++++++++----------- locales/fr_FR/translations.php | 2 +- templates/app_header.php | 2 +- templates/unread_items.php | 2 +- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/index.php b/index.php index 34b90f3..a44c778 100644 --- a/index.php +++ b/index.php @@ -57,7 +57,6 @@ Router\before(function($action) { Router\get_action('logout', function() { Session\close(); - Response\redirect('?action=login'); }); @@ -173,7 +172,8 @@ Router\get_action('history', function() { Response\html(Template\layout('history', array( 'items' => Model\get_read_items(), - 'menu' => 'history' + 'menu' => 'history', + 'title' => t('History') ))); }); @@ -184,7 +184,8 @@ Router\get_action('confirm-remove', function() { Response\html(Template\layout('confirm_remove_feed', array( 'feed' => Model\get_feed($id), - 'menu' => 'feeds' + 'menu' => 'feeds', + 'title' => t('Confirmation') ))); }); @@ -242,7 +243,8 @@ Router\get_action('mark-as-read', function() { Router\get_action('confirm-flush-history', function() { Response\html(Template\layout('confirm_flush_items', array( - 'menu' => 'history' + 'menu' => 'history', + 'title' => t('Confirmation') ))); }); @@ -267,7 +269,8 @@ Router\get_action('feeds', function() { Response\html(Template\layout('feeds', array( 'feeds' => Model\get_feeds(), 'nothing_to_read' => Request\int_param('nothing_to_read'), - 'menu' => 'feeds' + 'menu' => 'feeds', + 'title' => t('Subscriptions') ))); }); @@ -277,7 +280,8 @@ Router\get_action('add', function() { Response\html(Template\layout('add', array( 'values' => array(), 'errors' => array(), - 'menu' => 'feeds' + 'menu' => 'feeds', + 'title' => t('New subscription') ))); }); @@ -296,7 +300,8 @@ Router\post_action('add', function() { Response\html(Template\layout('add', array( 'values' => array('url' => $_POST['url']), - 'menu' => 'feeds' + 'menu' => 'feeds', + 'title' => t('Subscriptions') ))); }); @@ -326,7 +331,8 @@ Router\get_action('import', function() { Response\html(Template\layout('import', array( 'errors' => array(), - 'menu' => 'feeds' + 'menu' => 'feeds', + 'title' => t('OPML Import') ))); }); @@ -354,7 +360,8 @@ Router\get_action('config', function() { 'db_size' => filesize(get_db_filename()), 'languages' => Model\get_languages(), 'autoflush_options' => Model\get_autoflush_options(), - 'menu' => 'config' + 'menu' => 'config', + 'title' => t('Preferences') ))); }); @@ -384,7 +391,8 @@ Router\post_action('config', function() { 'db_size' => filesize(get_db_filename()), 'languages' => Model\get_languages(), 'autoflush_options' => Model\get_autoflush_options(), - 'menu' => 'config' + 'menu' => 'config', + 'title' => t('Preferences') ))); }); @@ -394,14 +402,17 @@ Router\notfound(function() { Model\autoflush(); $items = Model\get_unread_items(); + $nb_items = count($items); - if (empty($items)) { + if ($nb_items === 0) { Response\redirect('?action=feeds¬hing_to_read=1'); } Response\html(Template\layout('unread_items', array( 'items' => $items, + 'nb_items' => $nb_items, + 'title' => 'miniflux ('.$nb_items.')', 'menu' => 'unread' ))); }); diff --git a/locales/fr_FR/translations.php b/locales/fr_FR/translations.php index e3abc4d..38a6efc 100644 --- a/locales/fr_FR/translations.php +++ b/locales/fr_FR/translations.php @@ -36,7 +36,7 @@ return array( 'About' => 'A propos', 'Miniflux version:' => 'Version de Miniflux :', 'Nothing to read' => 'Rien à lire', - 'Unread items' => 'Éléments non lus', + '%d unread items' => '%d éléments non lus', 'mark all as read' => 'tout marquer comme lu', 'original link' => 'lien original', 'mark as read' => 'marquer comme lu', diff --git a/templates/app_header.php b/templates/app_header.php index 2ccee69..f4eef4c 100644 --- a/templates/app_header.php +++ b/templates/app_header.php @@ -9,7 +9,7 @@ - miniflux + <?= isset($title) ? $title : 'miniflux' ?> diff --git a/templates/unread_items.php b/templates/unread_items.php index 71c0a35..54cc801 100644 --- a/templates/unread_items.php +++ b/templates/unread_items.php @@ -5,7 +5,7 @@
-

+

From 8bcc7339e4b86122435d3b17e5973b1ce77b2592 Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Thu, 13 Jun 2013 21:32:50 -0400 Subject: [PATCH 2/8] Add datetime to the items list --- templates/unread_items.php | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/unread_items.php b/templates/unread_items.php index 54cc801..02ee0e2 100644 --- a/templates/unread_items.php +++ b/templates/unread_items.php @@ -28,6 +28,7 @@

| + | | Date: Thu, 13 Jun 2013 21:40:08 -0400 Subject: [PATCH 3/8] Replace an old urlencode by encode_item_id() --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index a44c778..c625b77 100644 --- a/index.php +++ b/index.php @@ -162,7 +162,7 @@ Router\post_action('change-item-status', function() { $id = Model\decode_item_id(Request\param('id')); Response\json(array( - 'item_id' => urlencode($id), + 'item_id' => Model\encode_item_id($id), 'status' => Model\switch_item_status($id) )); }); From 4abf96687827c8c3acef71510c2b91a6d3185a55 Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Thu, 13 Jun 2013 22:08:38 -0400 Subject: [PATCH 4/8] Content column is flushed when the item status is set to removed --- model.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/model.php b/model.php index 0e277bc..5e61ee1 100644 --- a/model.php +++ b/model.php @@ -317,7 +317,7 @@ function set_item_removed($id) \PicoTools\singleton('db') ->table('items') ->eq('id', $id) - ->save(array('status' => 'removed')); + ->save(array('status' => 'removed', 'content' => '')); } @@ -384,7 +384,7 @@ function mark_as_removed() \PicoTools\singleton('db') ->table('items') ->eq('status', 'read') - ->save(array('status' => 'removed')); + ->save(array('status' => 'removed', 'content' => '')); } @@ -398,7 +398,7 @@ function autoflush() ->table('items') ->eq('status', 'read') ->lt('updated', strtotime('-'.$autoflush.'day')) - ->save(array('status' => 'removed')); + ->save(array('status' => 'removed', 'content' => '')); } } From bdfd7a19a30a5dacab47262c8e9758215787f9ca Mon Sep 17 00:00:00 2001 From: doubleface Date: Fri, 14 Jun 2013 08:43:50 -0400 Subject: [PATCH 5/8] Update the number of unread items when marking an item as read --- assets/js/app.js | 6 ++++++ templates/unread_items.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/assets/js/app.js b/assets/js/app.js index 3cca31c..c32e7de 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -171,6 +171,12 @@ { var item = document.getElementById("item-" + item_id); if (item) item.parentNode.removeChild(item); + + var $unread_span = document.getElementById("unread-count"); + var unread_count = parseInt($unread_span.innerHTML, 10) - 1; + + $unread_span.innerHTML = unread_count; + document.querySelector("title").innerHTML = "miniflux (" + unread_count + ")"; } diff --git a/templates/unread_items.php b/templates/unread_items.php index 02ee0e2..86e8e81 100644 --- a/templates/unread_items.php +++ b/templates/unread_items.php @@ -5,7 +5,7 @@

-

+

%d unread items', $nb_items) ?>

 From 467f191a51345e79cdd9579b2778c34bb60779b5 Mon Sep 17 00:00:00 2001 From: doubleface Date: Fri, 14 Jun 2013 10:53:04 -0400 Subject: [PATCH 6/8] Automatic selection of the first element for mark as read --- assets/js/app.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/js/app.js b/assets/js/app.js index 3cca31c..2f9f075 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -230,6 +230,10 @@ function change_item_status() { + if (! document.getElementById("current-item")) { + document.querySelector("article").id = "current-item"; + } + var item = document.getElementById("current-item"); if (item) switch_status(item.getAttribute("data-item-id")); } From f9146f078ad2bba8364b5b136617aa5b41c8e2f0 Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Fri, 14 Jun 2013 20:37:45 -0400 Subject: [PATCH 7/8] Update dynamically unread counter in multiple places --- assets/js/app.js | 26 +++++++++++++++++++------- locales/fr_FR/translations.php | 2 +- templates/app_header.php | 20 +++++++++++++++----- templates/unread_items.php | 2 +- 4 files changed, 36 insertions(+), 14 deletions(-) diff --git a/assets/js/app.js b/assets/js/app.js index 2efab3c..fd2f6e0 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -171,12 +171,24 @@ { var item = document.getElementById("item-" + item_id); if (item) item.parentNode.removeChild(item); - - var $unread_span = document.getElementById("unread-count"); - var unread_count = parseInt($unread_span.innerHTML, 10) - 1; - - $unread_span.innerHTML = unread_count; - document.querySelector("title").innerHTML = "miniflux (" + unread_count + ")"; + + var container = document.getElementById("page-counter"); + + if (container) { + + counter = parseInt(container.textContent.trim(), 10) - 1; + + if (counter == 0) { + + window.location = "?action=feeds¬hing_to_read=1"; + } + else { + + container.textContent = counter + " "; + document.title = "miniflux (" + counter + ")"; + document.getElementById("nav-counter").textContent = "(" + counter + ")"; + } + } } @@ -239,7 +251,7 @@ if (! document.getElementById("current-item")) { document.querySelector("article").id = "current-item"; } - + var item = document.getElementById("current-item"); if (item) switch_status(item.getAttribute("data-item-id")); } diff --git a/locales/fr_FR/translations.php b/locales/fr_FR/translations.php index 38a6efc..1efcc22 100644 --- a/locales/fr_FR/translations.php +++ b/locales/fr_FR/translations.php @@ -36,7 +36,7 @@ return array( 'About' => 'A propos', 'Miniflux version:' => 'Version de Miniflux :', 'Nothing to read' => 'Rien à lire', - '%d unread items' => '%d éléments non lus', + 'unread items' => 'éléments non lus', 'mark all as read' => 'tout marquer comme lu', 'original link' => 'lien original', 'mark as read' => 'marquer comme lu', diff --git a/templates/app_header.php b/templates/app_header.php index f4eef4c..e166193 100644 --- a/templates/app_header.php +++ b/templates/app_header.php @@ -18,11 +18,21 @@ diff --git a/templates/unread_items.php b/templates/unread_items.php index 86e8e81..0d19bbd 100644 --- a/templates/unread_items.php +++ b/templates/unread_items.php @@ -5,7 +5,7 @@
-

%d unread items', $nb_items) ?>

+

From 48fbe24c9b8938f75edbb66e77facc26be9b04b8 Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Fri, 14 Jun 2013 20:42:09 -0400 Subject: [PATCH 8/8] Rename update button to save --- locales/fr_FR/translations.php | 2 +- templates/config.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/fr_FR/translations.php b/locales/fr_FR/translations.php index 1efcc22..b3544f1 100644 --- a/locales/fr_FR/translations.php +++ b/locales/fr_FR/translations.php @@ -19,7 +19,7 @@ return array( 'Password' => 'Mot de passe', 'Confirmation' => 'Confirmation', 'Language' => 'Langue', - 'Update' => 'Mettre à jour', + 'Save' => 'Sauvegarder', 'More informations' => 'Plus d\'informations', 'Database' => 'Base de données', 'Database size:' => 'Taille de la base de données :', diff --git a/templates/config.php b/templates/config.php index b9527dc..547977a 100644 --- a/templates/config.php +++ b/templates/config.php @@ -22,7 +22,7 @@
- +