From 1b74062fc554dcd51a680e30c5f9fbd4b4332225 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 13 Dec 2008 15:02:19 +0100 Subject: [PATCH] mark date filters with unparsable reg_exp in filter display --- modules/pref-filters.php | 12 +++++++++--- tt-rss.css | 4 ++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/modules/pref-filters.php b/modules/pref-filters.php index 777e9ba81..d0e12f31f 100644 --- a/modules/pref-filters.php +++ b/modules/pref-filters.php @@ -316,6 +316,7 @@ enabled, inverse, feed_id, + filter_type, ttrss_filter_actions.description AS action_description, ttrss_feeds.title AS feed_title, ttrss_filter_actions.name AS action_name, @@ -417,16 +418,21 @@ $onclick = "onclick='editFilter($filter_id)' title='".__('Click to edit')."'"; - print "" . $line["reg_exp"] . ""; - print "" . $line["feed_title"] . ""; + if ($line["filter_type"] == 5 && !strtotime($line["reg_exp"])) { + $line["reg_exp"] = "" . + $line["reg_exp"] . ""; + } $inverse_label = ""; if ($inverse) { $inverse_label = " ".__('(Inverse)').""; } + + print "" . $line["reg_exp"] . "$inverse_label"; + print "" . $line["feed_title"] . ""; - print "" . $line["filter_type_descr"] . "$inverse_label"; + print "" . $line["filter_type_descr"] . ""; print "" . $line["action_param"] . ""; print ""; diff --git a/tt-rss.css b/tt-rss.css index 129a8446f..7cf2bcf5e 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -722,6 +722,10 @@ div.warning img, div.notice img, div.error img { padding : 5px; } +span.filterDateError { + color : #ff0000; +} + div.error { border : 1px solid #ff0000; background : #ffcccc;