changed updated.png

diff --git a/backend.php b/backend.php
index c7b66929e475608874af7f34caccadb42170d894..996e7dfa048e4a0ba5f872abbb18a2f75828ac59 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -261,7 +261,7 @@
                        href=\"javascript:viewfeed($feed, $skip, '');\">Refresh Page</a>";
                print "&nbsp;";
                print "<a class=\"button\" 
-                       href=\"javascript:viewfeed($feed, 0, 'ForceUpdate');\">Update</a>";
+                       href=\"javascript:viewfeed($feed, 0, 'ForceUpdate');\">Update Feed</a>";
                
                print "&nbsp;&nbsp;Mark as read: ";
                

diff --git a/tt-rss.js b/tt-rss.js
index 7417fbb858d72ccf11e2f4ab60fcc2eb6d9276ba..c78a4287d202baebd61251b9e114f8ca88197f3f 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -26,6 +26,10 @@ if (!xmlhttp && typeof XMLHttpRequest!='undefined') {
        xmlhttp = new XMLHttpRequest();
 }
 
+function printLockingError() {
+       notify("Please wait until operation finishes");
+}
+
 function notify_callback() {
        var container = document.getElementById('notify');
        if (xmlhttp.readyState == 4) {
@@ -105,14 +109,14 @@ function updateFeedList(called_from_timer, fetch) {
                xmlhttp.onreadystatechange=feedlist_callback;
                xmlhttp.send(null);
        } else {
-               notify("Please wait until operation finishes.");
+               printLockingError();
        }
 }
 
 function catchupPage(feed) {
 
        if (xmlhttp.readyState != 4 && xmlhttp.readyState != 0) {
-               notify("Please wait until operation finishes.");
+               printLockingError();
                return
        }
 
@@ -153,7 +157,7 @@ function catchupPage(feed) {
 function catchupAllFeeds() {
 
        if (xmlhttp.readyState != 4 && xmlhttp.readyState != 0) {
-               notify("Please wait until operation finishes.");
+               printLockingError();
                return
        }
        var query_str = "backend.php?op=feeds&subop=catchupAll";
@@ -172,7 +176,7 @@ function viewfeed(feed, skip, subop) {
 //     document.getElementById('content').innerHTML=' ';          
 
        if (xmlhttp.readyState != 4 && xmlhttp.readyState != 0) {
-               notify("Please wait until operation finishes.");
+               printLockingError();
                return
        }
 
@@ -188,7 +192,7 @@ function viewfeed(feed, skip, subop) {
 function view(id,feed_id) {
 
        if (xmlhttp.readyState != 4 && xmlhttp.readyState != 0) {
-               notify("Please wait until operation finishes.");
+               printLockingError();
                return
        }
 
@@ -234,7 +238,7 @@ function timeout() {
 function search(feed, sender) {
 
        if (xmlhttp.readyState != 4 && xmlhttp.readyState != 0) {
-               notify("Please wait until operation finishes.");
+               printLockingError();
                return
        }
 

diff --git a/updated.png b/updated.png
index 1cff4c65906e9e86d2947a673e3c6922ba742980..69589240000c8d8b5dfaf17f370ee3835f34a030 100644 (file)
Binary files a/updated.png and b/updated.png differ