diff --git a/src/nhttpd/web/Y_Tools_Boxcontrol.yhtm b/src/nhttpd/web/Y_Tools_Boxcontrol.yhtm index 10a1cae8d..d4b1b6fec 100644 --- a/src/nhttpd/web/Y_Tools_Boxcontrol.yhtm +++ b/src/nhttpd/web/Y_Tools_Boxcontrol.yhtm @@ -34,11 +34,7 @@ function goUrl(_url){ - {=if-equal:{=global-var-get:boxtype=}~coolstream~ - ~ - - =} {=L:bc.control.playback=}{=L:bc.control.recording_mode=} @@ -54,49 +50,28 @@ function goUrl(_url){ - {=if-not-equal:{=global-var-get:boxtype=}~coolstream~ - {=L:bc.control.epg_sectiond=}{=L:bc.control.spts=} + {=L:bc.control.epg_sectiond=}  - - - - - +   - ~=} {=L:bc.control.remote=}{=L:bc.control.live_lock=} - - {=if-not-equal:{=global-var-get:boxtype=}~coolstream~ - {=L:bc.control.optical_output=}{=L:bc.control.esound_server=} - - - - - - - - - - - - ~=} diff --git a/src/nhttpd/web/Y_Version.txt b/src/nhttpd/web/Y_Version.txt index 86ff9fe3c..620a9ce73 100644 --- a/src/nhttpd/web/Y_Version.txt +++ b/src/nhttpd/web/Y_Version.txt @@ -1,4 +1,4 @@ -version=2.8.0.23 +version=2.8.0.24 date=25.07.2012 type=Release info=Port Coolstream diff --git a/src/nhttpd/web/languages/Deutsch b/src/nhttpd/web/languages/Deutsch index 370755962..54c919d3e 100644 --- a/src/nhttpd/web/languages/Deutsch +++ b/src/nhttpd/web/languages/Deutsch @@ -105,17 +105,13 @@ bc.menue.volumen_display=Lautstärke Anzeige bc.control.freemem=FreeMem bc.control.lock=sperren bc.control.unlock=freigeben -bc.control.lcd_unlock=LCD freigeben bc.control.standby_mode=Standby Modus bc.control.recording_mode=Aufnahmemodus bc.control.box=Box bc.control.remote=Fernbedienung bc.control.playback=Abspielen bc.control.epg_sectiond=EPG Sectiond -bc.control.spts=SPTS bc.control.live_lock=Live sperren -bc.control.optical_output=Optischer Ausgang -bc.control.esound_server=ESound Server bc.control.reboot.ask=Box wirklich neu starten? bc.control.reboot=Neustart bc.control.shutdown.ask=Box wirklich ausschalten? diff --git a/src/nhttpd/web/languages/English b/src/nhttpd/web/languages/English index 05e56d40c..b4a2e43e9 100644 --- a/src/nhttpd/web/languages/English +++ b/src/nhttpd/web/languages/English @@ -107,17 +107,13 @@ bc.menue.volumen_display=volumen display bc.control.freemem=FreeMem bc.control.lock=lock bc.control.unlock=unlock -bc.control.lcd_unlock=LCD unlock bc.control.standby_mode=standby mode bc.control.recording_mode=recording mode bc.control.box=box bc.control.remote=remote bc.control.playback=playback bc.control.epg_sectiond=EPG Sectiond -bc.control.spts=SPTS bc.control.live_lock=live lock -bc.control.optical_output=optical output -bc.control.esound_server=ESound Server bc.control.reboot.ask=Really restart the Box? bc.control.reboot=reboot bc.control.shutdown.ask=Really shutdown the Box? diff --git a/src/nhttpd/web/languages/Portuguese b/src/nhttpd/web/languages/Portuguese index 62a51d998..cab847312 100644 --- a/src/nhttpd/web/languages/Portuguese +++ b/src/nhttpd/web/languages/Portuguese @@ -106,17 +106,13 @@ bc.menue.volumen_display=visualizar volume bc.control.freemem=FreeMem bc.control.lock=bloquear bc.control.unlock=desbloquear -bc.control.lcd_unlock=Bloqueio do LCD bc.control.standby_mode=modo em standby bc.control.recording_mode=modo de gravação bc.control.box=box bc.control.remote=remote bc.control.playback=playback bc.control.epg_sectiond=EPG Sectiond -bc.control.spts=SPTS bc.control.live_lock=bloqueio do live -bc.control.optical_output=saída optica -bc.control.esound_server=Servidor ESound bc.control.reboot.ask=Quer realmente reiniciar a sua Box? bc.control.reboot=reiniciar bc.control.shutdown.ask=Quer realmente desligar a sua Box? diff --git a/src/nhttpd/web/scripts/Y_Live.sh b/src/nhttpd/web/scripts/Y_Live.sh index 1aa505f8f..e10efdce9 100755 --- a/src/nhttpd/web/scripts/Y_Live.sh +++ b/src/nhttpd/web/scripts/Y_Live.sh @@ -11,18 +11,12 @@ # ----------------------------------------------------------- live_lock() { - if [ "$boxtype" != "coolstream" ]; then - call_webserver "control/lcd?lock=1&clear=1&rect=10,10,110,50,1,0&xpos=20&ypos=27&size=22&font=2&text=%20%20%20%20yWeb%0A%20%20LiveView&update=1" >/dev/null - fi call_webserver "control/rc?lock" >/dev/null call_webserver "control/zapto?stopplayback" >/dev/null } # ----------------------------------------------------------- live_unlock() { - if [ "$boxtype" != "coolstream" ]; then - call_webserver "control/lcd?lock=0" >/dev/null - fi call_webserver "control/rc?unlock" >/dev/null call_webserver "control/zapto?startplayback" >/dev/null } diff --git a/src/nhttpd/web/scripts/Y_Tools.sh b/src/nhttpd/web/scripts/Y_Tools.sh index d6aae89c1..921e8669c 100755 --- a/src/nhttpd/web/scripts/Y_Tools.sh +++ b/src/nhttpd/web/scripts/Y_Tools.sh @@ -613,15 +613,6 @@ case "$1" in cat /tmp/$2 ;; - standby_status) - status=`switch -s|grep "FNC: 0"` - if [ "$status" = "" ] - then - echo "off" - else - echo "on" - fi - ;; mtd_space|var_space) df | while read fs rest; do case ${fs:0:3} in