aboutsummaryrefslogtreecommitdiff
path: root/app/layout/aside_feed.phtml
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2019-02-13 15:06:28 +0100
committerGravatar GitHub <noreply@github.com> 2019-02-13 15:06:28 +0100
commit2374374ba972eb4cca84d7f71b1900f806c2b914 (patch)
tree71496d87cf87d14650da48154f7d232418404c21 /app/layout/aside_feed.phtml
parent142c80a4b8e13ce93f6c2eb697afeb7e6b54431e (diff)
Less jQuery (#2234)
* Less jQuery Follow-up of https://github.com/FreshRSS/FreshRSS/pull/2199 * Even less jQuery + global view unread title fix * Even less jQuery * Yet even less jQuery * Even less jQuery * Reduce some events * Even less jQuery * jQuery gone from main view +Fixed English i18n * Fix feed folded view * Remove Firefox 64 workaround Remove workaround for Gecko bug 1514498 in Firefox 64, fixed in Firefox 65 * Split to extra.js Avoid loading unneeded JavaScript code for the main view. + several adjustements * Improve CSS transition fold category * Rewrite shortcuts Remove library. Much faster, shorter, one listener instead of many. Control of the shortcut context. Fix https://github.com/FreshRSS/FreshRSS/issues/2215 * Remove debug * Minor syntax * Filter out unwanted shortcut modifiers * Menu overflow fix * Typo * Fix unfolding in mobile view * Remove jQuery from category.js * Remove jQuery from Global view
Diffstat (limited to 'app/layout/aside_feed.phtml')
-rw-r--r--app/layout/aside_feed.phtml6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 5efaa54d1..637acf4a4 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -37,13 +37,14 @@
<?php
$t_active = FreshRSS_Context::isCurrentGet('T');
+ $t_show = $t_active || FreshRSS_Context::$user_conf->display_categories;
?>
<li class="tree-folder category tags<?php echo $t_active ? ' active' : ''; ?>">
<div class="tree-folder-title">
<a class="dropdown-toggle" href="#"><?php echo _i($t_active ? 'up' : 'down'); ?></a>
<a class="title" data-unread="<?php echo format_number($this->nbUnreadTags); ?>" href="<?php echo _url('index', $actual_view, 'get', 'T'); ?>"><?php echo _t('index.menu.tags'); ?></a>
</div>
- <ul class="tree-folder-items<?php echo $t_active ? ' active' : ''; ?>">
+ <ul class="tree-folder-items<?php echo $t_show ? ' active' : ''; ?>">
<?php
foreach ($this->tags as $tag):
?>
@@ -64,8 +65,7 @@
$feeds = $cat->feeds();
if (!empty($feeds)) {
$c_active = FreshRSS_Context::isCurrentGet('c_' . $cat->id());
- $c_show = $c_active && (!FreshRSS_Context::$user_conf->display_categories ||
- FreshRSS_Context::$current_get['feed']);
+ $c_show = $c_active || FreshRSS_Context::$user_conf->display_categories;
?>
<li class="tree-folder category<?php echo $c_active ? ' active' : ''; ?>" data-unread="<?php echo $cat->nbNotRead(); ?>">
<div class="tree-folder-title">