summaryrefslogtreecommitdiff
path: root/tt-rss.php
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2005-12-13 06:52:32 +0100
committerAndrew Dolgov <[email protected]>2005-12-13 06:52:32 +0100
commit386cbf27aa42980ad46322ba59f0ae550a2b9ac7 (patch)
tree86367cdcd9b26193084e9423582d1fda5d7635ef /tt-rss.php
parent6a1ad084069c86359ab6e10d2b9ee5e87422c7d0 (diff)
combined article display mode (option COMBINED_DISPLAY_MODE), remove xml feed output
Diffstat (limited to 'tt-rss.php')
-rw-r--r--tt-rss.php15
1 files changed, 13 insertions, 2 deletions
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">