rework no daemon warning

This commit is contained in:
Andrew Dolgov 2007-01-27 10:21:55 +01:00
parent c50e2b3004
commit ef16ae3782
5 changed files with 38 additions and 8 deletions

View File

@ -1576,3 +1576,7 @@ function filterDlgCheckAction(sender) {
} }
} }
function explainError(code) {
return displayDlg("explainError", code);
}

View File

@ -3,6 +3,29 @@
$id = $_GET["id"]; $id = $_GET["id"];
$param = db_escape_string($_GET["param"]); $param = db_escape_string($_GET["param"]);
if ($id == "explainError") {
print "<div id=\"infoBoxTitle\">Error message</div>";
print "<div class=\"infoBoxContents\">";
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 "</div>";
print "<div align='center'>";
print "<input class=\"button\"
type=\"submit\" onclick=\"return closeInfoBox()\"
value=\"Close\">";
print "</div>";
}
if ($id == "quickAddFeed") { if ($id == "quickAddFeed") {
print "<div id=\"infoBoxTitle\">Subscribe to feed</div>"; print "<div id=\"infoBoxTitle\">Subscribe to feed</div>";

View File

@ -242,6 +242,11 @@ input.editbox {
color : black; color : black;
} }
.notifyError span:hover {
color : red;
cursor : pointer;
}
#dispSwitch { #dispSwitch {
font-size : x-small; font-size : x-small;
text-align : right; text-align : right;

View File

@ -539,7 +539,11 @@ function parse_runtime_info(elem) {
debug("RI: " + k + " => " + v); debug("RI: " + k + " => " + v);
var w = document.getElementById("noDaemonWarning"); if (k == "daemon_is_running" && v != 1) {
notify("<span onclick=\"javascript:explainError(1)\">Warning: Update daemon is not runing.</span>", true, true);
}
/* var w = document.getElementById("noDaemonWarning");
if (w) { if (w) {
if (k == "daemon_is_running" && v != 1) { if (k == "daemon_is_running" && v != 1) {
@ -547,7 +551,7 @@ function parse_runtime_info(elem) {
} else { } else {
w.style.display = "none"; w.style.display = "none";
} }
} } */
param = param.nextSibling; param = param.nextSibling;
} }
} }

View File

@ -97,12 +97,6 @@ if (document.addEventListener) {
window.onload = init; window.onload = init;
</script> </script>
<div id="noDaemonWarning">
<?php echo _("<b>Warning:</b> 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.") ?>
</div>
<ul id="debug_output"></ul> <ul id="debug_output"></ul>
<div id="infoBoxShadow"><div id="infoBox">&nbsp;</div></div> <div id="infoBoxShadow"><div id="infoBox">&nbsp;</div></div>