diff --git a/src/nhttpd/web/Makefile.am b/src/nhttpd/web/Makefile.am index a873fc92a..7a1a58268 100644 --- a/src/nhttpd/web/Makefile.am +++ b/src/nhttpd/web/Makefile.am @@ -61,7 +61,6 @@ install_DATA = channels.js \ Y_Settings_personalize.yhtm \ Y_Settings_Skin.yhtm \ Y_Settings_Timer.yhtm \ - Y_Settings_ucodes.yhtm \ Y_Settings_umount_liste.yhtm \ Y_Settings_video_audio.yhtm \ Y_Settings_VNC.yhtm \ diff --git a/src/nhttpd/web/Y_Blocks.txt b/src/nhttpd/web/Y_Blocks.txt index d438796ca..579538d8b 100644 --- a/src/nhttpd/web/Y_Blocks.txt +++ b/src/nhttpd/web/Y_Blocks.txt @@ -151,7 +151,6 @@ start-block~personalize_save_settings {=ini-set:/var/tuxbox/config/neutrino.conf;personalize_getplugins;{=p_getplugins=}~cache=} {=ini-set:/var/tuxbox/config/neutrino.conf;personalize_restart;{=p_restart=}~cache=} {=ini-set:/var/tuxbox/config/neutrino.conf;personalize_epgrestart;{=p_epgrestart=}~cache=} -{=ini-set:/var/tuxbox/config/neutrino.conf;personalize_ucodecheck;{=p_ucodecheck=}~cache=} {=ini-set:/var/tuxbox/config/neutrino.conf;personalize_chan_epg_stat;{=p_chan_epg_stat=}~cache=} {=ini-set:/var/tuxbox/config/neutrino.conf;personalize_imageinfo;{=p_imageinfo=}~cache=} {=ini-set:/var/tuxbox/config/neutrino.conf;personalize_update;{=p_update=}~cache=} diff --git a/src/nhttpd/web/Y_Settings_Menue.yhtm b/src/nhttpd/web/Y_Settings_Menue.yhtm index fd6c40a16..2b61fb0c8 100644 --- a/src/nhttpd/web/Y_Settings_Menue.yhtm +++ b/src/nhttpd/web/Y_Settings_Menue.yhtm @@ -51,7 +51,6 @@ function init(){
  • {=L:set.menue.webserver=}
  • {=L:set.menue.zapit=}
    • {=if-not-equal:{=global-var-get:boxtype=}~coolstream~ -
  • {=L:set.menue.ucodes=}
  • {=L:set.menue.boot_logo=}
    • ~=}
  • {=L:set.menue.timer_settings=}
    • @@ -60,7 +59,6 @@ function init(){
  • {=L:set.menue.webserver=}
  • {=L:set.menue.zapit=}
    • {=if-not-equal:{=global-var-get:boxtype=}~coolstream~ -
  • {=L:set.menue.ucodes=}
  • {=L:set.menue.boot_logo=}
    • ~=} {=if-not-equal:{=global-var-get:boxtype=}~coolstream~ diff --git a/src/nhttpd/web/Y_Settings_personalize.yhtm b/src/nhttpd/web/Y_Settings_personalize.yhtm index 5cbcf937e..a4bce8d7f 100644 --- a/src/nhttpd/web/Y_Settings_personalize.yhtm +++ b/src/nhttpd/web/Y_Settings_personalize.yhtm @@ -49,7 +49,6 @@ function do_init() obj_set_radio_value('p_getplugins', "{=ini-get:/var/tuxbox/config/neutrino.conf;personalize_getplugins;1~cache=}"); obj_set_radio_value('p_restart', "{=ini-get:/var/tuxbox/config/neutrino.conf;personalize_restart;1~cache=}"); obj_set_radio_value('p_epgrestart', "{=ini-get:/var/tuxbox/config/neutrino.conf;personalize_epgrestart;1~cache=}"); - obj_set_radio_value('p_ucodecheck', "{=ini-get:/var/tuxbox/config/neutrino.conf;personalize_ucodecheck;1~cache=}"); obj_set_radio_value('p_chan_epg_stat', "{=ini-get:/var/tuxbox/config/neutrino.conf;personalize_chan_epg_stat;1~cache=}"); obj_set_radio_value('p_imageinfo', "{=ini-get:/var/tuxbox/config/neutrino.conf;personalize_imageinfo;1~cache=}"); obj_set_radio_value('p_update', "{=ini-get:/var/tuxbox/config/neutrino.conf;personalize_update;1~cache=}"); @@ -324,13 +323,6 @@ function do_init() PIN - Ucodes überprüfen - - nicht sichtbar  - sichtbar  - PIN - - Sender/EPG Statistik nicht sichtbar  diff --git a/src/nhttpd/web/Y_Settings_ucodes.yhtm b/src/nhttpd/web/Y_Settings_ucodes.yhtm deleted file mode 100644 index 49cacf81c..000000000 --- a/src/nhttpd/web/Y_Settings_ucodes.yhtm +++ /dev/null @@ -1,58 +0,0 @@ -{=include-block:Y_Blocks.txt;head=} - - - -
    -
    - {=var-set:help_url=Help-Settings-ucodes=}{=var-set:menu=Ucodes=}{=include-block:Y_Blocks.txt;work_menu=}
    -
    - - - - - - -
    UploadDownload
    -
    -

    - camalpha.bin
    - avia500.ux
    - avia600.ux
    - ucode.bin
    - -
    - -

    -
    -     		- -
    -
    -
    - - \ No newline at end of file diff --git a/src/nhttpd/web/Y_Tools_Check_Install.yhtm b/src/nhttpd/web/Y_Tools_Check_Install.yhtm index 19ca8ff51..e032adc7d 100644 --- a/src/nhttpd/web/Y_Tools_Check_Install.yhtm +++ b/src/nhttpd/web/Y_Tools_Check_Install.yhtm @@ -126,25 +126,6 @@ function do_check(){ =} ~=} - - {=if-not-equal:{=global-var-get:boxtype=}~coolstream~ - /*ucodes*/ - {=if-file-exists:/var/tuxbox/ucodes/avia500.ux~ - sLog_addRow(sLog_body, "green", "Ucodes: avia500.ux found", "ok"); - ~ - sLog_addRow(sLog_body, "yellow", "Ucodes: avia500.ux not found. "+wiki_url("Ucodes"), "notice"); - =} - {=if-file-exists:/var/tuxbox/ucodes/avia600.ux~ - sLog_addRow(sLog_body, "green", "Ucodes: avia600.ux found", "ok"); - ~ - sLog_addRow(sLog_body, "yellow", "Ucodes: avia600.ux not found. "+wiki_url("Ucodes"), "notice"); - =} - {=if-file-exists:/var/tuxbox/ucodes/cam-alpha.bin~ - sLog_addRow(sLog_body, "green", "Ucodes: cam-alpha found", "ok"); - ~ - sLog_addRow(sLog_body, "red", "Ucodes: cam-alpha not found. "+wiki_url("Ucodes"), "failed"); - =} - ~=} do_stop(); } //]]> diff --git a/src/nhttpd/web/Y_Version.txt b/src/nhttpd/web/Y_Version.txt index 7b6929294..45aae143d 100644 --- a/src/nhttpd/web/Y_Version.txt +++ b/src/nhttpd/web/Y_Version.txt @@ -1,5 +1,5 @@ -version=2.8.0.12 -date=20.07.2012 +version=2.8.0.13 +date=21.07.2012 type=Release info=Port Coolstream diff --git a/src/nhttpd/web/languages/Deutsch b/src/nhttpd/web/languages/Deutsch index 4586571d3..f422477b8 100644 --- a/src/nhttpd/web/languages/Deutsch +++ b/src/nhttpd/web/languages/Deutsch @@ -215,7 +215,6 @@ set.sync_with_neutrino=Zur Synchronisation mit Neutrino ========Settings General & Menue set.menue.webserver=Webserver -set.menue.ucodes=Ucodes set.menue.boot_logo=Boot Logo set.menue.timer_settings=Timer Einstellungen set.menue.zapit=Zapit diff --git a/src/nhttpd/web/languages/English b/src/nhttpd/web/languages/English index cec1fb334..be48ce32c 100644 --- a/src/nhttpd/web/languages/English +++ b/src/nhttpd/web/languages/English @@ -218,7 +218,6 @@ set.sync_with_neutrino=Synchronization with Neutrino =======Settings General & Menue set.menue.webserver=Webserver -set.menue.ucodes=Ucodes set.menue.boot_logo=Boot Logo set.menue.timer_settings=Timer Settings set.menue.zapit=Zapit diff --git a/src/nhttpd/web/languages/Portuguese b/src/nhttpd/web/languages/Portuguese index afa3c0913..d098e8bae 100644 --- a/src/nhttpd/web/languages/Portuguese +++ b/src/nhttpd/web/languages/Portuguese @@ -222,7 +222,6 @@ set.sync_with_neutrino=Sincronização com Neutrino =======Definições General & Menu set.menue.webserver=Webserver -set.menue.ucodes=Ucodes set.menue.boot_logo=Boot Logo set.menue.timer_settings=Definições do Programador set.menue.zapit=Zapit diff --git a/src/nhttpd/web/scripts/Y_Tools.sh b/src/nhttpd/web/scripts/Y_Tools.sh index 3592289f6..a89ed914f 100755 --- a/src/nhttpd/web/scripts/Y_Tools.sh +++ b/src/nhttpd/web/scripts/Y_Tools.sh @@ -179,13 +179,6 @@ bootlogo_lcd_upload() y_format_message_html } # ----------------------------------------------------------- -ucodes_upload() -{ - msg="$1 hochgeladen
    next file" - upload_copy "$y_path_ucodes/$1" - y_format_message_html -} -# ----------------------------------------------------------- zapit_upload() { msg="$1 hochgeladen
    next file" @@ -545,7 +538,6 @@ case "$1" in image_delete) image_delete_download_page ;; bootlogo_upload) bootlogo_upload ;; bootlogo_lcd_upload) bootlogo_lcd_upload ;; - ucodes_upload) ucodes_upload $2 ;; zapit_upload) zapit_upload $2 ;; kernel-stack) msg=`dmesg`; y_format_message_html ;; ps) msg=`ps`; y_format_message_html ;; diff --git a/src/nhttpd/web/scripts/_Y_Globals.sh b/src/nhttpd/web/scripts/_Y_Globals.sh index ebe1a72c0..ed3206eb5 100755 --- a/src/nhttpd/web/scripts/_Y_Globals.sh +++ b/src/nhttpd/web/scripts/_Y_Globals.sh @@ -19,7 +19,6 @@ y_path_scripts="$y_path_httpd/scripts" y_path_usrbin="/var/bin" y_path_config="/var/tuxbox/config" y_path_tmp="/tmp" -y_path_ucodes="/var/tuxbox/ucodes" y_path_zapit="/var/tuxbox/config/zapit" y_path_plugin_tuxnew="/var/tuxbox/config/tuxnews"