From: Andrew Dolgov <fox@bah.spb.su>
Date: Thu, 28 Sep 2006 12:42:47 +0000 (+0100)
Subject: fix notify box, add notify prompt in viewfeed
X-Git-Tag: 1.2.4~100
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=33b8cab44f908c5f632ea7270e23d1d901eb744b;p=tt-rss.git

fix notify box, add notify prompt in viewfeed
---

diff --git a/feedlist.js b/feedlist.js
index 1a83a454..6b8c189f 100644
--- 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 6d4aaf49..6d225723 100644
--- 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 b985867b..8a893b77 100644
--- 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 66dc8778..9cc3aa39 100644
--- 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("");
 	}
 }