From: Andrew Dolgov <fox@bah.spb.su>
Date: Tue, 29 Nov 2005 19:49:55 +0000 (+0100)
Subject: fix feeds frame display if DISPLAY_FEEDLIST_ACTIONS is enabled
X-Git-Tag: schema_feature_freeze_for_1.1~27
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=f69ea84d78999181ab9896b6d740b5decc5dd988;p=tt-rss.git

fix feeds frame display if DISPLAY_FEEDLIST_ACTIONS is enabled
---

diff --git a/tt-rss.css b/tt-rss.css
index 25ea0c39..ff9efc71 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -340,6 +340,13 @@ iframe {
 	border : 0px solid white;
 }
 
+iframe.feedsFrameWithActions {
+	width : 100%;
+	height : 90%;
+	margin : 0px;
+	padding : 0px;
+}
+
 iframe.feedsFrame {
 	width : 100%;
 	height : 100%;
diff --git a/tt-rss.php b/tt-rss.php
index cb2021fd..20ae6c27 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -89,16 +89,11 @@
 		</td></tr>	
 		<tr><td height="100%" width="100%" valign="top">
 		
-		<!-- <div id="feeds">&nbsp;</div> -->
-
+		<? if (get_pref($link, 'DISPLAY_FEEDLIST_ACTIONS')) { ?>
 
 		<iframe frameborder="0" 
 			src="backend.php?op=error&msg=Loading,%20please wait..."
-			id="feeds-frame" name="feeds-frame" class="feedsFrame"> </iframe>
-
-		</td></tr></table>
-
-		<? if (get_pref($link, 'DISPLAY_FEEDLIST_ACTIONS')) { ?>
+			id="feeds-frame" name="feeds-frame" class="feedsFrameWithActions"> </iframe>
 
 		<div align="center">All feeds: 
 		
@@ -112,9 +107,16 @@
 
 		</div>
 		
+		<? } else { ?>
+
+		<iframe frameborder="0" 
+			src="backend.php?op=error&msg=Loading,%20please wait..."
+			id="feeds-frame" name="feeds-frame" class="feedsFrame"> </iframe>
 
 		<? } ?>
 
+		</td></tr></table>
+
 	</td>
 	<td valign="top" class="headlinesToolbarBox">
 		<table width="100%" cellpadding="0" cellspacing="0">