From 2c7070b519be0c55deb9533ebee358c6f628f198 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 21 Nov 2005 14:59:32 +0100 Subject: [PATCH] per-feed filters tweaks, prefAddFeed table removed, update NEWS --- NEWS | 1 + backend.php | 71 +++++++++++++++++++++++++---------------------------- tt-rss.css | 8 ------ 3 files changed, 35 insertions(+), 45 deletions(-) diff --git a/NEWS b/NEWS index f1cf2bb3a..ec13e9b37 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,7 @@ v1.1 (Dec xy, 2005) - Optional loading splashscreen - Reworked compact stylesheet support - Interactive user preferences editor + - Per-feed content filters v1.0.7 (Nov 14, 2005) diff --git a/backend.php b/backend.php index 2bc775bd6..9fe421ffb 100644 --- a/backend.php +++ b/backend.php @@ -990,11 +990,10 @@ } - print " - - -
- Add feed
"; + print "
+  
"; $result = db_query($link, "SELECT id,title,feed_url,substring(last_updated,1,16) as last_updated, @@ -1225,9 +1224,9 @@ array_push($filter_types, $line["description"]); } - print " - - -
"; + print "
+  "; + print_select("fadd_match", "Title", $filter_types); print " "; + print " "; - print"
- Add filter
"; + print ""; $result = db_query($link, "SELECT ttrss_filters.id AS id,reg_exp, @@ -1269,8 +1268,8 @@ print " SelectFilter expression - DescriptionMatch - Feed"; + FeedMatch + Description"; $lnum = 0; @@ -1301,15 +1300,15 @@ print "" . $line["reg_exp"] . ""; - + print "" . - $line["description"] . ""; + $line["feed_title"] . ""; print "" . $line["filter_type_descr"] . ""; print "" . - $line["feed_title"] . ""; + $line["description"] . ""; } else if ($filter_id != $edit_filter_id) { @@ -1319,9 +1318,9 @@ id=\"FICHK-".$line["id"]."\">"; print "".$line["reg_exp"].""; - print "".$line["description"].""; - print "".$line["filter_type_descr"].""; print "".$line["feed_title"].""; + print "".$line["filter_type_descr"].""; + print "".$line["description"].""; } else { @@ -1330,13 +1329,6 @@ print ""; - print ""; - - print ""; - print_select("iedit_match", $line["filter_type_descr"], $filter_types); - print ""; - print ""; print ""; + print ""; + + print ""; + print_select("iedit_match", $line["filter_type_descr"], $filter_types); + print ""; + + print ""; print ""; } @@ -1440,12 +1439,11 @@ } } - print " - "; + print "
+  "; - print"
-
- Add label
"; + print""; $result = db_query($link, "SELECT id,sql_exp,description @@ -2028,12 +2026,11 @@ } } - print " - "; + print "
+  "; - print"
-
- Add user
"; + print""; $result = db_query($link, "SELECT id,login,access_level, diff --git a/tt-rss.css b/tt-rss.css index 1a91a5e20..56a63a565 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -391,14 +391,6 @@ input { /* preferences */ -table.prefAddFeed td { - padding : 2px; -} - -table.prefAddFeed input { - width : 250px; -} - table.prefFeedList tr.title td, table.prefFilterList tr.title td, table.headlinesList tr.title td, table.prefLabelList tr.title td, table.prefPrefsList tr.title td {