fix notify box, add notify prompt in viewfeed

diff --git a/feedlist.js b/feedlist.js
index 1a83a454cb510949e2649d31d59ec35713990a1c..6b8c189f654cdf73f11310a5384dda726efbb6a4 100644 (file)
--- a/feedlist.js
+++ b/feedlist.js
@@ -94,6 +94,13 @@ function viewfeed(feed, subop, is_cat, subop_param) {
 
                debug(query);
 
+/*             var container = document.getElementById("headlines-frame");
+
+               container.innerHTML = "<div class=\"loadingPrompt\"><img src=\"images/indicator_white.gif\">&nbsp;" +
+                       "Loading, please wait...</div>"; */
+
+               notify("Loading, please wait...", true);
+
                if (xmlhttp_ready(xmlhttp)) {
                        xmlhttp.open("GET", query, true);
                        xmlhttp.onreadystatechange=headlines_callback;
@@ -102,7 +109,6 @@ function viewfeed(feed, subop, is_cat, subop_param) {
                        debug("xmlhttp busy (@feeds)");
                }  
 
-
        } catch (e) {
                exception_error("viewfeed", e);
        }               

diff --git a/tt-rss.css b/tt-rss.css
index 6d4aaf49f2aa82daade9f8df8f1857376e14172a..6d225723515bb9c272bb6c05b4e8fe681bd1e3c6 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -336,13 +336,14 @@ td.notifyBox {
        right : 35%;
        min-width : 30%;
        position : absolute;    
-       -moz-border-radius : 3px;
        font-size : x-small;
        font-weight : bold;
        text-align : center;
+       display : none;
        float : right;
        padding : 3px 20px 3px 20px;
-       display : none;
+       z-index : 999;
+       -moz-border-radius : 3px;
 }
 
 #dispSwitch {
@@ -1224,6 +1225,12 @@ table.loginForm2 .innerLoginCell {
        display : none;
 }
 
+div.loadingPrompt {
+       padding : 1em;
+       text-align : center;
+       font-weight : bold;
+}
+
 /* layout */
 
 #header {

diff --git a/tt-rss.php b/tt-rss.php
index b985867bb7976ffa3c6d57c4802594e92b683d83..8a893b77d9955acf27766ef91240da762f822875 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -77,6 +77,8 @@
 
 <div id="overlay"><div id="overlay_inner">Loading, please wait...</div></div> 
 
+<div id="notify" class="notify"><span id="notify_body">&nbsp;</span></div>
+
 <div id="fatal_error"><div id="fatal_error_inner">
        <h1>Fatal Error</h1>
        <div id="fatal_error_msg">Unknown Error</div>

diff --git a/viewfeed.js b/viewfeed.js
index 66dc877816ee1b2f7d6ec2a43e3e1384e1d0fe97..9cc3aa3908b71283382b6b2b22dce2b9f826bb2d 100644 (file)
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -8,6 +8,7 @@ function headlines_callback() {
                var f = document.getElementById("headlines-frame");
                f.innerHTML = xmlhttp.responseText;
                update_all_counters();
+               notify("");
        }
 }