From 5ddae689535cb5df7ae4d54f0efc3806d71a266c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 16 Apr 2020 18:09:54 +0200
Subject: Option to control which categories to unfold (#2888)

#fix https://github.com/FreshRSS/FreshRSS/issues/2324
---
 app/views/configure/reading.phtml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'app/views/configure')

diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index 5eb009a1d..cb74440a5 100644
--- a/app/views/configure/reading.phtml
+++ b/app/views/configure/reading.phtml
@@ -48,11 +48,13 @@
 		</div>
 
 		<div class="form-group">
+			<label class="group-name" for="default_view"><?= _t('conf.reading.display_categories_unfolded') ?></label>
 			<div class="group-controls">
-				<label class="checkbox" for="show_fav_unread">
-					<input type="checkbox" name="show_fav_unread" id="show_fav_unread" value="1"<?= FreshRSS_Context::$user_conf->show_fav_unread ? ' checked="checked"' : '' ?> data-leave-validation="<?= FreshRSS_Context::$user_conf->show_fav_unread ?>"/>
-					<?= _t('conf.reading.always_show_favorites') ?>
-				</label>
+				<select name="display_categories" id="display_categories" data-leave-validation="<?= FreshRSS_Context::$user_conf->display_categories ?>">
+					<option value="active"<?= FreshRSS_Context::$user_conf->display_categories === 'active' ? ' selected="selected"' : '' ?>><?= _t('conf.reading.show.active_category') ?></option>
+					<option value="all"<?= FreshRSS_Context::$user_conf->display_categories === 'all' ? ' selected="selected"' : '' ?>><?= _t('conf.reading.show.all_categories') ?></option>
+					<option value="none"<?= FreshRSS_Context::$user_conf->display_categories === 'none' ? ' selected="selected"' : '' ?>><?= _t('conf.reading.show.no_category') ?></option>
+				</select>
 			</div>
 		</div>
 
@@ -67,19 +69,18 @@
 
 		<div class="form-group">
 			<div class="group-controls">
-				<label class="checkbox" for="display_posts">
-					<input type="checkbox" name="display_posts" id="display_posts" value="1"<?= FreshRSS_Context::$user_conf->display_posts ? ' checked="checked"' : '' ?> data-leave-validation="<?= FreshRSS_Context::$user_conf->display_posts ?>"/>
-					<?= _t('conf.reading.display_articles_unfolded') ?>
-					<noscript> — <strong><?= _t('gen.js.should_be_activated') ?></strong></noscript>
+				<label class="checkbox" for="show_fav_unread">
+					<input type="checkbox" name="show_fav_unread" id="show_fav_unread" value="1"<?= FreshRSS_Context::$user_conf->show_fav_unread ? ' checked="checked"' : '' ?> data-leave-validation="<?= FreshRSS_Context::$user_conf->show_fav_unread ?>"/>
+					<?= _t('conf.reading.always_show_favorites') ?>
 				</label>
 			</div>
 		</div>
 
 		<div class="form-group">
 			<div class="group-controls">
-				<label class="checkbox" for="display_categories">
-					<input type="checkbox" name="display_categories" id="display_categories" value="1"<?= FreshRSS_Context::$user_conf->display_categories ? ' checked="checked"' : '' ?> data-leave-validation="<?= FreshRSS_Context::$user_conf->display_categories ?>"/>
-					<?= _t('conf.reading.display_categories_unfolded') ?>
+				<label class="checkbox" for="display_posts">
+					<input type="checkbox" name="display_posts" id="display_posts" value="1"<?= FreshRSS_Context::$user_conf->display_posts ? ' checked="checked"' : '' ?> data-leave-validation="<?= FreshRSS_Context::$user_conf->display_posts ?>"/>
+					<?= _t('conf.reading.display_articles_unfolded') ?>
 					<noscript> — <strong><?= _t('gen.js.should_be_activated') ?></strong></noscript>
 				</label>
 			</div>
-- 
cgit v1.2.3