display last update times in PrefFeedTree (closes #284)

3 files changed, 27 insertions, 3 deletions

diff --git a/PrefFeedTree.js b/PrefFeedTree.js
index 27709cdb7..db59b5081 100644
--- a/PrefFeedTree.js
+++ b/PrefFeedTree.js
@@ -26,6 +26,15 @@ dojo.declare("fox.PrefFeedTree", lib.CheckBoxTree, {
 		if (args.item.icon)
 			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;
 	},
 	onDndDrop: function() {
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index f97c6987a..66902d441 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -55,7 +55,8 @@
 					$cat['items'] = array();
 					$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
 						WHERE cat_id = '".$line['id']."' AND owner_uid = ".$_SESSION["uid"].
 						" ORDER BY order_id, title");
@@ -68,6 +69,8 @@
 						$feed['checkbox'] = false;
 						$feed['error'] = $feed_line['last_error'];
 						$feed['icon'] = getFeedIcon($feed_line['id']);
+						$feed['param'] = make_local_datetime($link, 
+							$feed_line['last_updated'], true);
 
 						array_push($cat['items'], $feed);
 					}
@@ -84,7 +87,8 @@
 				$cat['items'] = array();
 				$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
 					WHERE cat_id IS NULL AND owner_uid = ".$_SESSION["uid"].
 					" ORDER BY order_id, title");
@@ -97,13 +101,16 @@
 					$feed['checkbox'] = false;
 					$feed['error'] = $feed_line['last_error'];
 					$feed['icon'] = getFeedIcon($feed_line['id']);
+					$feed['param'] = make_local_datetime($link, 
+						$feed_line['last_updated'], true);
 
 					array_push($cat['items'], $feed);
 				}
 	
 				array_push($root['items'], $cat);
 			} 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
 					WHERE owner_uid = ".$_SESSION["uid"].
 					" ORDER BY order_id, title");
@@ -116,6 +123,8 @@
 					$feed['checkbox'] = false;
 					$feed['error'] = $feed_line['last_error'];
 					$feed['icon'] = getFeedIcon($feed_line['id']);
+					$feed['param'] = make_local_datetime($link, 
+						$feed_line['last_updated'], true);
 
 					array_push($root['items'], $feed);
 				}
diff --git a/tt-rss.css b/tt-rss.css
index 3137cbd52..928a5e94f 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1592,6 +1592,12 @@ div.fatalError textarea {
 	font-weight : bold;
 }
 
+.feedParam {
+	color : gray;
+	float : right;
+	margin-right : 1em;
+}
+
 .dijitTreeLabel.Disabled, .labelParam.Disabled {
 	color : gray;
 }