From f48f292d2b9c3274aeb742c343df1d2f536a6a65 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Fri, 11 Sep 2015 13:05:08 +0300
Subject: tweak filter preview layout a bit; allow previewing matched articles
 in a popup

---
 classes/pref/filters.php | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'classes/pref')

diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 6170f7a08..427ce79a1 100755
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -134,7 +134,7 @@ class Pref_Filters extends Handler_Protected {
 
 				if (count($rc) > 0) {
 
-					$line["content_preview"] = truncate_string(strip_tags($line["content"]), 100, '...');
+					$line["content_preview"] = truncate_string(strip_tags($line["content"]), 200, '&hellip;');
 
 					foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
 						$line = $p->hook_query_headlines($line, 100);
@@ -142,10 +142,12 @@ class Pref_Filters extends Handler_Protected {
 
 					$content_preview = $line["content_preview"];
 
-					if ($line["feed_title"]) $feed_title = "(" . $line["feed_title"] . ")";
+					$tmp = "<tr style='margin-top : 5px'><td width='5%' align='center'><input dojoType=\"dijit.form.CheckBox\"
+						checked=\"1\" disabled=\"1\" type=\"checkbox\"></td>";
 
-					$tmp = "<tr><td width='5%' align='center'><input dojoType=\"dijit.form.CheckBox\"
-						checked=\"1\" disabled=\"1\" type=\"checkbox\"></td><td>";
+					$id = $line['id'];
+					$tmp .= "<td width='5%' align='center'><img style='cursor : pointer' title='".__("Preview article")."'
+						src='images/information.png' onclick='openArticlePopup($id)'></td><td>";
 
 					foreach ($filter['rules'] as $rule) {
 						$reg_exp = str_replace('/', '\/', $rule["reg_exp"]);
@@ -157,10 +159,9 @@ class Pref_Filters extends Handler_Protected {
 							"<span class=\"highlight\">$1</span>", $content_preview);
 					}
 
-					$tmp .= "<strong>" . $line["title"] . "</strong>";
-					$tmp .= "<div class='small' style='float : right'>" . $feed_title . "</div>";
-					$tmp .= "<div class=\"insensitive\">" . $content_preview . "</div>";
-					$tmp .= " " . mb_substr($line["date_entered"], 0, 16);
+					$tmp .= "<strong>" . $line["title"] . "</strong><br/>";
+					$tmp .= $line['feed_title'] . ", " . mb_substr($line["date_entered"], 0, 16);
+					$tmp .= "<div class='insensitive'>" . $content_preview . "</div>";
 					$tmp .= "</td></tr>";
 
 					array_push($rv, $tmp);
-- 
cgit v1.2.3