diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/configure/reading.phtml | 69 | ||||
| -rw-r--r-- | app/views/helpers/feed/update.phtml | 34 |
2 files changed, 64 insertions, 39 deletions
diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml index 825655102..251981397 100644 --- a/app/views/configure/reading.phtml +++ b/app/views/configure/reading.phtml @@ -69,7 +69,7 @@ </div> </fieldset> - + <fieldset> <legend><?= _t('conf.reading.headline.categories') ?></legend> <div class="form-group"> @@ -201,21 +201,6 @@ </div> <div class="form-group"> - <label class="group-name" for="enable_read_when_same_title_in_feed"><?= _t('conf.reading.read.when') ?></label> - <div class="group-controls"> - <label class="checkbox" for="enable_read_when_same_title_in_feed"> - <input type="checkbox" name="enable_read_when_same_title_in_feed" id="enable_read_when_same_title_in_feed" value="1"<?= - empty(FreshRSS_Context::$user_conf->mark_when['same_title_in_feed']) ? '' : ' checked="checked"' ?> - data-leave-validation="<?= empty(FreshRSS_Context::$user_conf->mark_when['same_title_in_feed']) ? 0 : 1 ?>"/> - <?= _t('conf.reading.read.when_same_title') ?> - <?php $read_when_same_title_in_feed = empty(FreshRSS_Context::$user_conf->mark_when['same_title_in_feed']) ? 25 : FreshRSS_Context::$user_conf->mark_when['same_title_in_feed']; ?> - <input type="number" id="read_when_same_title_in_feed" name="read_when_same_title_in_feed" min="0" - value="<?= $read_when_same_title_in_feed ?>" data-leave-validation="<?= $read_when_same_title_in_feed ?>" /> - </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"> @@ -236,7 +221,7 @@ data-leave-validation="<?= FreshRSS_Context::$user_conf->mark_when['site'] ?>"/> <?= _t('conf.reading.read.article_open_on_website') ?> </label> - </div> + </div> </div> <div class="form-group"> @@ -248,31 +233,59 @@ data-leave-validation="<?= FreshRSS_Context::$user_conf->mark_when['scroll'] ?>"/> <?= _t('conf.reading.read.scroll') ?> </label> - </div> + </div> </div> <div class="form-group"> + <label class="group-name" for="enable_read_when_same_title_in_feed"><?= _t('conf.reading.read.when') ?></label> <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::$user_conf->mark_when['max_n_unread']) ? '' : ' checked="checked"' ?> - data-leave-validation="<?= empty(FreshRSS_Context::$user_conf->mark_when['max_n_unread']) ? 0 : 1 ?>"/> - <?= _t('conf.reading.read.keep_max_n_unread') ?> - <?php $keep_max_n_unread = empty(FreshRSS_Context::$user_conf->mark_when['max_n_unread']) ? 1000 : FreshRSS_Context::$user_conf->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 class="checkbox" for="enable_read_when_same_title_in_feed"> + <input type="checkbox" name="enable_read_when_same_title_in_feed" id="enable_read_when_same_title_in_feed" value="1"<?= + empty(FreshRSS_Context::$user_conf->mark_when['same_title_in_feed']) ? '' : ' checked="checked"' ?> + data-leave-validation="<?= empty(FreshRSS_Context::$user_conf->mark_when['same_title_in_feed']) ? 0 : 1 ?>"/> + <?= _t('conf.reading.read.when_same_title') ?> + <?php $read_when_same_title_in_feed = empty(FreshRSS_Context::$user_conf->mark_when['same_title_in_feed']) ? 25 : FreshRSS_Context::$user_conf->mark_when['same_title_in_feed']; ?> + <input type="number" id="read_when_same_title_in_feed" name="read_when_same_title_in_feed" min="0" + value="<?= $read_when_same_title_in_feed ?>" data-leave-validation="<?= $read_when_same_title_in_feed ?>" /> </label> </div> </div> <div class="form-group"> + <label class="group-name" for="mark_upon_reception"><?= _t('conf.reading.read.when') ?></label> <div class="group-controls"> - <label class="checkbox" for="check_reception"> - <input type="checkbox" name="mark_upon_reception" id="check_reception" value="1"<?= + <label class="checkbox" for="mark_upon_reception"> + <input type="checkbox" name="mark_upon_reception" id="mark_upon_reception" value="1"<?= FreshRSS_Context::$user_conf->mark_when['reception'] ? ' checked="checked"' : '' ?> data-leave-validation="<?= FreshRSS_Context::$user_conf->mark_when['reception'] ?>"/> <?= _t('conf.reading.read.upon_reception') ?> </label> - </div> + </div> + </div> + + <div class="form-group"> + <label class="group-name" for="read_upon_gone"><?= _t('conf.reading.read.when') ?></label> + <div class="group-controls"> + <label class="checkbox" for="read_upon_gone"> + <input type="checkbox" name="read_upon_gone" id="read_upon_gone" value="1"<?= + FreshRSS_Context::$user_conf->mark_when['gone'] ? ' checked="checked"' : '' ?> + data-leave-validation="<?= FreshRSS_Context::$user_conf->mark_when['gone'] ?>"/> + <?= _t('conf.reading.read.upon_gone') ?> + </label> + </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::$user_conf->mark_when['max_n_unread']) ? '' : ' checked="checked"' ?> + data-leave-validation="<?= empty(FreshRSS_Context::$user_conf->mark_when['max_n_unread']) ? 0 : 1 ?>"/> + <?= _t('conf.reading.read.keep_max_n_unread') ?> + <?php $keep_max_n_unread = empty(FreshRSS_Context::$user_conf->mark_when['max_n_unread']) ? 1000 : FreshRSS_Context::$user_conf->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> diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml index 1acf570ea..dc0f53a52 100644 --- a/app/views/helpers/feed/update.phtml +++ b/app/views/helpers/feed/update.phtml @@ -186,9 +186,17 @@ </div> <div class="form-group"> - <label class="group-name" for="keep_max_n_unread"><?= _t('conf.reading.read.keep_max_n_unread') ?></label> + <label class="group-name" for="read_when_same_title_in_feed"><?= _t('conf.reading.read.when') ?></label> <div class="group-controls"> - <input type="number" name="keep_max_n_unread" id="keep_max_n_unread" class="w50" min="1" max="10000000" value="<?= $this->feed->attributes('keep_max_n_unread') ?>" placeholder="<?= _t('gen.short.by_default') ?>" /> + <select name="read_when_same_title_in_feed" id="read_when_same_title_in_feed" class="w50"> + <option value=""<?= $this->feed->attributes('read_when_same_title_in_feed') === null ? ' selected="selected"' : '' ?>><?= _t('gen.short.by_default') ?></option> + <option value="0"<?= $this->feed->attributes('read_when_same_title_in_feed') === false ? ' selected="selected"' : '' ?>><?= _t('gen.short.no') ?></option> + <option value="10"<?= $this->feed->attributes('read_when_same_title_in_feed') == 10 ? ' selected="selected"' : '' ?>>10</option> + <option value="25"<?= $this->feed->attributes('read_when_same_title_in_feed') == 25 ? ' selected="selected"' : '' ?>>25</option> + <option value="100"<?= $this->feed->attributes('read_when_same_title_in_feed') == 100 ? ' selected="selected"' : '' ?>>100</option> + <option value="1000"<?= $this->feed->attributes('read_when_same_title_in_feed') == 1000 ? ' selected="selected"' : '' ?>>1 000</option> + </select> + <?= _t('conf.reading.read.when_same_title') ?> </div> </div> @@ -205,17 +213,14 @@ </div> <div class="form-group"> - <label class="group-name" for="read_when_same_title_in_feed"><?= _t('conf.reading.read.when') ?></label> + <label class="group-name" for="read_upon_gone"><?= _t('conf.reading.read.when') ?></label> <div class="group-controls"> - <select name="read_when_same_title_in_feed" id="read_when_same_title_in_feed" class="w50"> - <option value=""<?= $this->feed->attributes('read_when_same_title_in_feed') === null ? ' selected="selected"' : '' ?>><?= _t('gen.short.by_default') ?></option> - <option value="0"<?= $this->feed->attributes('read_when_same_title_in_feed') === false ? ' selected="selected"' : '' ?>><?= _t('gen.short.no') ?></option> - <option value="10"<?= $this->feed->attributes('read_when_same_title_in_feed') == 10 ? ' selected="selected"' : '' ?>>10</option> - <option value="25"<?= $this->feed->attributes('read_when_same_title_in_feed') == 25 ? ' selected="selected"' : '' ?>>25</option> - <option value="100"<?= $this->feed->attributes('read_when_same_title_in_feed') == 100 ? ' selected="selected"' : '' ?>>100</option> - <option value="1000"<?= $this->feed->attributes('read_when_same_title_in_feed') == 1000 ? ' selected="selected"' : '' ?>>1 000</option> + <select name="read_upon_gone" id="read_upon_gone" class="w50"> + <option value=""<?= $this->feed->attributes('read_upon_gone') === null ? ' selected="selected"' : '' ?>><?= _t('gen.short.by_default') ?></option> + <option value="0"<?= $this->feed->attributes('read_upon_gone') === false ? ' selected="selected"' : '' ?>><?= _t('gen.short.no') ?></option> + <option value="1"<?= $this->feed->attributes('read_upon_gone') === true ? ' selected="selected"' : '' ?>><?= _t('gen.short.yes') ?></option> </select> - <?= _t('conf.reading.read.when_same_title') ?> + <?= _t('conf.reading.read.upon_gone') ?> </div> </div> @@ -231,6 +236,13 @@ </div> </div> + <div class="form-group"> + <label class="group-name" for="keep_max_n_unread"><?= _t('conf.reading.read.keep_max_n_unread') ?></label> + <div class="group-controls"> + <input type="number" name="keep_max_n_unread" id="keep_max_n_unread" class="w50" min="1" max="10000000" value="<?= $this->feed->attributes('keep_max_n_unread') ?>" placeholder="<?= _t('gen.short.by_default') ?>" /> + </div> + </div> + <div class="form-group form-actions"> <div class="group-controls"> <button type="submit" class="btn btn-important"><?= _t('gen.action.submit') ?></button> |