sanity checking in filter editor, updated NEWS, changed prefs UI a bit more

This commit is contained in:
Andrew Dolgov 2005-09-03 09:03:06 +01:00
parent 0afbd85193
commit ea6774cf1d
3 changed files with 15 additions and 7 deletions

4
NEWS
View File

@ -1,6 +1,8 @@
v1.0.3 (Sep xx, 2005) v1.0.3 (Sep xx, 2005)
- OPML export/import. - OPML export/import
- Support for simple content filtering (expression should be valid regexp)
- Reworked preferences dialog
v1.0.2 (Sep 02, 2005) v1.0.2 (Sep 02, 2005)

View File

@ -646,7 +646,7 @@
} }
print "<table class=\"prefAddFeed\"><tr> print "<table class=\"prefAddFeed\"><tr>
<td>Expr: <input id=\"fadd_regexp\"></td> <td><input id=\"fadd_regexp\"></td>
<td>"; <td>";
print_select("fadd_match", "", $filter_types); print_select("fadd_match", "", $filter_types);
@ -661,7 +661,7 @@
(SELECT description FROM ttrss_filter_types (SELECT description FROM ttrss_filter_types
WHERE id = filter_type) as filter_type_descr WHERE id = filter_type) as filter_type_descr
FROM FROM
ttrss_filters ORDER by id"); ttrss_filters ORDER by regexp");
print "<p><table width=\"100%\" class=\"prefFilterList\" id=\"prefFilterList\">"; print "<p><table width=\"100%\" class=\"prefFilterList\" id=\"prefFilterList\">";
@ -684,6 +684,9 @@
print "<tr class=\"$class\" id=\"FILRR-$filter_id\">"; print "<tr class=\"$class\" id=\"FILRR-$filter_id\">";
$line["regexp"] = htmlspecialchars($line["regexp"]);
$line["description"] = htmlspecialchars($line["description"]);
if (!$edit_filter_id || $subop != "edit") { if (!$edit_filter_id || $subop != "edit") {
if (!$line["description"]) $line["description"] = "[No description]"; if (!$line["description"]) $line["description"] = "[No description]";

View File

@ -28,11 +28,12 @@
</tr> </tr>
</tr> </tr>
<td id="prefContent" class="prefContent" valign="top" colspan="2"> <td id="prefContent" class="prefContent" valign="top" colspan="2">
<h2>Feed Configuration</h2> <div id="piggie">&nbsp;</div> <h2>Feed Configuration</h2><div id="piggie">&nbsp;</div>
<div class="expPane" id="feedConfPane"> <div class="expPane" id="feedConfPane">
<a href="javascript:expandPane('feedConfPane')">Click to expand &gt;&gt;</a> <a class="button"
href="javascript:expandPane('feedConfPane')">Expand section &gt;</a>
</div> </div>
<h2>OPML Import</h2> <h2>OPML Import</h2>
@ -48,10 +49,12 @@
</div> </div>
<h2>Content filtering</h2> <h2>Content Filtering</h2>
<div class="expPane" id="filterConfPane"> <div class="expPane" id="filterConfPane">
<a href="javascript:expandPane('filterConfPane')">Click to expand &gt;&gt;</a> <a class="button"
href="javascript:expandPane('filterConfPane')">Expand section &gt;</a>
</div> </div>
</td> </td>