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

display article labels in headlines buffer

This commit is contained in:
Andrew Dolgov 2009-01-18 14:54:40 +01:00
parent 814bff6649
commit e2549229e1
6 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
functions.php
View File

@ -1836,13 +1836,13 @@
function initialize_user($link, $uid) {
db_query($link, "INSERT INTO ttrss_labels2 (owner_uid, caption)
/* db_query($link, "INSERT INTO ttrss_labels2 (owner_uid, caption)
VALUES ('$uid', 'All Articles')");
db_query($link, "INSERT INTO ttrss_filters
(owner_uid, feed_id, filter_type, reg_exp, enabled,
action_id, action_param, filter_param)
VALUES ('$uid', NULL, 1, '.', true, 7, 'All Articles', 'before')");
VALUES ('$uid', NULL, 1, '.', true, 7, 'All Articles', 'before')"); */
db_query($link, "insert into ttrss_feeds (owner_uid,title,feed_url)
values ('$uid', 'Tiny Tiny RSS: New Releases',
@ -5001,6 +5001,15 @@
$id = $line["id"];
$feed_id = $line["feed_id"];
$labels = get_article_labels($link, $id);
$labels_str = "";
foreach ($labels as $l) {
$labels_str .= "<span
class='hlLabelRef'>".
$l[1]."</span>";
}
if (count($topmost_article_ids) < 5) {
array_push($topmost_article_ids, $id);
}
@ -5162,6 +5171,8 @@
print "</a>";
print $labels_str;
# <a href=\"javascript:viewfeed($feed_id, '', false)\">".
# $line["feed_title"]."</a>
@ -5267,6 +5278,8 @@
}
}
print $labels_str;
print "</span></div>";
if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW')) {
@ -6014,7 +6027,8 @@
FROM ttrss_labels2, ttrss_user_labels2
WHERE id = label_id
AND article_id = '$id'
AND owner_uid = ".$_SESSION["uid"]);
AND owner_uid = ".$_SESSION["uid"] . "
ORDER BY caption");
$rv = array();

12
modules/backend-rpc.php
View File

@ -457,17 +457,7 @@
}
}
print "<rpc-reply><counters>";
if ($label) {
getGlobalCounters($link);
getLabelCounters($link);
if (get_pref($link, 'ENABLE_FEED_CATS')) {
getCategoryCounters($link);
}
}
print "</counters></rpc-reply>";
print "<rpc-reply>OK</rpc-reply>";
return;
}

12
schema/ttrss_schema_mysql.sql
View File

@ -400,12 +400,12 @@ create table ttrss_labels2 (id integer not null primary key auto_increment,
foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE
) TYPE=InnoDB;
INSERT INTO ttrss_labels2 (owner_uid, caption) VALUES (1, 'All Articles');
INSERT INTO ttrss_filters (owner_uid, feed_id, filter_type, reg_exp, enabled,
action_id, action_param, filter_param)
VALUES (1, NULL, 1, '.', true, 7, 'All Articles', 'before');
--INSERT INTO ttrss_labels2 (owner_uid, caption) VALUES (1, 'All Articles');
--
--INSERT INTO ttrss_filters (owner_uid, feed_id, filter_type, reg_exp, enabled,
-- action_id, action_param, filter_param)
-- VALUES (1, NULL, 1, '.', true, 7, 'All Articles', 'before');
--
create table ttrss_user_labels2 (label_id integer not null,
article_id integer not null,
foreign key (label_id) references ttrss_labels2(id) ON DELETE CASCADE,

10
schema/ttrss_schema_pgsql.sql
View File

@ -368,11 +368,11 @@ create table ttrss_labels2 (id serial not null primary key,
caption varchar(250) not null
);
INSERT INTO ttrss_labels2 (owner_uid, caption) VALUES (1, 'All Articles');
INSERT INTO ttrss_filters (owner_uid, feed_id, filter_type, reg_exp, enabled,
action_id, action_param, filter_param)
VALUES (1, NULL, 1, '.', true, 7, 'All Articles', 'before');
--INSERT INTO ttrss_labels2 (owner_uid, caption) VALUES (1, 'All Articles');
--
--INSERT INTO ttrss_filters (owner_uid, feed_id, filter_type, reg_exp, enabled,
-- action_id, action_param, filter_param)
-- VALUES (1, NULL, 1, '.', true, 7, 'All Articles', 'before');
create table ttrss_user_labels2 (
label_id integer not null references ttrss_labels2(id) ON DELETE CASCADE,

10
tt-rss.css
View File

@ -866,6 +866,16 @@ table.headlinesList {
width : 100%;
}
table.headlinesList span.hlLabelRef, div.cdmHeader span.hlLabelRef {
background-color : #fff7d5;
font-height : 8px;
color : #063064;
font-weight : normal;
margin : 0px 3px 0px 3px;
padding : 0px 4px 0px 4px;
white-space: nowrap;
}
table.headlinesList td.hlFeedIcon {
width : 25px;
text-align : center;

2
viewfeed.js
View File

@ -907,7 +907,7 @@ function selectionAssignLabel(id) {
new Ajax.Request(query, {
onComplete: function(transport) {
all_counters_callback2(transport);
viewCurrentFeed();
} });
}