add new version indicator on main chrome
This commit is contained in:
parent
ef16ae3782
commit
d9fa39f1d4
|
@ -2133,6 +2133,18 @@
|
||||||
print "<param key=\"daemon_is_running\" value=\"".
|
print "<param key=\"daemon_is_running\" value=\"".
|
||||||
sprintf("%d", file_is_locked("update_daemon.lock")) . "\"/>";
|
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>";
|
print "</runtime-info>";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2595,7 +2607,7 @@
|
||||||
return array($tmp, $headlines_count);
|
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";
|
$releases_feed = "http://tt-rss.spb.ru/releases.rss";
|
||||||
|
|
||||||
if (!CHECK_FOR_NEW_VERSION || $_SESSION["access_level"] < 10) {
|
if (!CHECK_FOR_NEW_VERSION || $_SESSION["access_level"] < 10) {
|
||||||
|
@ -2625,9 +2637,16 @@
|
||||||
$content = sanitize_rss($latest_item["description"]);
|
$content = sanitize_rss($latest_item["description"]);
|
||||||
|
|
||||||
if (version_compare(VERSION, $latest_version) == -1) {
|
if (version_compare(VERSION, $latest_version) == -1) {
|
||||||
|
if ($brief_fmt) {
|
||||||
return "<div class=\"notice\"><a href=\"javascript:showBlockElement('milestoneDetails')\">
|
return "<div class=\"notice\"><a href=\"javascript:showBlockElement('milestoneDetails')\">
|
||||||
New version of Tiny-Tiny RSS ($latest_version) is available (click for details)</a>
|
New version of Tiny-Tiny RSS ($latest_version) is available (click for details)</a>
|
||||||
<div id=\"milestoneDetails\">$content</div></div>";
|
<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>";
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 262 B |
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
if ($id == "explainError") {
|
if ($id == "explainError") {
|
||||||
|
|
||||||
print "<div id=\"infoBoxTitle\">Error message</div>";
|
print "<div id=\"infoBoxTitle\">Notice</div>";
|
||||||
print "<div class=\"infoBoxContents\">";
|
print "<div class=\"infoBoxContents\">";
|
||||||
|
|
||||||
if ($param == 1) {
|
if ($param == 1) {
|
||||||
|
@ -14,6 +14,11 @@
|
||||||
start the daemon process or contact instance owner.");
|
start the daemon process or contact instance owner.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($param == 2) {
|
||||||
|
print check_for_update($link, false);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
print "</div>";
|
print "</div>";
|
||||||
|
|
||||||
print "<div align='center'>";
|
print "<div align='center'>";
|
||||||
|
|
12
tt-rss.css
12
tt-rss.css
|
@ -76,7 +76,7 @@ ul.feedCatList {
|
||||||
|
|
||||||
ul.feedCatList li {
|
ul.feedCatList li {
|
||||||
margin : 0px;
|
margin : 0px;
|
||||||
padding : 0px 0px 0px 0px;
|
padding : 0px 0px 2px 0px;
|
||||||
color : black;
|
color : black;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -85,6 +85,10 @@ ul.feedList li {
|
||||||
font-size : small;
|
font-size : small;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ul.feedCatList img {
|
||||||
|
vertical-align : bottom;
|
||||||
|
}
|
||||||
|
|
||||||
li.feedUnread,
|
li.feedUnread,
|
||||||
li.errorUnread,
|
li.errorUnread,
|
||||||
li.labelUnread,
|
li.labelUnread,
|
||||||
|
@ -1431,4 +1435,8 @@ ul.headlineDropdownMenu ul li:hover {
|
||||||
background-color : #f0f0f0;
|
background-color : #f0f0f0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#newVersionIcon {
|
||||||
|
vertical-align : middle;
|
||||||
|
cursor : pointer;
|
||||||
|
display : none;
|
||||||
|
}
|
||||||
|
|
11
tt-rss.js
11
tt-rss.js
|
@ -539,6 +539,17 @@ function parse_runtime_info(elem) {
|
||||||
|
|
||||||
debug("RI: " + k + " => " + v);
|
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) {
|
if (k == "daemon_is_running" && v != 1) {
|
||||||
notify("<span onclick=\"javascript:explainError(1)\">Warning: Update daemon is not runing.</span>", true, true);
|
notify("<span onclick=\"javascript:explainError(1)\">Warning: Update daemon is not runing.</span>", true, true);
|
||||||
}
|
}
|
||||||
|
|
|
@ -102,12 +102,15 @@ window.onload = init;
|
||||||
<div id="infoBoxShadow"><div id="infoBox"> </div></div>
|
<div id="infoBoxShadow"><div id="infoBox"> </div></div>
|
||||||
|
|
||||||
<div id="header">
|
<div id="header">
|
||||||
<?php if (!SINGLE_USER_MODE) { ?>
|
|
||||||
<div style="float : right">
|
<div style="float : right">
|
||||||
|
<?php if (!SINGLE_USER_MODE) { ?>
|
||||||
<?php echo _('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b>
|
<?php echo _('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b>
|
||||||
(<a href="logout.php">Logout</a>)
|
(<a href="logout.php">Logout</a>)
|
||||||
</div>
|
|
||||||
<?php } ?>
|
<?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"/>
|
<img src="<?php echo $theme_image_path ?>images/ttrss_logo.png" alt="Tiny Tiny RSS"/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue