From: Andrew Dolgov <fox@bah.spb.su>
Date: Sat, 19 May 2007 04:41:50 +0000 (+0100)
Subject: layout fixes when categories are disabled
X-Git-Tag: 1.2.11~21
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=c4b0f96c817a5177a0cd467a0576d428ec20ed12;p=tt-rss.git

layout fixes when categories are disabled
---

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index dbc85831..ef9f1362 100644
--- 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 4594326b..ae5ab28e 100644
--- 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;