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

per-feed filters tweaks, prefAddFeed table removed, update NEWS

This commit is contained in:
Andrew Dolgov 2005-11-21 14:59:32 +01:00
parent ead60402dd
commit 2c7070b519
3 changed files with 35 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -10,6 +10,7 @@ v1.1 (Dec xy, 2005)
- Optional loading splashscreen - Optional loading splashscreen
- Reworked compact stylesheet support - Reworked compact stylesheet support
- Interactive user preferences editor - Interactive user preferences editor
- Per-feed content filters
v1.0.7 (Nov 14, 2005) v1.0.7 (Nov 14, 2005)

71
backend.php
View File

@ -990,11 +990,10 @@
} }
print "<table class=\"prefAddFeed\"><tr> print "<div class=\"prefGenericAddBox\">
<td><input id=\"fadd_link\"></td> <input id=\"fadd_link\" size=\"40\">&nbsp;<input
<td colspan=\"4\" align=\"right\"> type=\"submit\" class=\"button\"
<a class=\"button\" href=\"javascript:addFeed()\">Add feed</a></td></tr> onclick=\"javascript:addFeed()\" value=\"Add feed\"></div>";
</table>";
$result = db_query($link, "SELECT $result = db_query($link, "SELECT
id,title,feed_url,substring(last_updated,1,16) as last_updated, id,title,feed_url,substring(last_updated,1,16) as last_updated,
@ -1225,9 +1224,9 @@
array_push($filter_types, $line["description"]); array_push($filter_types, $line["description"]);
} }
print "<table class=\"prefAddFeed\"><tr> print "<div class=\"prefGenericAddBox\">
<td><input id=\"fadd_regexp\"></td> <input id=\"fadd_regexp\" size=\"40\">&nbsp;";
<td>";
print_select("fadd_match", "Title", $filter_types); print_select("fadd_match", "Title", $filter_types);
print "&nbsp;<select id=\"fadd_feed\">"; print "&nbsp;<select id=\"fadd_feed\">";
@ -1245,11 +1244,11 @@
printf("<option id='%d'>%s</option>", $line["id"], $line["title"]); printf("<option id='%d'>%s</option>", $line["id"], $line["title"]);
} }
print "</select>"; print "</select>&nbsp;";
print"</td><td colspan=\"4\" align=\"right\"> print "<input type=\"submit\"
<a class=\"button\" href=\"javascript:addFilter()\">Add filter</a></td></tr> class=\"button\" onclick=\"javascript:addFilter()\"
</table>"; value=\"Add filter\">";
$result = db_query($link, "SELECT $result = db_query($link, "SELECT
ttrss_filters.id AS id,reg_exp, ttrss_filters.id AS id,reg_exp,
@ -1269,8 +1268,8 @@
print "<tr class=\"title\"> print "<tr class=\"title\">
<td width=\"5%\">Select</td><td width=\"30%\">Filter expression</td> <td width=\"5%\">Select</td><td width=\"30%\">Filter expression</td>
<td width=\"30%\">Description</td><td width=\"10%\">Match</td> <td width=\"30%\">Feed</td><td width=\"10%\">Match</td>
<td width=\"30%\">Feed</td></tr>"; <td width=\"30%\">Description</td></tr>";
$lnum = 0; $lnum = 0;
@ -1301,15 +1300,15 @@
print "<td><a href=\"javascript:editFilter($filter_id);\">" . print "<td><a href=\"javascript:editFilter($filter_id);\">" .
$line["reg_exp"] . "</td>"; $line["reg_exp"] . "</td>";
print "<td><a href=\"javascript:editFilter($filter_id);\">" . print "<td><a href=\"javascript:editFilter($filter_id);\">" .
$line["description"] . "</td>"; $line["feed_title"] . "</td>";
print "<td><a href=\"javascript:editFilter($filter_id);\">" . print "<td><a href=\"javascript:editFilter($filter_id);\">" .
$line["filter_type_descr"] . "</td>"; $line["filter_type_descr"] . "</td>";
print "<td><a href=\"javascript:editFilter($filter_id);\">" . print "<td><a href=\"javascript:editFilter($filter_id);\">" .
$line["feed_title"] . "</td>"; $line["description"] . "</td>";
} else if ($filter_id != $edit_filter_id) { } else if ($filter_id != $edit_filter_id) {
@ -1319,9 +1318,9 @@
id=\"FICHK-".$line["id"]."\"></td>"; id=\"FICHK-".$line["id"]."\"></td>";
print "<td>".$line["reg_exp"]."</td>"; print "<td>".$line["reg_exp"]."</td>";
print "<td>".$line["description"]."</td>";
print "<td>".$line["filter_type_descr"]."</td>";
print "<td>".$line["feed_title"]."</td>"; print "<td>".$line["feed_title"]."</td>";
print "<td>".$line["filter_type_descr"]."</td>";
print "<td>".$line["description"]."</td>";
} else { } else {
@ -1330,13 +1329,6 @@
print "<td><input id=\"iedit_regexp\" value=\"".$line["reg_exp"]. print "<td><input id=\"iedit_regexp\" value=\"".$line["reg_exp"].
"\"></td>"; "\"></td>";
print "<td><input id=\"iedit_descr\" value=\"".$line["description"].
"\"></td>";
print "<td>";
print_select("iedit_match", $line["filter_type_descr"], $filter_types);
print "</td>";
print "<td>"; print "<td>";
print "<select id=\"iedit_feed\">"; print "<select id=\"iedit_feed\">";
@ -1360,7 +1352,14 @@
$tmp_line["id"], $tmp_line["title"]); $tmp_line["id"], $tmp_line["title"]);
} }
print "</select>"; print "</select></td>";
print "<td>";
print_select("iedit_match", $line["filter_type_descr"], $filter_types);
print "</td>";
print "<td><input id=\"iedit_descr\" value=\"".$line["description"].
"\"></td>";
print "</td>"; print "</td>";
} }
@ -1440,12 +1439,11 @@
} }
} }
print "<table class=\"prefAddFeed\"><tr> print "<div class=\"prefGenericAddBox\">
<td><input id=\"ladd_expr\"></td>"; <input size=\"40\" id=\"ladd_expr\">&nbsp;";
print"<td colspan=\"4\" align=\"right\"> print"<input type=\"submit\" class=\"button\"
<a class=\"button\" href=\"javascript:addLabel()\">Add label</a></td></tr> onclick=\"javascript:addLabel()\" value=\"Add label\"></div>";
</table>";
$result = db_query($link, "SELECT $result = db_query($link, "SELECT
id,sql_exp,description id,sql_exp,description
@ -2028,12 +2026,11 @@
} }
} }
print "<table class=\"prefAddFeed\"><tr> print "<div class=\"prefGenericAddBox\">
<td><input id=\"uadd_box\"></td>"; <input id=\"uadd_box\" size=\"40\">&nbsp;";
print"<td colspan=\"4\" align=\"right\"> print"<input type=\"submit\" class=\"button\"
<a class=\"button\" href=\"javascript:addUser()\">Add user</a></td></tr> onclick=\"javascript:addUser()\" value=\"Add user\"></div>";
</table>";
$result = db_query($link, "SELECT $result = db_query($link, "SELECT
id,login,access_level, id,login,access_level,

8
tt-rss.css
View File

@ -391,14 +391,6 @@ input {
/* preferences */ /* preferences */
table.prefAddFeed td {
padding : 2px;
}
table.prefAddFeed input {
width : 250px;
}
table.prefFeedList tr.title td, table.prefFilterList tr.title td, table.prefFeedList tr.title td, table.prefFilterList tr.title td,
table.headlinesList tr.title td, table.prefLabelList tr.title td, table.headlinesList tr.title td, table.prefLabelList tr.title td,
table.prefPrefsList tr.title td { table.prefPrefsList tr.title td {