From 73495fd16f6e89c5eeefb6a9c2fdc11b14fa57d4 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.spb.su>
Date: Fri, 23 Jan 2009 06:53:31 +0100
Subject: tweak new version notification stuff

---
 modules/popup-dialog.php | 24 ++++++++++++------------
 modules/pref-prefs.php   |  2 --
 2 files changed, 12 insertions(+), 14 deletions(-)

(limited to 'modules')

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index d6ed68855..465d3bcd9 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -8,10 +8,10 @@
 			print "<div id=\"infoBoxTitle\">".__('Notice')."</div>";
 			print "<div class=\"infoBoxContents\">";
 
+			print "<div class=\"errorExplained\">";
+
 			if ($param == 1) {
-				print __("Update daemon is enabled in configuration, but daemon
-					process is not running, which prevents all feeds from updating. Please
-					start the daemon process or contact instance owner.");
+				print __("Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner.");
 
 				$stamp = (int)read_stampfile("update_daemon.stamp");
 
@@ -20,11 +20,10 @@
 			}
 
 			if ($param == 2) {
-				$msg = check_for_update($link, false);
+				$msg = check_for_update($link);
 
 				if (!$msg) {
-					print __("You are running the latest version of Tiny Tiny RSS. The
-						fact that you are seeing this dialog is probably a bug.");
+					print __("You are running the latest version of Tiny Tiny RSS. The fact that you are seeing this dialog is probably a bug.");
 				} else {
 					print $msg;
 				}
@@ -32,10 +31,7 @@
 			}
 
 			if ($param == 3) {
-				print __("TT-RSS has detected that update daemon is taking too long to
-					perform a feed update. This could indicate a problem like crash
-					or a hang. Please check the daemon process or contact instance
-					owner.");
+				print __("Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner.");
 
 				$stamp = (int)read_stampfile("update_daemon.stamp");
 
@@ -44,14 +40,18 @@
 			}
 
 			print "</div>";
-
+			
 			print "<div align='center'>";
 
+			print "<input class=\"button\"
+				type=\"submit\" onclick=\"return visitOfficialSite()\" 
+				value=\"".__('Visit official site')."\"> ";
+
 			print "<input class=\"button\"
 				type=\"submit\" onclick=\"return closeInfoBox()\" 
 				value=\"".__('Close this window')."\">";
 
-			print "</div>";
+			print "</div></div>";
 
 			return;
 		}
diff --git a/modules/pref-prefs.php b/modules/pref-prefs.php
index 80a63cb9e..a09c7f20c 100644
--- a/modules/pref-prefs.php
+++ b/modules/pref-prefs.php
@@ -186,8 +186,6 @@
 
 		} else {
 
-//			print check_for_update($link);
-
 			set_pref($link, "_PREFS_ACTIVE_TAB", "genConfig");
 
 			if (!SINGLE_USER_MODE) {
-- 
cgit v1.2.3