From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Tue, 16 Dec 2008 07:21:35 +0000 (+0100)
Subject: tweak filter list display
X-Git-Tag: 1.2.30~6
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=7f94284bd6c6bfb267f81b8bfdff1df93177a96c;p=tt-rss.git

tweak filter list display
---

diff --git a/modules/pref-filters.php b/modules/pref-filters.php
index d0e12f31..f30d772b 100644
--- a/modules/pref-filters.php
+++ b/modules/pref-filters.php
@@ -316,6 +316,7 @@
 				enabled,
 				inverse,
 				feed_id,
+				filter_param,
 				filter_type,
 				ttrss_filter_actions.description AS action_description,
 				ttrss_feeds.title AS feed_title,
@@ -403,6 +404,22 @@
 				print "<td align='center'><input onclick='toggleSelectPrefRow(this, \"filter\");' 
 					type=\"checkbox\" id=\"FICHK-".$line["id"]."\"></td>";
 
+				$filter_params = array(
+					"before" => __("before"),
+					"after" => __("after"));
+	
+				if ($line["filter_type"] == 5) {
+
+					if (!strtotime($line["reg_exp"])) {
+						$line["reg_exp"] = "<span class=\"filterDateError\">" . 
+							$line["reg_exp"] . "</span>";
+					}
+
+					$line["reg_exp"] = __("Date") . " " . 
+						$filter_params[$line['filter_param']] . " " .
+						$line["reg_exp"];
+				}
+
 				if (!$enabled) {
 					$line["reg_exp"] = "<span class=\"insensitive\">" . 
 						$line["reg_exp"] . " " .  __("(Disabled)")."</span>";
@@ -418,11 +435,6 @@
 
 				$onclick = "onclick='editFilter($filter_id)' title='".__('Click to edit')."'";
 
-				if ($line["filter_type"] == 5 && !strtotime($line["reg_exp"])) {
-					$line["reg_exp"] = "<span class=\"filterDateError\">" . 
-						$line["reg_exp"] . "</span>";
-				}
-
 				$inverse_label = "";
 
 				if ($inverse) {