diff options
| -rwxr-xr-x | classes/pref/feeds.php | 9 | ||||
| -rwxr-xr-x[-rw-r--r--] | css/tt-rss.less | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | js/FeedTree.js | 1 |
3 files changed, 12 insertions, 4 deletions
diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 5cd07b3ef..71b81e1da 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -69,7 +69,7 @@ class Pref_Feeds extends Handler_Protected { } $fsth = $this->pdo->prepare("SELECT id, title, last_error, - ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated + ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval FROM ttrss_feeds WHERE cat_id = :cat AND owner_uid = :uid AND @@ -90,6 +90,7 @@ class Pref_Feeds extends Handler_Protected { $feed['icon'] = Feeds::getFeedIcon($feed_line['id']); $feed['param'] = make_local_datetime( $feed_line['last_updated'], true); + $feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0); array_push($items, $feed); } @@ -237,7 +238,7 @@ class Pref_Feeds extends Handler_Protected { $cat['child_unread'] = 0; $fsth = $this->pdo->prepare("SELECT id, title,last_error, - ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated + ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval FROM ttrss_feeds WHERE cat_id IS NULL AND owner_uid = :uid AND @@ -258,6 +259,7 @@ class Pref_Feeds extends Handler_Protected { $feed_line['last_updated'], true); $feed['unread'] = 0; $feed['type'] = 'feed'; + $feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0); array_push($cat['items'], $feed); } @@ -272,7 +274,7 @@ class Pref_Feeds extends Handler_Protected { } else { $fsth = $this->pdo->prepare("SELECT id, title, last_error, - ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated + ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated, update_interval FROM ttrss_feeds WHERE owner_uid = :uid AND (:search = '' OR (LOWER(title) LIKE :search OR LOWER(feed_url) LIKE :search)) @@ -292,6 +294,7 @@ class Pref_Feeds extends Handler_Protected { $feed_line['last_updated'], true); $feed['unread'] = 0; $feed['type'] = 'feed'; + $feed['updates_disabled'] = (int)($feed_line['update_interval'] < 0); array_push($root['items'], $feed); } diff --git a/css/tt-rss.less b/css/tt-rss.less index 48e4d9fe0..1a81be562 100644..100755 --- a/css/tt-rss.less +++ b/css/tt-rss.less @@ -828,6 +828,10 @@ body.ttrss_main { color : red; } + #feedTree .dijitTreeRow.UpdatesDisabled .dijitTreeLabel { + color : #909090; + } + #feedTree.dijitTree .dijitTreeNode .dijitTreeRowSelected { box-shadow : -1px 0px 2px -1px rgba(0,0,0,0.1); border-right-color : white; @@ -1206,4 +1210,4 @@ body.ttrss_login { ::selection { background : @color-accent; color : white; -}
\ No newline at end of file +} diff --git a/js/FeedTree.js b/js/FeedTree.js index 63fa308f0..aff481e2c 100644..100755 --- a/js/FeedTree.js +++ b/js/FeedTree.js @@ -267,6 +267,7 @@ require(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"] "dijitTreeRow Error"; if (item.unread > 0) rc += " Unread"; + if (item.updates_disabled > 0) rc += " UpdatesDisabled"; return rc; }, |