aboutsummaryrefslogtreecommitdiff
path: root/app/layout
diff options
context:
space:
mode:
authorGravatar Alexis Degrugillier <github@ainw.org> 2014-08-23 08:18:47 -0400
committerGravatar Alexis Degrugillier <github@ainw.org> 2014-08-23 08:18:47 -0400
commitb1139bf39ca2ff8baa893a9d76e5196013666500 (patch)
tree6a1f3025822b3938174a6bbf42558f174a58185e /app/layout
parentfb664c2405d6efd3d2581c9613fef0e7063ef21b (diff)
Add category reading option
Before, when a category was selected, it was expanded to show the feeds in that category. Now, there is a parameter that allows the user to choose either if he wants the old behaviour or if he wants to expand only when needed (when selecting a feed or when clicking the appropriate button)
Diffstat (limited to 'app/layout')
-rw-r--r--app/layout/aside_flux.phtml10
1 files changed, 8 insertions, 2 deletions
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index aee8f8754..432d6fdb7 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -42,8 +42,14 @@
$feeds = $cat->feeds ();
if (!empty ($feeds)) {
$c_active = false;
- if ($this->get_c == $cat->id ()) {
- $c_active = true;
+ if ($this->conf->display_categories) {
+ if ($this->get_c == $cat->id () && $this->get_f) {
+ $c_active = true;
+ }
+ } else {
+ if ($this->get_c == $cat->id ()) {
+ $c_active = true;
+ }
}
?><li data-unread="<?php echo $cat->nbNotRead(); ?>"<?php if ($c_active) echo ' class="active"'; ?>><?php
?><div class="category stick<?php echo $c_active ? ' active' : ''; ?>"><?php