valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mark date filters with unparsable reg_exp in filter display

This commit is contained in:
Andrew Dolgov 2008-12-13 15:02:19 +01:00
parent 44d0e7742b
commit 1b74062fc5
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/pref-filters.php
View File

@ -316,6 +316,7 @@
enabled, enabled,
inverse, inverse,
feed_id, feed_id,
filter_type,
ttrss_filter_actions.description AS action_description, ttrss_filter_actions.description AS action_description,
ttrss_feeds.title AS feed_title, ttrss_feeds.title AS feed_title,
ttrss_filter_actions.name AS action_name, ttrss_filter_actions.name AS action_name,
@ -417,16 +418,21 @@
$onclick = "onclick='editFilter($filter_id)' title='".__('Click to edit')."'"; $onclick = "onclick='editFilter($filter_id)' title='".__('Click to edit')."'";
print "<td $onclick>" . $line["reg_exp"] . "</td>"; if ($line["filter_type"] == 5 && !strtotime($line["reg_exp"])) {
print "<td $onclick>" . $line["feed_title"] . "</td>"; $line["reg_exp"] = "<span class=\"filterDateError\">" .
$line["reg_exp"] . "</span>";
}
$inverse_label = ""; $inverse_label = "";
if ($inverse) { if ($inverse) {
$inverse_label = " <span class='insensitive'>".__('(Inverse)')."</span>"; $inverse_label = " <span class='insensitive'>".__('(Inverse)')."</span>";
} }
print "<td $onclick>" . $line["reg_exp"] . "$inverse_label</td>";
print "<td $onclick>" . $line["feed_title"] . "</td>";
print "<td $onclick>" . $line["filter_type_descr"] . "$inverse_label</td>"; print "<td $onclick>" . $line["filter_type_descr"] . "</td>";
print "<td $onclick>" . $line["action_param"] . "</td>"; print "<td $onclick>" . $line["action_param"] . "</td>";
print "</tr>"; print "</tr>";

4
tt-rss.css
View File

@ -722,6 +722,10 @@ div.warning img, div.notice img, div.error img {
padding : 5px; padding : 5px;
} }
span.filterDateError {
color : #ff0000;
}
div.error { div.error {
border : 1px solid #ff0000; border : 1px solid #ff0000;
background : #ffcccc; background : #ffcccc;