Change label for frontend update check and minor changes

This commit is contained in:
Frederic Guillot 2015-01-28 20:17:02 -05:00
parent 59500bfeb7
commit fa9dc3ab8f
10 changed files with 21 additions and 15 deletions

View File

@ -186,6 +186,10 @@ textarea:focus {
box-shadow: 0 0 8px rgba(82, 168, 236, 0.6); box-shadow: 0 0 8px rgba(82, 168, 236, 0.6);
} }
input[type="number"] {
width: 40px;
}
textarea { textarea {
border: 1px solid #ccc; border: 1px solid #ccc;
padding: 3px; padding: 3px;

View File

@ -329,10 +329,10 @@ Miniflux.Item = (function() {
var current_unread = false; var current_unread = false;
var response = JSON.parse(this.responseText); var response = JSON.parse(this.responseText);
for(var feed_id in response['feeds']) { for (var feed_id in response['feeds']) {
var current_feed = response['feeds'][feed_id]; var current_feed = response['feeds'][feed_id];
if (!latest_feeds_items.hasOwnProperty(feed_id) || current_feed.time > latest_feeds_items[feed_id]) { if (! latest_feeds_items.hasOwnProperty(feed_id) || current_feed.time > latest_feeds_items[feed_id]) {
Miniflux.App.Log('feed ' + feed_id + ': New item(s)'); Miniflux.App.Log('feed ' + feed_id + ': New item(s)');
latest_feeds_items[feed_id] = current_feed.time; latest_feeds_items[feed_id] = current_feed.time;
@ -345,22 +345,24 @@ Miniflux.Item = (function() {
Miniflux.App.Log('first_run: ' + first_run + ', current_unread: ' + current_unread + ', response.nbUnread: ' + response['nbUnread'] + ', nbUnreadItems: ' + nbUnreadItems); Miniflux.App.Log('first_run: ' + first_run + ', current_unread: ' + current_unread + ', response.nbUnread: ' + response['nbUnread'] + ', nbUnreadItems: ' + nbUnreadItems);
if (!document.hidden && (response['nbUnread'] !== nbUnreadItems || unreadItems)) { if (! document.hidden && (response['nbUnread'] !== nbUnreadItems || unreadItems)) {
Miniflux.App.Log('Counter changed! Updating unread counter.'); Miniflux.App.Log('Counter changed! Updating unread counter.');
unreadItems = false; unreadItems = false;
nbUnreadItems = response['nbUnread']; nbUnreadItems = response['nbUnread'];
updateCounters(); updateCounters();
} }
else if (document.hidden && !first_run && current_unread) { else if (document.hidden && ! first_run && current_unread) {
Miniflux.App.Log('New Unread! Updating pagetitle.'); Miniflux.App.Log('New Unread! Updating pagetitle.');
unreadItems = true; unreadItems = true;
document.title = "↻ " + document.title; document.title = "↻ " + document.title;
} else { }
else {
Miniflux.App.Log('No update.'); Miniflux.App.Log('No update.');
} }
Miniflux.App.Log('unreadItems: ' + unreadItems); Miniflux.App.Log('unreadItems: ' + unreadItems);
}; };
request.open("POST", "?action=latest-feeds-items", true); request.open("POST", "?action=latest-feeds-items", true);
request.send(); request.send();
} }

View File

@ -231,5 +231,5 @@ return array(
// 'Download favicons' => '', // 'Download favicons' => '',
// 'general' => '', // 'general' => '',
// 'An error occurred during the last check. Refresh the feed manually and check the %sconsole%s for errors afterwards!' => '', // 'An error occurred during the last check. Refresh the feed manually and check the %sconsole%s for errors afterwards!' => '',
// 'Frontend updatecheck interval in minutes' => '', // 'Refresh interval in minutes for unread counter' => '',
); );

View File

@ -231,5 +231,5 @@ return array(
'Download favicons' => 'Favicons herunterladen', 'Download favicons' => 'Favicons herunterladen',
'general' => 'allgemein', 'general' => 'allgemein',
'An error occurred during the last check. Refresh the feed manually and check the %sconsole%s for errors afterwards!' => 'Fehler bei der letzten Aktualisierung. Aktualisiere den Feed manuell und prüfe die %sKonsole%s anschließend auf Fehler!', 'An error occurred during the last check. Refresh the feed manually and check the %sconsole%s for errors afterwards!' => 'Fehler bei der letzten Aktualisierung. Aktualisiere den Feed manuell und prüfe die %sKonsole%s anschließend auf Fehler!',
// 'Frontend updatecheck interval in minutes' => '', // 'Refresh interval in minutes for unread counter' => '',
); );

View File

@ -231,5 +231,5 @@ return array(
// 'Download favicons' => '', // 'Download favicons' => '',
// 'general' => '', // 'general' => '',
// 'An error occurred during the last check. Refresh the feed manually and check the %sconsole%s for errors afterwards!' => '', // 'An error occurred during the last check. Refresh the feed manually and check the %sconsole%s for errors afterwards!' => '',
// 'Frontend updatecheck interval in minutes' => '', // 'Refresh interval in minutes for unread counter' => '',
); );

View File

@ -231,5 +231,5 @@ return array(
'Download favicons' => 'Télécharger les icônes des sites web', 'Download favicons' => 'Télécharger les icônes des sites web',
'general' => 'général', 'general' => 'général',
'An error occurred during the last check. Refresh the feed manually and check the %sconsole%s for errors afterwards!' => 'Une erreur est survenue pendant la dernière vérification. Actualisez, le flux manuellement and vérifiez les erreurs dans la %sconsole%s !', 'An error occurred during the last check. Refresh the feed manually and check the %sconsole%s for errors afterwards!' => 'Une erreur est survenue pendant la dernière vérification. Actualisez, le flux manuellement and vérifiez les erreurs dans la %sconsole%s !',
'Frontend updatecheck interval in minutes' => 'Frontend updatecheck interval in minutes', 'Refresh interval in minutes for unread counter' => 'Fréquence d\'actualisation en minute du compteur de non lus',
); );

View File

@ -231,5 +231,5 @@ return array(
// 'Download favicons' => '', // 'Download favicons' => '',
// 'general' => '', // 'general' => '',
// 'An error occurred during the last check. Refresh the feed manually and check the %sconsole%s for errors afterwards!' => '', // 'An error occurred during the last check. Refresh the feed manually and check the %sconsole%s for errors afterwards!' => '',
// 'Frontend updatecheck interval in minutes' => '', // 'Refresh interval in minutes for unread counter' => '',
); );

View File

@ -231,5 +231,5 @@ return array(
'Download favicons' => 'Download favicon', 'Download favicons' => 'Download favicon',
// 'general' => '', // 'general' => '',
// 'An error occurred during the last check. Refresh the feed manually and check the %sconsole%s for errors afterwards!' => '', // 'An error occurred during the last check. Refresh the feed manually and check the %sconsole%s for errors afterwards!' => '',
// 'Frontend updatecheck interval in minutes' => '', // 'Refresh interval in minutes for unread counter' => '',
); );

View File

@ -231,5 +231,5 @@ return array(
// 'Download favicons' => '', // 'Download favicons' => '',
// 'general' => '', // 'general' => '',
// 'An error occurred during the last check. Refresh the feed manually and check the %sconsole%s for errors afterwards!' => '', // 'An error occurred during the last check. Refresh the feed manually and check the %sconsole%s for errors afterwards!' => '',
// 'Frontend updatecheck interval in minutes' => '', // 'Refresh interval in minutes for unread counter' => '',
); );

View File

@ -35,9 +35,6 @@
<?= Helper\form_label(t('Theme'), 'theme') ?> <?= Helper\form_label(t('Theme'), 'theme') ?>
<?= Helper\form_select('theme', $theme_options, $values, $errors) ?><br/> <?= Helper\form_select('theme', $theme_options, $values, $errors) ?><br/>
<?= Helper\form_label(t('Frontend updatecheck interval in minutes'), 'frontend_updatecheck_interval') ?>
<?= Helper\form_number('frontend_updatecheck_interval', $values, $errors, array('min="0"')) ?><br/>
<?php if (ENABLE_AUTO_UPDATE): ?> <?php if (ENABLE_AUTO_UPDATE): ?>
<?= Helper\form_label(t('Auto-Update URL'), 'auto_update_url') ?> <?= Helper\form_label(t('Auto-Update URL'), 'auto_update_url') ?>
<?= Helper\form_text('auto_update_url', $values, $errors, array('required')) ?><br/> <?= Helper\form_text('auto_update_url', $values, $errors, array('required')) ?><br/>
@ -65,6 +62,9 @@
<?= Helper\form_label(t('When there is nothing to read, redirect me to this page'), 'redirect_nothing_to_read') ?> <?= Helper\form_label(t('When there is nothing to read, redirect me to this page'), 'redirect_nothing_to_read') ?>
<?= Helper\form_select('redirect_nothing_to_read', $redirect_nothing_to_read_options, $values, $errors) ?><br/> <?= Helper\form_select('redirect_nothing_to_read', $redirect_nothing_to_read_options, $values, $errors) ?><br/>
<?= Helper\form_label(t('Refresh interval in minutes for unread counter'), 'frontend_updatecheck_interval') ?>
<?= Helper\form_number('frontend_updatecheck_interval', $values, $errors, array('min="0"')) ?><br/>
<?= Helper\form_checkbox('nocontent', t('Do not fetch the content of articles'), 1, isset($values['nocontent']) && $values['nocontent'] == 1) ?><br /> <?= Helper\form_checkbox('nocontent', t('Do not fetch the content of articles'), 1, isset($values['nocontent']) && $values['nocontent'] == 1) ?><br />
<?= Helper\form_checkbox('favicons', t('Download favicons'), 1, isset($values['favicons']) && $values['favicons'] == 1) ?><br /> <?= Helper\form_checkbox('favicons', t('Download favicons'), 1, isset($values['favicons']) && $values['favicons'] == 1) ?><br />