diff options
author | Andrew Dolgov <[email protected]> | 2007-01-27 12:32:59 +0100 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2007-01-27 12:32:59 +0100 |
commit | d9fa39f1d444fbd5a909aabe19dfc50aa8601131 (patch) | |
tree | c9e84bbd32cee9f3cdae05b210f41b451e763ddd | |
parent | ef16ae378238fa868d282da5c4f77d8556534af4 (diff) |
add new version indicator on main chrome
-rw-r--r-- | functions.php | 27 | ||||
-rw-r--r-- | images/new_version.png | bin | 0 -> 262 bytes | |||
-rw-r--r-- | modules/popup-dialog.php | 7 | ||||
-rw-r--r-- | tt-rss.css | 12 | ||||
-rw-r--r-- | tt-rss.js | 11 | ||||
-rw-r--r-- | tt-rss.php | 7 |
6 files changed, 55 insertions, 9 deletions
diff --git a/functions.php b/functions.php index 5f3978ff9..6169f93a8 100644 --- a/functions.php +++ b/functions.php @@ -2133,6 +2133,18 @@ print "<param key=\"daemon_is_running\" value=\"". sprintf("%d", file_is_locked("update_daemon.lock")) . "\"/>"; } + if (CHECK_FOR_NEW_VERSION && $_SESSION["access_level"] >= 10) { + + if ($_SESSION["last_version_check"] + 600 < time()) { + $new_version_details = check_for_update($link); + + print "<param key=\"new_version_available\" value=\"". + sprintf("%d", $new_version_details != ""). "\"/>"; + + $_SESSION["last_version_check"] = time(); + } + } + print "</runtime-info>"; } @@ -2595,7 +2607,7 @@ return array($tmp, $headlines_count); } - function check_for_update($link) { + function check_for_update($link, $brief_fmt = true) { $releases_feed = "http://tt-rss.spb.ru/releases.rss"; if (!CHECK_FOR_NEW_VERSION || $_SESSION["access_level"] < 10) { @@ -2625,9 +2637,16 @@ $content = sanitize_rss($latest_item["description"]); if (version_compare(VERSION, $latest_version) == -1) { - return "<div class=\"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></div>"; + if ($brief_fmt) { + return "<div class=\"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></div>"; + } else { + return "New version of <a target='_new' + href='http://tt-rss.spb.ru/'>Tiny-Tiny RSS</a> ($latest_version) is available: + <div>$content</div>"; + } + } } } diff --git a/images/new_version.png b/images/new_version.png Binary files differnew file mode 100644 index 000000000..370073de1 --- /dev/null +++ b/images/new_version.png diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php index 414e01006..d2b0ff9cf 100644 --- a/modules/popup-dialog.php +++ b/modules/popup-dialog.php @@ -5,7 +5,7 @@ if ($id == "explainError") { - print "<div id=\"infoBoxTitle\">Error message</div>"; + print "<div id=\"infoBoxTitle\">Notice</div>"; print "<div class=\"infoBoxContents\">"; if ($param == 1) { @@ -14,6 +14,11 @@ start the daemon process or contact instance owner."); } + if ($param == 2) { + print check_for_update($link, false); + + } + print "</div>"; print "<div align='center'>"; diff --git a/tt-rss.css b/tt-rss.css index 5cf0ce7f5..5cb6e8947 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -76,7 +76,7 @@ ul.feedCatList { ul.feedCatList li { margin : 0px; - padding : 0px 0px 0px 0px; + padding : 0px 0px 2px 0px; color : black; } @@ -85,6 +85,10 @@ ul.feedList li { font-size : small; } +ul.feedCatList img { + vertical-align : bottom; +} + li.feedUnread, li.errorUnread, li.labelUnread, @@ -1431,4 +1435,8 @@ ul.headlineDropdownMenu ul li:hover { background-color : #f0f0f0; } - +#newVersionIcon { + vertical-align : middle; + cursor : pointer; + display : none; +} @@ -539,6 +539,17 @@ function parse_runtime_info(elem) { debug("RI: " + k + " => " + v); + if (k == "new_version_available") { + var icon = document.getElementById("newVersionIcon"); + if (icon) { + if (v == "1") { + icon.style.display = "inline"; + } else { + icon.style.display = "none"; + } + } + } + if (k == "daemon_is_running" && v != 1) { notify("<span onclick=\"javascript:explainError(1)\">Warning: Update daemon is not runing.</span>", true, true); } diff --git a/tt-rss.php b/tt-rss.php index 57a750c59..dc1da0c3a 100644 --- a/tt-rss.php +++ b/tt-rss.php @@ -102,12 +102,15 @@ window.onload = init; <div id="infoBoxShadow"><div id="infoBox"> </div></div> <div id="header"> + <div style="float : right"> <?php if (!SINGLE_USER_MODE) { ?> - <div style="float : right"> <?php echo _('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> (<a href="logout.php">Logout</a>) - </div> <?php } ?> + <img id="newVersionIcon" onclick="javascript:explainError(2)" + src="images/new_version.png" title="New version is available!" + alt="new_version_icon"> + </div> <img src="<?php echo $theme_image_path ?>images/ttrss_logo.png" alt="Tiny Tiny RSS"/> </div> |