content preview in headlines list, option SHOW_CONTENT_PREVIEW

This commit is contained in:
Andrew Dolgov 2005-11-27 16:17:49 +01:00
parent 1572afe508
commit 591c396df4
4 changed files with 22 additions and 24 deletions

View file

@ -964,7 +964,8 @@
unread,feed_id,marked,link,last_read, unread,feed_id,marked,link,last_read,
SUBSTRING(last_read,1,19) as last_read_noms, SUBSTRING(last_read,1,19) as last_read_noms,
$vfeed_query_part $vfeed_query_part
SUBSTRING(updated,1,19) as updated_noms SUBSTRING(updated,1,19) as updated_noms,
SUBSTRING(content,1,101) as content_preview
FROM FROM
ttrss_entries,ttrss_user_entries ttrss_entries,ttrss_user_entries
WHERE WHERE
@ -987,7 +988,8 @@
marked,link,last_read, marked,link,last_read,
SUBSTRING(last_read,1,19) as last_read_noms, SUBSTRING(last_read,1,19) as last_read_noms,
$vfeed_query_part $vfeed_query_part
SUBSTRING(updated,1,19) as updated_noms SUBSTRING(updated,1,19) as updated_noms,
SUBSTRING(content,1,101) as content_preview
FROM FROM
ttrss_entries,ttrss_user_entries,ttrss_tags ttrss_entries,ttrss_user_entries,ttrss_tags
WHERE WHERE
@ -1019,24 +1021,6 @@
$id = $line["id"]; $id = $line["id"];
$feed_id = $line["feed_id"]; $feed_id = $line["feed_id"];
// printf("L %d (%s) &gt; U %d (%s) = %d<br>",
// strtotime($line["last_read_noms"]), $line["last_read_noms"],
// strtotime($line["updated"]), $line["updated"],
// strtotime($line["last_read"]) >= strtotime($line["updated"]));
/* if ($line["last_read"] != "" && $line["updated"] != "" &&
strtotime($line["last_read_noms"]) < strtotime($line["updated_noms"])) {
$update_pic = "<img id='FUPDPIC-$id' src=\"images/updated.png\"
alt=\"Updated\">";
} else {
$update_pic = "<img id='FUPDPIC-$id' src=\"images/blank_icon.gif\"
alt=\"Updated\">";
} */
if ($line["last_read"] == "" && if ($line["last_read"] == "" &&
($line["unread"] != "t" && $line["unread"] != "1")) { ($line["unread"] != "t" && $line["unread"] != "1")) {
@ -1075,15 +1059,21 @@
print "<td valign='center' align='center'>$marked_pic</td>"; print "<td valign='center' align='center'>$marked_pic</td>";
print "<td width='20%'> print "<td width='15%'>
<a href=\"javascript:view($id,$feed_id);\">".$line["updated"]."</a></td>"; <a href=\"javascript:view($id,$feed_id);\">".$line["updated"]."</a></td>";
if ($line["feed_title"]) { if ($line["feed_title"]) {
print "<td width='55%'>$content_link</td>"; print "<td width='65%'>$content_link</td>";
print "<td width='20%'> print "<td width='20%'>
<a href='javascript:viewfeed($feed_id)'>".$line["feed_title"]."</a></td>"; <a href='javascript:viewfeed($feed_id)'>".$line["feed_title"]."</a></td>";
} else { } else {
print "<td width='75%'>$content_link</td>"; print "<td width='85%'>$content_link";
if (get_pref($link, 'SHOW_CONTENT_PREVIEW')) {
$content_preview = truncate_string(strip_tags($line["content_preview"]),
100);
print "<span class=\"contentPreview\"> - $content_preview</span>";
}
print "</td>";
} }
print "</tr>"; print "</tr>";

View file

@ -198,6 +198,7 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_FEED_CATS', 1, 'false', 'Enable feed categories',2); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_FEED_CATS', 1, 'false', 'Enable feed categories',2);
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('SHOW_CONTENT_PREVIEW', 1, 'true', 'Show content preview in headlines list',2);
create table ttrss_user_prefs ( create table ttrss_user_prefs (
owner_uid integer not null, owner_uid integer not null,

View file

@ -180,6 +180,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_FEED_CATS', 1, 'false', 'Enable feed categories',2); insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('ENABLE_FEED_CATS', 1, 'false', 'Enable feed categories',2);
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('SHOW_CONTENT_PREVIEW', 1, 'true', 'Show content preview in headlines list',2);
create table ttrss_user_prefs ( create table ttrss_user_prefs (
owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE, owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
pref_name varchar(250) not null references ttrss_prefs(pref_name) ON DELETE CASCADE, pref_name varchar(250) not null references ttrss_prefs(pref_name) ON DELETE CASCADE,

View file

@ -700,3 +700,8 @@ table.headlinesSubToolbar td.headlineTitle {
text-align : right; text-align : right;
} }
span.contentPreview {
font-size : x-small;
color : gray;
font-weight : normal;
}