Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Origin commit data
------------------
Branch: ni/coolstream
Commit: 1ec298224c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-19 (Thu, 19 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-10-19 16:08:21 +02:00
3 changed files with 14 additions and 14 deletions

View File

@@ -969,6 +969,9 @@ a.timer {
#screenshot_header {
height: 30px;
}
table.screenshot {
clear: both;
}
td#remote,
td.shot {
vertical-align: top;

View File

@@ -17,11 +17,12 @@ function goUrl(_url){
}
function set_btn_standby(){
var res = trim(loadSyncURL("/control/standby"));
var color = "red";
var color = "gray";
switch(res){
case "off": color = "green"; break;
case "on": color = "red"; break;
}
$("btn_standby").setStyle({borderColor: color});
document.getElementById('btn_standby').style.borderColor = color;
}
function standby(_standby){
var _cec = (document.getElementById('checkCEC').checked == true) ? "on" : "off";
@@ -29,14 +30,12 @@ function standby(_standby){
}
function init() {
set_btn_standby();
}
function get_data() {
set_btn_standby();
window.setInterval("set_btn_standby();", 5000);
}
//]]>
</script>
</head>
<body>
<body onload="init()">
<div class="work_box">
<div class="work_box_head"><div class="work_box_head_h2">
{=var-set:help_url=Help-BoxControl-Control=}{=var-set:menu={=L:bc.menue.control=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
@@ -105,10 +104,5 @@ function get_data() {
<div id="out"></div>
</div>
</div>
<script type="text/javascript">
//<![CDATA[
init();
window.setInterval("get_data();",5000);
//]]>
</body>
</html>

View File

@@ -122,13 +122,16 @@ function do_reload(){
</div>
<div class="right">
<form onsubmit="do_snapshot(); return false">
Reload: <input id="checkReload" name="checkReload" type="checkbox" /> <input type="number" value="15" id="inputReload" min="1" max="180" title="{=L:bc.screenshot.reload_desc=}" disabled />
{=L:filename=}: <input type="text" value="screenshot" id="filename" size="10" />
OSD: <input id="checkOSD" name="checkOSD" type="checkbox" {=if-empty:{=osd=}~~checked="checked"=} />
TV: <input id="checkVideo" name="checkVideo" type="checkbox" {=if-empty:{=video=}~~checked="checked"=} />
</form>
</div>
<div class="clear"></div>
<div class="right">
Reload: <input type="number" value="15" id="inputReload" min="1" max="180" title="{=L:bc.screenshot.reload_desc=}" disabled /> <input id="checkReload" name="checkReload" type="checkbox" />
</div>
<div class="clear"></div>
</div>
<div id="status" style="display: none">
<img src="/images/wait.gif" alt="{=L:bc.screenshot.wait_text=}"/>
@@ -150,10 +153,10 @@ function do_reload(){
<script>
document.getElementById('checkReload').onclick = function() {
if (this.checked ) {
intervall = setInterval(do_snapshot, document.getElementById("inputReload").value + "000");
interval = setInterval(do_snapshot, document.getElementById("inputReload").value + "000");
document.getElementById("inputReload").disabled = false;
} else {
clearInterval(intervall);
clearInterval(interval);
document.getElementById("inputReload").disabled = true;
}
};