From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Tue, 6 Jun 2006 06:51:00 +0000 (+0100)
Subject: optionally show last update time in feedlist (EXTENDED_FEEDLIST) (closes #55)
X-Git-Tag: 1.2.0~13
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=78d5212c0a3225b6fae106fee13e22c5b3e8fb46;p=tt-rss.git

optionally show last update time in feedlist (EXTENDED_FEEDLIST) (closes #55)
---

diff --git a/functions.js b/functions.js
index d25670c4..8401a0ff 100644
--- a/functions.js
+++ b/functions.js
@@ -510,6 +510,7 @@ function parse_counters(reply, scheduled_call) {
 			var feedr = f_document.getElementById("FEEDR-" + id);
 			var feed_img = f_document.getElementById("FIMG-" + id);
 			var feedlink = f_document.getElementById("FEEDL-" + id);
+			var feedupd = f_document.getElementById("FLUPD-" + id);
 
 			if (updated && feedlink) {
 				if (error) {
@@ -519,6 +520,14 @@ function parse_counters(reply, scheduled_call) {
 				}
 			}
 
+			if (updated && feedupd) {
+				if (error) {
+					feedupd.innerHTML = updated + " (Error)";
+				} else {
+					feedupd.innerHTML = updated;
+				}
+			}
+
 			if (feedctr && feedu && feedr) {
 
 				if (feedu.innerHTML != ctr && id == getActiveFeedId() && scheduled_call) {
diff --git a/functions.php b/functions.php
index 6bcebe59..6de5c9ed 100644
--- a/functions.php
+++ b/functions.php
@@ -737,8 +737,11 @@
 			$rtl_tag = "dir=\"ltr\"";
 		}
 
+		$error_notify_msg = "";
+		
 		if ($last_error) {
 			$link_title = "Error: $last_error ($last_updated)";
+			$error_notify_msg = "(Error)";
 		} else if ($last_updated) {
 			$link_title = "Updated: $last_updated";
 		}
@@ -760,7 +763,12 @@
 
 		print " <span $rtl_tag $fctr_class id=\"FEEDCTR-$feed_id\">
 			 (<span id=\"FEEDU-$feed_id\">$unread</span>)</span>";
-		
+
+		if (get_pref($link, "EXTENDED_FEEDLIST")) {		 	 
+			print "<div class=\"feedExtInfo\">
+				<span id=\"FLUPD-$feed_id\">$last_updated $error_notify_msg</span></div>";
+		}
+		 	 
 		print "</li>";
 
 	}
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 1e51df31..69a96d0b 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -249,6 +249,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('FEEDS_SORT_BY_UNREAD', 1, 'false', 'Sort feeds by unread articles count',2);
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('EXTENDED_FEEDLIST', 1, 'false', 'Show additional information in feedlist',2);
+
 create table ttrss_user_prefs (
    owner_uid integer not null,
    pref_name varchar(250),
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 042e650f..99120f7d 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -229,6 +229,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('FEEDS_SORT_BY_UNREAD', 1, 'false', 'Sort feeds by unread articles count',2);
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('EXTENDED_FEEDLIST', 1, 'false', 'Show additional information in feedlist',2);
+
 create table ttrss_user_prefs (
 	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,
diff --git a/schema/upgrade-1.1.5-1.1.7-mysql.sql b/schema/upgrade-1.1.5-1.1.7-mysql.sql
index a7fb9902..39100450 100644
--- a/schema/upgrade-1.1.5-1.1.7-mysql.sql
+++ b/schema/upgrade-1.1.5-1.1.7-mysql.sql
@@ -5,6 +5,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('FEEDS_SORT_BY_UNREAD', 1, 'false', 'Sort feeds by unread articles count',2);
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('EXTENDED_FEEDLIST', 1, 'false', 'Show additional information in feedlist',2);
+
 insert into ttrss_filter_actions (id,name,description) values (3, 'mark', 
 	'Set starred');
 
diff --git a/schema/upgrade-1.1.5-1.1.7-pgsql.sql b/schema/upgrade-1.1.5-1.1.7-pgsql.sql
index 4c7c78f9..ab7a7df3 100644
--- a/schema/upgrade-1.1.5-1.1.7-pgsql.sql
+++ b/schema/upgrade-1.1.5-1.1.7-pgsql.sql
@@ -7,6 +7,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('FEEDS_SORT_BY_UNREAD', 1, 'false', 'Sort feeds by unread articles count',2);
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('EXTENDED_FEEDLIST', 1, 'false', 'Show additional information in feedlist',2);
+
 insert into ttrss_filter_actions (id,name,description) values (3, 'mark', 
 	'Set starred');
 
diff --git a/tt-rss.css b/tt-rss.css
index 5cdab4f0..2a8d7097 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1112,3 +1112,10 @@ form {
 #main_toolbar_form {
 	display : inline;
 }
+
+div.feedExtInfo {
+	margin-left : 2em;
+	font-size : 7pt;
+	color : gray;
+	font-weight : normal;
+}