headlines: align feed title in vfeed-mode to the right

diff --git a/backend.php b/backend.php
index 6129a17c6daf7da4d91eba207e6226c217534b43..194d8ccd601852ae0ee09c5a3597da821e460c75 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -959,14 +959,20 @@
                                $feed_kind = "Labels";
                        }
 
+                       if (!$vfeed_query_part) {
+                               $content_query_part = "content as content_preview,";
+                       } else {
+                               $content_query_part = "";
+                       }
+
                        $result = db_query($link, "SELECT 
                                        id,title,
                                        SUBSTRING(updated,1,16) as updated,
                                        unread,feed_id,marked,link,last_read,
                                        SUBSTRING(last_read,1,19) as last_read_noms,
                                        $vfeed_query_part
-                                       SUBSTRING(updated,1,19) as updated_noms,
-                                       content as content_preview
+                                       $content_query_part
+                                       SUBSTRING(updated,1,19) as updated_noms
                                FROM
                                        ttrss_entries,ttrss_user_entries
                                WHERE
@@ -989,8 +995,8 @@
                                marked,link,last_read,
                                SUBSTRING(last_read,1,19) as last_read_noms,
                                $vfeed_query_part
-                               SUBSTRING(updated,1,19) as updated_noms,
-                               content
+                               $content_query_part
+                               SUBSTRING(updated,1,19) as updated_noms
                                FROM
                                        ttrss_entries,ttrss_user_entries,ttrss_tags
                                WHERE

diff --git a/tt-rss.css b/tt-rss.css
index 1788515a41dead9dfab5a9794305642816f283af..59ff1aea3b3fc9032e962627ca1234eeee32dbea 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -710,17 +710,22 @@ span.contentPreview:hover {
        color : #5050aa;
 }
 
-td.hlMarkedPic {
+table.headlinesList td.hlMarkedPic {
        width : 25px;
        text-align : center;
 }
 
+table.headlinesList td.hlfeed {
+       text-align : right;
+       font-size : small;
+}
+
 td.hlSelectRow, td.hlUpdatePic {
        width : 25px;
        text-align : center;
 }
 
-td.hlUpdated {
+table.headlinesList td.hlUpdated {
        font-size : small;
        color : gray;
        text-align : right;