diff options
-rw-r--r-- | functions.php | 19 | ||||
-rw-r--r-- | images/new_version.png | bin | 264 -> 625 bytes | |||
-rw-r--r-- | modules/popup-dialog.php | 24 | ||||
-rw-r--r-- | modules/pref-prefs.php | 2 | ||||
-rw-r--r-- | tt-rss.css | 8 | ||||
-rw-r--r-- | tt-rss.js | 4 | ||||
-rw-r--r-- | tt-rss.php | 4 |
7 files changed, 32 insertions, 29 deletions
diff --git a/functions.php b/functions.php index d920498c7..23144f535 100644 --- a/functions.php +++ b/functions.php @@ -3699,7 +3699,7 @@ return array($tmp, $headlines_count, $affected_ids, $tmp_t); } - function check_for_update($link, $brief_fmt = true) { + function check_for_update($link) { $releases_feed = "http://tt-rss.org/releases.rss"; if (!CHECK_FOR_NEW_VERSION || $_SESSION["access_level"] < 10) { @@ -3753,18 +3753,11 @@ } if (version_compare(VERSION, $latest_version) == -1) { - if ($brief_fmt) { - return format_notice("<a href=\"javascript:showBlockElement('milestoneDetails')\"> - New version of Tiny-Tiny RSS ($latest_version) is available (click for details)</a> - <div id=\"milestoneDetails\">$content</div>"); - } else { - return "New version of Tiny-Tiny RSS ($latest_version) is available: - <div class='milestoneDetails'>$content</div> - Visit <a target=\"_blank\" href=\"http://tt-rss.org/\">official site</a> for - download and update information."; - } - - } + return sprintf("New version of Tiny-Tiny RSS (%s) is available:", + $latest_version)."<div class='milestoneDetails'>$content</div>"; + } else { + return false; + } } } diff --git a/images/new_version.png b/images/new_version.png Binary files differindex 769369066..3956089b5 100644 --- a/images/new_version.png +++ b/images/new_version.png 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) { diff --git a/tt-rss.css b/tt-rss.css index 137ea8927..9ecc38801 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -1156,6 +1156,13 @@ div.tagCloudContainer { text-align : center; } +div.errorExplained { + border : 1px solid #99d67a; + background-color : white; + margin : 5px 0px 5px 0px; + padding : 5px; +} + ul.feedErrorsList { height : 300px; overflow : auto; @@ -1728,6 +1735,7 @@ a.feedUpdErrLink { #newVersionIcon { vertical-align : middle; cursor : pointer; + margin-left : 10px; } a.helpLinkPic { @@ -1419,4 +1419,6 @@ function addLabel() { } } - +function visitOfficialSite() { + window.open("http://tt-rss.org/"); +} diff --git a/tt-rss.php b/tt-rss.php index f01723f3d..f56c14310 100644 --- a/tt-rss.php +++ b/tt-rss.php @@ -108,6 +108,7 @@ window.onload = init; <div id="header"> <div class="topLinks"> + <?php if (!SINGLE_USER_MODE) { ?> <?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> | <?php } ?> @@ -123,8 +124,9 @@ window.onload = init; <?php } ?> <img id="newVersionIcon" style="display:none;" onclick="javascript:explainError(2)" - src="images/new_version.png" title="New version is available!" + src="images/new_version.png" title="<?php echo __('New version of Tiny Tiny RSS is available!') ?>" alt="new_version_icon"/> + </div> <img src="<?php echo $theme_image_path ?>images/ttrss_logo.png" alt="Tiny Tiny RSS"/> </div> |