summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2015-10-24 21:38:30 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2015-10-24 21:38:30 +0200
commit52564957e6b25b4f127666da79d27eb99ca9bd5e (patch)
treee4d2a7a77ee1ef17e54e59b55d37e837dfaf1821
parent72430fd36d04a3eb2397131f6573a9d630158205 (diff)
parentab11b333b4c37f6765316ab6214cd356e2574be6 (diff)
Add a visual alert on categories
By @aledeg https://github.com/FreshRSS/FreshRSS/pull/984 https://github.com/FreshRSS/FreshRSS/pull/983
-rw-r--r--app/Models/Category.php7
-rw-r--r--app/layout/aside_feed.phtml2
-rw-r--r--p/themes/base-theme/template.css3
3 files changed, 11 insertions, 1 deletions
diff --git a/app/Models/Category.php b/app/Models/Category.php
index 37cb44dc3..9a44a2d09 100644
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -6,6 +6,7 @@ class FreshRSS_Category extends Minz_Model {
private $nbFeed = -1;
private $nbNotRead = -1;
private $feeds = null;
+ private $hasFeedsWithError = false;
public function __construct($name = '', $feeds = null) {
$this->_name($name);
@@ -16,6 +17,7 @@ class FreshRSS_Category extends Minz_Model {
foreach ($feeds as $feed) {
$this->nbFeed++;
$this->nbNotRead += $feed->nbNotRead();
+ $this->hasFeedsWithError |= $feed->inError();
}
}
}
@@ -51,12 +53,17 @@ class FreshRSS_Category extends Minz_Model {
foreach ($this->feeds as $feed) {
$this->nbFeed++;
$this->nbNotRead += $feed->nbNotRead();
+ $this->hasFeedsWithError |= $feed->inError();
}
}
return $this->feeds;
}
+ public function hasFeedsWithError() {
+ return $this->hasFeedsWithError;
+ }
+
public function _id($value) {
$this->id = $value;
}
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index a6d22f878..307db6af8 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -45,7 +45,7 @@
<li class="tree-folder category<?php echo $c_active ? ' active' : ''; ?>" data-unread="<?php echo $cat->nbNotRead(); ?>">
<div class="tree-folder-title">
<a class="dropdown-toggle" href="#"><?php echo _i($c_show ? 'up' : 'down'); ?></a>
- <a class="title" data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo $cat->name(); ?></a>
+ <a class="title<?php echo $cat->hasFeedsWithError() ? ' error' : ''; ?>" data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo $cat->name(); ?></a>
</div>
<ul class="tree-folder-items<?php echo $c_show ? ' active' : ''; ?>">
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 92d4917f5..92972b2c4 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -776,6 +776,9 @@ input:checked + .slide-container .properties {
.category .title:not([data-unread="0"])::after {
content: attr(data-unread);
}
+.category .title.error::before {
+ content: "⚠";
+}
.feed .item-title:not([data-unread="0"])::before {
content: "(" attr(data-unread) ") ";
}