diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php index 0469b9611..9a46bde6c 100755 --- a/app/Controllers/indexController.php +++ b/app/Controllers/indexController.php @@ -70,11 +70,11 @@ class FreshRSS_index_Controller extends Minz_ActionController { // mise à jour des titres $this->view->rss_title = $this->view->currentName . ' | ' . Minz_View::title(); if ($this->view->nb_not_read > 0) { - Minz_View::appendTitle (' (' . formatNumber($this->view->nb_not_read) . ')'); + Minz_View::prependTitle('(' . formatNumber($this->view->nb_not_read) . ') '); } - Minz_View::prependTitle ( + Minz_View::prependTitle( + ($this->nb_not_read_cat > 0 ? '(' . formatNumber($this->nb_not_read_cat) . ') ' : '') . $this->view->currentName . - ($this->nb_not_read_cat > 0 ? ' (' . formatNumber($this->nb_not_read_cat) . ')' : '') . ' · ' ); diff --git a/p/scripts/main.js b/p/scripts/main.js index 243159ca5..e1e6d49ce 100644 --- a/p/scripts/main.js +++ b/p/scripts/main.js @@ -55,9 +55,11 @@ function numberFormat(nStr) { return x1 + x2; } -function incLabel(p, inc) { +function incLabel(p, inc, spaceAfter = false) { var i = str2int(p) + inc; - return i > 0 ? ' (' + numberFormat(i) + ')' : ''; + return i > 0 + ? ((spaceAfter ? '' : ' ') + '(' + numberFormat(i) + ')' + (spaceAfter ? ' ' : '')) + : ''; } function incUnreadsFeed(article, feed_id, nb) { @@ -96,13 +98,13 @@ function incUnreadsFeed(article, feed_id, nb) { var isCurrentView = false; //Update unread: title - document.title = document.title.replace(/((?: \([ 0-9]+\))?)( · .*?)((?: \([ 0-9]+\))?)$/, function (m, p1, p2, p3) { + document.title = document.title.replace(/^((?:\([ 0-9]+\) )?)(.*? · )((?:\([ 0-9]+\) )?)/, function (m, p1, p2, p3) { var $feed = $('#' + feed_id); if (article || ($feed.closest('.active').length > 0 && $feed.siblings('.active').length === 0)) { isCurrentView = true; - return incLabel(p1, nb) + p2 + incLabel(p3, feed_priority > 0 ? nb : 0); + return incLabel(p1, nb, true) + p2 + incLabel(p3, feed_priority > 0 ? nb : 0, true); } else { - return p1 + p2 + incLabel(p3, feed_priority > 0 ? nb : 0); + return p1 + p2 + incLabel(p3, feed_priority > 0 ? nb : 0, true); } }); return isCurrentView;