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

display last update times in PrefFeedTree (closes #284)

This commit is contained in:
Andrew Dolgov 2010-12-28 11:39:12 +03:00
parent 5823f9fbab
commit 1644304f11
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PrefFeedTree.js
View File

@ -26,6 +26,15 @@ dojo.declare("fox.PrefFeedTree", lib.CheckBoxTree, {
if (args.item.icon) if (args.item.icon)
tnode.iconNode.src = args.item.icon[0]; tnode.iconNode.src = args.item.icon[0];
var param = this.model.store.getValue(args.item, 'param');
if (param) {
param = dojo.doc.createElement('span');
param.className = 'feedParam';
param.innerHTML = args.item.param[0];
dojo.place(param, tnode.labelNode, 'after');
}
return tnode; return tnode;
}, },
onDndDrop: function() { onDndDrop: function() {

15
modules/pref-feeds.php
View File

@ -55,7 +55,8 @@
$cat['items'] = array(); $cat['items'] = array();
$cat['type'] = 'category'; $cat['type'] = 'category';
$feed_result = db_query($link, "SELECT id, title, last_error $feed_result = db_query($link, "SELECT id, title, last_error,
".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
FROM ttrss_feeds FROM ttrss_feeds
WHERE cat_id = '".$line['id']."' AND owner_uid = ".$_SESSION["uid"]. WHERE cat_id = '".$line['id']."' AND owner_uid = ".$_SESSION["uid"].
" ORDER BY order_id, title"); " ORDER BY order_id, title");
@ -68,6 +69,8 @@
$feed['checkbox'] = false; $feed['checkbox'] = false;
$feed['error'] = $feed_line['last_error']; $feed['error'] = $feed_line['last_error'];
$feed['icon'] = getFeedIcon($feed_line['id']); $feed['icon'] = getFeedIcon($feed_line['id']);
$feed['param'] = make_local_datetime($link,
$feed_line['last_updated'], true);
array_push($cat['items'], $feed); array_push($cat['items'], $feed);
} }
@ -84,7 +87,8 @@
$cat['items'] = array(); $cat['items'] = array();
$cat['type'] = 'category'; $cat['type'] = 'category';
$feed_result = db_query($link, "SELECT id, title,last_error $feed_result = db_query($link, "SELECT id, title,last_error,
".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
FROM ttrss_feeds FROM ttrss_feeds
WHERE cat_id IS NULL AND owner_uid = ".$_SESSION["uid"]. WHERE cat_id IS NULL AND owner_uid = ".$_SESSION["uid"].
" ORDER BY order_id, title"); " ORDER BY order_id, title");
@ -97,13 +101,16 @@
$feed['checkbox'] = false; $feed['checkbox'] = false;
$feed['error'] = $feed_line['last_error']; $feed['error'] = $feed_line['last_error'];
$feed['icon'] = getFeedIcon($feed_line['id']); $feed['icon'] = getFeedIcon($feed_line['id']);
$feed['param'] = make_local_datetime($link,
$feed_line['last_updated'], true);
array_push($cat['items'], $feed); array_push($cat['items'], $feed);
} }
array_push($root['items'], $cat); array_push($root['items'], $cat);
} else { } else {
$feed_result = db_query($link, "SELECT id, title, last_error $feed_result = db_query($link, "SELECT id, title, last_error,
".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
FROM ttrss_feeds FROM ttrss_feeds
WHERE owner_uid = ".$_SESSION["uid"]. WHERE owner_uid = ".$_SESSION["uid"].
" ORDER BY order_id, title"); " ORDER BY order_id, title");
@ -116,6 +123,8 @@
$feed['checkbox'] = false; $feed['checkbox'] = false;
$feed['error'] = $feed_line['last_error']; $feed['error'] = $feed_line['last_error'];
$feed['icon'] = getFeedIcon($feed_line['id']); $feed['icon'] = getFeedIcon($feed_line['id']);
$feed['param'] = make_local_datetime($link,
$feed_line['last_updated'], true);
array_push($root['items'], $feed); array_push($root['items'], $feed);
} }

6
tt-rss.css
View File

@ -1592,6 +1592,12 @@ div.fatalError textarea {
font-weight : bold; font-weight : bold;
} }
.feedParam {
color : gray;
float : right;
margin-right : 1em;
}
.dijitTreeLabel.Disabled, .labelParam.Disabled { .dijitTreeLabel.Disabled, .labelParam.Disabled {
color : gray; color : gray;
} }