show entry author in CDM header, tweak actions a little bit

diff --git a/backend.php b/backend.php
index 65d1187a77749681345425198a15e1559209b3d4..0cee573e658bc8574fe35c36bf8b889ded50ea1a 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -469,6 +469,12 @@
                                                100);
                                }
 
+                               $entry_author = $line["author"];
+
+                               if ($entry_author) {
+                                       $entry_author = " - by $entry_author";
+                               }
+
                                if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
                                        
                                        print "<tr class='$class' id='RROW-$id'>";
@@ -481,7 +487,7 @@
                                                </td>";
                
                                        print "<td class='hlMarkedPic'>$marked_pic</td>";
-               
+
                                        if ($line["feed_title"]) {                      
                                                print "<td class='hlContent'>$content_link</td>";
                                                print "<td class='hlFeed'>
@@ -528,6 +534,8 @@
                                                onclick=\"javascript:toggleUnread($id, 0)\"
                                                target=\"new\" href=\"".$line["link"]."\">".$line["title"]."</a>";
 
+                                       print $entry_author;
+
                                        if ($line["feed_title"]) {      
                                                print "&nbsp;(<a href='javascript:viewfeed($feed_id)'>".$line["feed_title"]."</a>)";
                                        }

diff --git a/functions.php b/functions.php
index 3c131b070836e9df513b793d7994aeb524fd20c9..c07f95b22792078522255f2d210badf7dbd97a6e 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -2317,7 +2317,8 @@
                                                SUBSTRING(last_read,1,19) as last_read_noms,
                                                $vfeed_query_part
                                                $content_query_part
-                                               SUBSTRING(updated,1,19) as updated_noms
+                                               SUBSTRING(updated,1,19) as updated_noms,
+                                               author
                                        FROM
                                                ttrss_entries,ttrss_user_entries,ttrss_feeds
                                        WHERE

diff --git a/tt-rss.php b/tt-rss.php
index 5ad9c00450d88be9bc08f06d790e45552a8c1586..5fea8aa495dd62d2a3af41e6cd251a278907a1ec 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -129,8 +129,8 @@ window.onload = init;
                <div style="float : right">
                        <select id="quickMenuChooser" onchange="quickMenuChange()">
                                        <option value="qmcDefault" selected>Actions...</option>
-                                       <option value="qmcPrefs">Preferences</option>
                                        <option value="qmcSearch">Search</option>
+                                       <option value="qmcPrefs">Preferences</option>
                                        <option disabled>--------</option>
                                        <option style="color : #5050aa" disabled>Feed actions:</option>
                                        <option value="qmcAddFeed">&nbsp;&nbsp;Subscribe to feed</option>
@@ -143,7 +143,7 @@ window.onload = init;
                                        <option value="qmcUpdateFeeds">&nbsp;&nbsp;Update</option>
                                        <?php } ?>
                                        <option value="qmcCatchupAll">&nbsp;&nbsp;Mark as read</option>                         
-                                       <option value="qmcShowOnlyUnread">&nbsp;&nbsp;Show only unread</option>
+                                       <option value="qmcShowOnlyUnread">&nbsp;&nbsp;(Un)hide read feeds</option>
                                        <option disabled>--------</option>
                                        <option style="color : #5050aa" disabled>Other actions:</option>                                
                                        <option value="qmcAddFilter">&nbsp;&nbsp;Create filter</option>