diff --git a/functions.php b/functions.php index a8cb09fe4..ac949dd49 100644 --- a/functions.php +++ b/functions.php @@ -5517,15 +5517,15 @@ } } - function rounded_table_start($classname) { + function rounded_table_start($classname, $header = " ") { print ""; - print ""; + print ""; print ""; - print ""; + print ""; print "
   
 $header 
 "; } - function rounded_table_end() { + function rounded_table_end($footer = " ") { print " 
   
 $footer 
"; } diff --git a/help/1.php b/help/1.php index 8c7756330..a2b4566f1 100644 --- a/help/1.php +++ b/help/1.php @@ -1,26 +1,23 @@ -

Labels and SQL Expressions

+

-

Labels are generated by using SQL expressions. The «SQL expression» is added to WHERE clause of view feed query. You can match on ttrss_entries table fields and even use subselect to query additional information. This functionality is considered to be advanced and requires some understanding of SQL.

+

-

Examples

+

-

Match all unread articles:

+

unread = true -

Matches all articles which mention Linux in the title:

+

ttrss_entries.title like '%Linux%' -

Matches all articles for the last week (PostgreSQL):

+

updated > NOW() - INTERVAL '7 days' -

Matches all articles with scores between 100 and 500:

+

score > 100 and score < 500 -

See the database schema here or included in the distribution package for gruesome details. The relevant tables are ttrss_entries and ttrss_user_entries.

- -

Feel free to post more clever examples of labels on Tiny -Tiny RSS forums.

+

diff --git a/help/2.php b/help/2.php index 83cf5d4df..e14e92745 100644 --- a/help/2.php +++ b/help/2.php @@ -1,10 +1,10 @@ -

Content filters

+

-

TT-RSS has support for filtering (or processing) articles. Filtering is done once, when new article is imported to the database from the newsfeed, specified field is matched against regular expression and some action is taken. Regular expression matching is case-insensitive.

+

-

Supported actions: filter (do not import) article, mark article as read, set starred, assign tag(s). Filters can be defined globally and for some specific feed.

+

-

Multiple and inverse matching are supported. All matching filters are considered when article is being imported and all actions executed in sequence. Inverse matching reverts matching result, e.g. filter matching XYZZY in title with inverse flag will match all articles, except those containing string XYZZY in title.

+

-

See this page for additional information on filtering.

+

ContentFilters (wiki) diff --git a/help/3.php b/help/3.php index 8db600965..0644c214a 100644 --- a/help/3.php +++ b/help/3.php @@ -1,65 +1,58 @@ -

Keyboard Shortcuts

+

-

Navigation

+

- - - + + +
j/kMove between feeds
n/pMove between articles
/Show search dialog
j/k
n/p
/
-

Active article actions

+

- - - - - - - + + + +
sToggle starred
shift-SToggle published
uToggle unread
tEdit tags
s
shift-S
u
t
-

Other actions

+

- - - + + +
c fCreate filter
c sCollapse sidebar
?Display this help dialog
c f
c s
?
 -

Feed actions

+

- - - - - - - + + + + + + +
f a(Un)hide read feeds
f sSubscribe to feed
f uUpdate feed
f UUpdate all feeds
f eEdit feed
f cMark feed as read
f CMark all feeds as read
f a
f s
f u
f U
f e
f c
f C
-

Go to...

+

- - - - - + + + + +
g sStarred articles
g fFresh articles
g pPublished articles
g tTag cloud
g PPreferences
g s
g f
g p
g t
g P
-

Press any key to close this window.

+

diff --git a/tt-rss.css b/tt-rss.css index d6ecdd766..32ccfde3b 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -1872,3 +1872,10 @@ div#hotkey_help_overlay table.hho td.bottom, div#hotkey_help_overlay table.hho td.content { background : url("images/shadow_dark.png"); } + +div#hotkey_help_overlay table.hho td.top, +div#hotkey_help_overlay table.hho td.bottom { + text-align : center; + font-size : 11pt; +} + diff --git a/tt-rss.php b/tt-rss.php index 972aebb67..226117ff7 100644 --- a/tt-rss.php +++ b/tt-rss.php @@ -82,7 +82,7 @@ -
+