From 386cbf27aa42980ad46322ba59f0ae550a2b9ac7 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Tue, 13 Dec 2005 06:52:32 +0100
Subject: combined article display mode (option COMBINED_DISPLAY_MODE), remove
 xml feed output

---
 tt-rss.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'tt-rss.php')

diff --git a/tt-rss.php b/tt-rss.php
index f76614c2e..13c2b17c5 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -209,8 +209,18 @@
 		</td>
 		</tr>
 		</table>
-	</td> 
-</tr><tr>
+	</td>
+</tr>
+<? if (get_pref($link, 'COMBINED_DISPLAY_MODE')) { ?>
+<tr>
+	<td id="headlines" class="headlines2" valign="top">
+		<iframe frameborder="0" name="headlines-frame" 
+			id="headlines-frame" class="headlinesFrame" 
+				src="backend.php?op=error&msg=No%20feed%20selected."></iframe>
+	</td>
+</tr>
+<? } else { ?>
+<tr>
 	<td id="headlines" class="headlines" valign="top">
 		<iframe frameborder="0" name="headlines-frame" 
 			id="headlines-frame" class="headlinesFrame" 
@@ -222,6 +232,7 @@
 			id="content-frame" class="contentFrame"> </iframe>
 	</td>
 </tr>
+<? } ?>
 <? if (get_pref($link, 'DISPLAY_FOOTER')) { ?>
 <tr>
 	<td colspan="2" class="footer">
-- 
cgit v1.2.3