diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2024-10-19 19:24:29 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2024-10-19 19:24:29 +0200 |
| commit | a766ebfb68298cfd2a268d87443c5e2586e93243 (patch) | |
| tree | 3e3dea2f063eec75d6e6eae8b1e51751aebd7005 /app/views | |
| parent | 54f22de99bcc2f225c116b120270a81e1649b40f (diff) | |
Prepare options for category-level filter actions (#6920)
* Prepare options for category-level filter actions
Slightly move some options and add some help messages
Contributes to https://github.com/FreshRSS/FreshRSS/issues/6866
Prepare https://github.com/FreshRSS/FreshRSS/issues/6143
* Remove redudant help
Text changed by https://github.com/FreshRSS/FreshRSS/pull/6922 to be more precise
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/configure/reading.phtml | 54 | ||||
| -rw-r--r-- | app/views/helpers/category/update.phtml | 3 |
2 files changed, 29 insertions, 28 deletions
diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml index 474700117..feef45b6b 100644 --- a/app/views/configure/reading.phtml +++ b/app/views/configure/reading.phtml @@ -244,17 +244,6 @@ </div> <div class="form-group"> - <div class="group-controls"> - <label class="checkbox" for="mark_updated_article_unread"> - <input type="checkbox" name="mark_updated_article_unread" id="mark_updated_article_unread" value="1"<?= - FreshRSS_Context::userConf()->mark_updated_article_unread ? ' checked="checked"' : '' ?> - data-leave-validation="<?= FreshRSS_Context::userConf()->mark_updated_article_unread ?>"/> - <?= _t('conf.reading.mark_updated_article_unread') ?> - </label> - </div> - </div> - - <div class="form-group"> <label class="group-name" for="check_open_article"><?= _t('conf.reading.read.when') ?></label> <div class="group-controls"> <label class="checkbox" for="check_open_article"> @@ -301,6 +290,20 @@ </label> </div> </div> + </fieldset> + + <fieldset> + <legend><?= _t('sub.feed.filteractions') ?></legend> + <div class="form-group"> + <div class="group-controls"> + <label class="checkbox" for="mark_updated_article_unread"> + <input type="checkbox" name="mark_updated_article_unread" id="mark_updated_article_unread" value="1"<?= + FreshRSS_Context::userConf()->mark_updated_article_unread ? ' checked="checked"' : '' ?> + data-leave-validation="<?= FreshRSS_Context::userConf()->mark_updated_article_unread ?>"/> + <?= _t('conf.reading.mark_updated_article_unread') ?> + </label> + </div> + </div> <div class="form-group"> <label class="group-name" for="enable_read_when_same_title_in_feed"><?= _t('conf.reading.read.when') ?></label> @@ -342,22 +345,6 @@ </div> <div class="form-group"> - <div class="group-controls"> - <label class="checkbox" for="keep_max_n_unread"> - <input type="checkbox" name="enable_keep_max_n_unread" id="enable_keep_max_n_unread" value="1"<?= - empty(FreshRSS_Context::userConf()->mark_when['max_n_unread']) ? '' : ' checked="checked"' ?> - data-leave-validation="<?= empty(FreshRSS_Context::userConf()->mark_when['max_n_unread']) ? 0 : 1 ?>"/> - <?= _t('conf.reading.read.keep_max_n_unread') ?> - <?php $keep_max_n_unread = empty(FreshRSS_Context::userConf()->mark_when['max_n_unread']) ? 1000 : FreshRSS_Context::userConf()->mark_when['max_n_unread']; ?> - <input type="number" id="keep_max_n_unread" name="keep_max_n_unread" min="0" value="<?= $keep_max_n_unread ?>" data-leave-validation="<?= $keep_max_n_unread ?>" /> - </label> - </div> - </div> - </fieldset> - - <fieldset> - <legend><?= _t('sub.feed.filteractions') ?></legend> - <div class="form-group"> <label class="group-name" for="filteractions_read"><?= _t('conf.reading.read.when') ?></label> <div class="group-controls"> <textarea name="filteractions_read" id="filteractions_read" class="w100"><?php @@ -380,6 +367,19 @@ <p class="help"><?= _i('help') ?> <?= _t('sub.feed.filteractions.help') ?></p> </div> </div> + + <div class="form-group"> + <div class="group-controls"> + <label class="checkbox" for="keep_max_n_unread"> + <input type="checkbox" name="enable_keep_max_n_unread" id="enable_keep_max_n_unread" value="1"<?= + empty(FreshRSS_Context::userConf()->mark_when['max_n_unread']) ? '' : ' checked="checked"' ?> + data-leave-validation="<?= empty(FreshRSS_Context::userConf()->mark_when['max_n_unread']) ? 0 : 1 ?>"/> + <?= _t('conf.reading.read.keep_max_n_unread') ?> + <?php $keep_max_n_unread = empty(FreshRSS_Context::userConf()->mark_when['max_n_unread']) ? 1000 : FreshRSS_Context::userConf()->mark_when['max_n_unread']; ?> + <input type="number" id="keep_max_n_unread" name="keep_max_n_unread" min="0" value="<?= $keep_max_n_unread ?>" data-leave-validation="<?= $keep_max_n_unread ?>" /> + </label> + </div> + </div> </fieldset> <fieldset> diff --git a/app/views/helpers/category/update.phtml b/app/views/helpers/category/update.phtml index a922d4dca..96924c8f4 100644 --- a/app/views/helpers/category/update.phtml +++ b/app/views/helpers/category/update.phtml @@ -137,7 +137,8 @@ ?> <p class="alert alert-warn"> - <?= _t('conf.archiving.policy_warning') ?> + <?= _t('conf.archiving.policy_warning') ?><br /> + <?= _t('conf.reading.apply_to_individual_feed') ?> </p> <div class="form-group"> |