- yweb: remove obsolete and non-working code from boxcontrol

src/nhttpd/web/Y_Tools_Boxcontrol.yhtm

@@ -34,11 +34,7 @@ function goUrl(_url){
 			<td>
 			<input type="button" value="{=L:on=}" onclick='goUrl("/control/standby?on");'/>
 			<input type="button" value="{=L:off=}" onclick='goUrl("/control/standby?off");'/>
-		{=if-equal:{=global-var-get:boxtype=}~coolstream~
 			<input type="button" value="{=L:bc.control.status=}" onclick='goUrl("/control/standby");'/>
-		~
-			<input type="button" value="{=L:bc.control.status=}" onclick='goUrl("/control/exec?Y_Tools&amp;standby_status");'/>
-		=}
 			</td>
 		</tr>
 		<tr><td class="y_form_header">{=L:bc.control.playback=}</td><td class="y_form_header">{=L:bc.control.recording_mode=}</td></tr>
@@ -54,49 +50,28 @@ function goUrl(_url){
 			<input type="button" value="{=L:bc.control.status=}" onclick='goUrl("/control/setmode?status");'/>
 			</td>
 		</tr>
-	{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
+		<tr><td class="y_form_header">{=L:bc.control.epg_sectiond=}</td><td class="y_form_header">&nbsp; <!-- just a placeholder --></td></tr>
-		<tr><td class="y_form_header">{=L:bc.control.epg_sectiond=}</td><td class="y_form_header">{=L:bc.control.spts=}</td></tr>
 		<tr>
 			<td>
 			<input type="button" value="{=L:on=}" onclick='goUrl("/control/zapto?startsectionsd");'/>
 			<input type="button" value="{=L:off=}" onclick='goUrl("/control/zapto?stopsectionsd");'/>
 			<input type="button" value="{=L:bc.control.status=}" onclick='goUrl("/control/zapto?statussectionsd");'/>
-			<input type="button" value="{=L:bc.control.restart=}" onclick='goUrl("/control/zapto?restartsectionsd");'/>
-			<input type="button" value="{=L:bc.control.freemem=}" onclick='goUrl("/control/zapto?freememsectionsd");'/>
 			</td>
 			<td>
-			<input type="button" value="{=L:on=}" onclick='goUrl("/control/system?setAViAExtPlayBack=spts");'/>
+			&nbsp; <!-- just a placeholder -->
-			<input type="button" value="{=L:off=}" onclick='goUrl("/control/system?setAViAExtPlayBack=pes");'/>
-			<input type="button" value="{=L:bc.control.status=}" onclick='goUrl("/control/system?getAViAExtPlayBack");'/>
 			</td>
 		</tr>
-	~=}
 		<tr><td class="y_form_header">{=L:bc.control.remote=}</td><td class="y_form_header">{=L:bc.control.live_lock=}</td></tr>
 		<tr>
 			<td>
 			<input type="button" value="{=L:on=}" onclick='goUrl("/control/rc?unlock");'/>
 			<input type="button" value="{=L:off=}" onclick='goUrl("/control/rc?lock");'/>
-			<input type="button" value="{=L:bc.control.lcd_unlock=}" onclick='goUrl("/control/exec?Y_Live&amp;live_unlock");'/>
 			</td>
 			<td>
 			<input type="button" value="{=L:bc.control.lock=}" onclick='live_lock();' />
 			<input type="button" value="{=L:bc.control.unlock=}" onclick='live_unlock();' />
 			</td>
 		</tr>
-	{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
-		<tr><td class="y_form_header">{=L:bc.control.optical_output=}</td><td class="y_form_header">{=L:bc.control.esound_server=}</td></tr>
-		<tr>
-			<td>
-			<input type="button" value="{=L:on=}" onclick='goUrl("/control/system?setAViAExtIec=on");'/>
-			<input type="button" value="{=L:off=}" onclick='goUrl("/control/system?setAViAExtIec=off");'/>
-			<input type="button" value="{=L:bc.control.status=}" onclick='goUrl("/control/system?getAViAExtIec");'/>
-			</td>
-			<td>
-			<input type="button" value="{=L:on=}" onclick='goUrl("/control/esound?on");'/>
-			<input type="button" value="{=L:off=}" onclick='goUrl("/control/esound?off");'/>
-			</td>
-		</tr>
-	~=}
 		</table>
 	</form>
 	</div>

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

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?

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?

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?

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
 }

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