diff options
| -rw-r--r-- | functions.js | 9 | ||||
| -rw-r--r-- | functions.php | 10 | ||||
| -rw-r--r-- | schema/ttrss_schema_mysql.sql | 2 | ||||
| -rw-r--r-- | schema/ttrss_schema_pgsql.sql | 2 | ||||
| -rw-r--r-- | schema/upgrade-1.1.5-1.1.7-mysql.sql | 2 | ||||
| -rw-r--r-- | schema/upgrade-1.1.5-1.1.7-pgsql.sql | 2 | ||||
| -rw-r--r-- | tt-rss.css | 7 |
7 files changed, 33 insertions, 1 deletions
diff --git a/functions.js b/functions.js index d25670c41..8401a0ff3 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 6bcebe598..6de5c9eda 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 1e51df31c..69a96d0b7 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 042e650fd..99120f7d5 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 a7fb99024..39100450b 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 4c7c78f9d..ab7a7df33 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 5cdab4f0c..2a8d70972 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; +} |