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

tweak filter preview layout a bit; allow previewing matched articles in a popup

This commit is contained in:
Andrew Dolgov 2015-09-11 13:05:08 +03:00
parent 3857536f70
commit f48f292d2b
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/article.php
View File

@ -41,12 +41,12 @@ class Article extends Handler_Protected {
} else if ($mode == "zoom") { } else if ($mode == "zoom") {
array_push($articles, format_article($id, true, true)); array_push($articles, format_article($id, true, true));
} else if ($mode == "raw") { } else if ($mode == "raw") {
if ($_REQUEST['html']) { if (isset($_REQUEST['html'])) {
header("Content-Type: text/html"); header("Content-Type: text/html");
print '<link rel="stylesheet" type="text/css" href="css/tt-rss.css"/>'; print '<link rel="stylesheet" type="text/css" href="css/tt-rss.css"/>';
} }
$article = format_article($id, false); $article = format_article($id, false, isset($_REQUEST["zoom"]));
print $article['content']; print $article['content'];
return; return;
} }

17
classes/pref/filters.php
View File

@ -134,7 +134,7 @@ class Pref_Filters extends Handler_Protected {
if (count($rc) > 0) { 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) { foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
$line = $p->hook_query_headlines($line, 100); $line = $p->hook_query_headlines($line, 100);
@ -142,10 +142,12 @@ class Pref_Filters extends Handler_Protected {
$content_preview = $line["content_preview"]; $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\" $id = $line['id'];
checked=\"1\" disabled=\"1\" type=\"checkbox\"></td><td>"; $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) { foreach ($filter['rules'] as $rule) {
$reg_exp = str_replace('/', '\/', $rule["reg_exp"]); $reg_exp = str_replace('/', '\/', $rule["reg_exp"]);
@ -157,10 +159,9 @@ class Pref_Filters extends Handler_Protected {
"<span class=\"highlight\">$1</span>", $content_preview); "<span class=\"highlight\">$1</span>", $content_preview);
} }
$tmp .= "<strong>" . $line["title"] . "</strong>"; $tmp .= "<strong>" . $line["title"] . "</strong><br/>";
$tmp .= "<div class='small' style='float : right'>" . $feed_title . "</div>"; $tmp .= $line['feed_title'] . ", " . mb_substr($line["date_entered"], 0, 16);
$tmp .= "<div class=\"insensitive\">" . $content_preview . "</div>"; $tmp .= "<div class='insensitive'>" . $content_preview . "</div>";
$tmp .= " " . mb_substr($line["date_entered"], 0, 16);
$tmp .= "</td></tr>"; $tmp .= "</td></tr>";
array_push($rv, $tmp); array_push($rv, $tmp);

7
js/functions.js
View File

@ -2053,3 +2053,10 @@ function getSelectionText() {
return text.stripTags(); return text.stripTags();
} }
function openArticlePopup(id) {
window.open("backend.php?op=article&method=view&mode=raw&html=1&zoom=1&id=" + id +
"&csrf_token=" + getInitParam("csrf_token"),
"ttrss_article_popup",
"height=900,width=900,resizable=yes,status=no,location=no,menubar=no,directories=no,scrollbars=yes,toolbar=no");
}