remove backend/error msg calls on iframe init, recolor notify error

diff --git a/functions.js b/functions.js
index ef7910c71bece112e769409811b82e430b6ceeff..3b5e64f7057440d61560779080049c461b81b5b9 100644 (file)
--- a/functions.js
+++ b/functions.js
@@ -111,8 +111,8 @@ function notify_real(msg, doc, no_hide, is_err) {
        }
 
        if (is_err) {
-               n.style.backgroundColor = "#ffaaaa";
-               n.style.color = "white";
+               n.style.backgroundColor = "#ffcccc";
+               n.style.color = "black";
                n.style.borderColor = "#ff0000";
        } else {
                n.style.backgroundColor = "#fff7d5";

diff --git a/tt-rss.js b/tt-rss.js
index 3faf59d4f6c4bbaf5aa42fc325799f78206b3c5b..528a0000bde1cdb31ad1464dcf77aff57c22f7a0 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -441,6 +441,9 @@ function init_second_stage() {
 
                // FIXME should be callled after window resize
 
+               var h = document.getElementById("headlines");
+               var c = document.getElementById("content");
+
                if (navigator.userAgent.match("Opera")) {
                        resize_feeds_frame();
 

diff --git a/tt-rss.php b/tt-rss.php
index c4879ff7ac584f0dd0c9c0cefa3697eaface521f..01f7ca5baf358482c90e00ef88c45a6ab065fc54 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -135,8 +135,7 @@ window.onload = init;
                <tr><td height="100%" width="100%" valign="top">
 
                <iframe frameborder="0" 
-                       src="backend.php?op=error&msg=Loading,%20please wait..."
-                       id="feeds-frame" name="feeds-frame" class="feedsFrame"> </iframe>
+                       id="feeds-frame" name="feeds-frame" class="feedsFrame"></iframe>
 
                </td></tr></table>
 
@@ -251,22 +250,19 @@ window.onload = init;
 <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>
+                       id="headlines-frame" class="headlinesFrame"></iframe>
        </td>
 </tr>
 <? } else { ?>
 <tr>
        <td id="headlines" class="headlines" valign="top">
                <iframe frameborder="0" name="headlines-frame" 
-                       id="headlines-frame" class="headlinesFrame" 
-                               src="backend.php?op=error&msg=No%20feed%20selected."></iframe>
+                       id="headlines-frame" class="headlinesFrame"></iframe>
        </td>
 </tr><tr>
        <td class="content" id="content" valign="top">
                <iframe frameborder="0" name="content-frame" 
-                       id="content-frame" class="contentFrame"
-                       src="backend.php?op=error&msg=No%20article%20selected."> </iframe>
+                       id="content-frame" class="contentFrame"> </iframe>
        </td>
 </tr>
 <? } ?>