layout fixes when categories are disabled

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index dbc85831f5b69a3c8d1cc5c8720951b6b2a94322..ef9f1362919e8f66247ad95f3aa9ee61f02f3c44 100644 (file)
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -148,7 +148,7 @@
                        if (get_pref($link, 'ENABLE_FEED_CATS') && ($active_feed_id > 0 || $is_cat)) {
                                print "<option $cat_preselected value=\"this_cat\">$feed_cat_title</option>";
                        } else {
-                               print "<option disabled>".__('This category')."</option>";
+                               //print "<option disabled>".__('This category')."</option>";
                        }
 
                        print "</select></td></tr>"; 

diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 4594326bf37c35cc29035d173b7e8bd887ca803a..ae5ab28eccd794a82e3fc4dcdc88ec2a8c9b8ad7 100644 (file)
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -862,10 +862,13 @@
                                        print "<td width='3%'>&nbsp;</td>";
                                }
 
-                               print "
-                                       <td width='60%'><a href=\"javascript:updateFeedList('title')\">".__('Title')."</a></td>
-                                       <td width='20%' align='right'><a href=\"javascript:updateFeedList('last_article')\">".__('Last&nbsp;Article')."</a></td>
-                                       <td width='20%' align='right'><a href=\"javascript:updateFeedList('last_updated')\">".__('Updated')."</a></td>";
+                               print "<td width='60%'><a href=\"javascript:updateFeedList('title')\">".__('Title')."</a></td>";
+
+                               if ($show_last_article_info) {
+                                       print "<td width='20%' align='right'><a href=\"javascript:updateFeedList('last_article')\">".__('Last&nbsp;Article')."</a></td>";
+                               }
+
+                               print "<td width='20%' align='right'><a href=\"javascript:updateFeedList('last_updated')\">".__('Updated')."</a></td>";
                        }
                        
                        $lnum = 0;