diff --git a/src/nhttpd/web/Makefile.am b/src/nhttpd/web/Makefile.am index 3ac76f49a..a0c399a4d 100644 --- a/src/nhttpd/web/Makefile.am +++ b/src/nhttpd/web/Makefile.am @@ -85,6 +85,7 @@ install_DATA = channels.js \ Y_Tools_Timer_Sync.js \ Y_Tools_Timer_Sync.yhtm \ Y_Tools_tvshot.yhtm \ + Y_User.css \ Y_Version.txt \ Y_VLC.js \ Y_Wait.yhtm \ diff --git a/src/nhttpd/web/Y_About.yhtm b/src/nhttpd/web/Y_About.yhtm index 151e2c46d..ad022b42c 100644 --- a/src/nhttpd/web/Y_About.yhtm +++ b/src/nhttpd/web/Y_About.yhtm @@ -10,13 +10,13 @@
- - + + diff --git a/src/nhttpd/web/Y_Blocks.txt b/src/nhttpd/web/Y_Blocks.txt index 12c71185c..64481a580 100644 --- a/src/nhttpd/web/Y_Blocks.txt +++ b/src/nhttpd/web/Y_Blocks.txt @@ -271,6 +271,7 @@ start-block~head yWeb + end-block~head # ------- Lay-HEAD @@ -282,6 +283,7 @@ start-block~headCache yWeb + end-block~headCache # ------- Lay-HEAD without charset @@ -292,6 +294,7 @@ start-block~head_no_charset yWeb + end-block~head_no_charset # ------- Lay-Frame HEAD @@ -302,6 +305,7 @@ start-block~frame_head +yWeb end-block~frame_head @@ -313,6 +317,7 @@ start-block~frame_iso_head +yWeb end-block~frame_iso_head @@ -402,7 +407,7 @@ end-block~frame_main start-block~page_frame_rest {=include-block:Y_Blocks.txt;head=} - + end-block~page_frame_rest diff --git a/src/nhttpd/web/Y_Boxcontrol_Bouquetlist.yhtm b/src/nhttpd/web/Y_Boxcontrol_Bouquetlist.yhtm index 1a2ed2e66..a75677bab 100644 --- a/src/nhttpd/web/Y_Boxcontrol_Bouquetlist.yhtm +++ b/src/nhttpd/web/Y_Boxcontrol_Bouquetlist.yhtm @@ -1,7 +1,7 @@ {=include-block:Y_Blocks.txt;head_no_charset=} - +
yjogolyWebyWeb by yjogol
  - {=ini-get:{=var-get:vf=};version=} - {=ini-get:{=var-get:vf=};date=} - {=ini-get:{=var-get:vf=};type=}

- {=ini-get:{=var-get:vf=};info=}


+ v{=ini-get:{=var-get:vf=};version=} - {=ini-get:{=var-get:vf=};date=} - {=ini-get:{=var-get:vf=};type=} - {=ini-get:{=var-get:vf=};info=} +

diff --git a/src/nhttpd/web/Y_Boxcontrol_Channellist.yhtm b/src/nhttpd/web/Y_Boxcontrol_Channellist.yhtm index b51b6f0e7..70fc17378 100644 --- a/src/nhttpd/web/Y_Boxcontrol_Channellist.yhtm +++ b/src/nhttpd/web/Y_Boxcontrol_Channellist.yhtm @@ -16,7 +16,7 @@ function do_streaminfo() { //]]> - +
{=L:bc.channels=}
{=func:get_bouquets_with_epg {=bouquet=}=}
diff --git a/src/nhttpd/web/Y_Boxcontrol_Menue.yhtm b/src/nhttpd/web/Y_Boxcontrol_Menue.yhtm index 027dc585d..1e27de247 100644 --- a/src/nhttpd/web/Y_Boxcontrol_Menue.yhtm +++ b/src/nhttpd/web/Y_Boxcontrol_Menue.yhtm @@ -174,7 +174,7 @@ function get_data(){ - +
...

@@ -214,7 +214,7 @@ function get_data(){ - +
...
@@ -223,7 +223,7 @@ function get_data(){ - +
...
diff --git a/src/nhttpd/web/Y_Live_EPG.yhtm b/src/nhttpd/web/Y_Live_EPG.yhtm index 1a96510c2..d05cc2fc6 100644 --- a/src/nhttpd/web/Y_Live_EPG.yhtm +++ b/src/nhttpd/web/Y_Live_EPG.yhtm @@ -101,7 +101,7 @@ function _show_epg() //]]> - + {=var-set:wait_text={=L:get_epg=}=}{=include-block:Y_Blocks.txt;snip_show_wait=} diff --git a/src/nhttpd/web/Y_Live_EPG_Info.yhtm b/src/nhttpd/web/Y_Live_EPG_Info.yhtm index f976167f0..c109d09e7 100644 --- a/src/nhttpd/web/Y_Live_EPG_Info.yhtm +++ b/src/nhttpd/web/Y_Live_EPG_Info.yhtm @@ -11,7 +11,7 @@ function show_info(_desc, _info1, _info2){ {=L:back=} - +
 
 
diff --git a/src/nhttpd/web/Y_Main.css b/src/nhttpd/web/Y_Main.css index f6e44e168..42a00873e 100644 --- a/src/nhttpd/web/Y_Main.css +++ b/src/nhttpd/web/Y_Main.css @@ -552,7 +552,7 @@ tr { .y_text_boxcontrol_table { width:114px; height: 23px; - background: url('/images/audiobar.gif') no-repeat 1px 1px; + background: url('/images/audiobar.png') no-repeat 1px 1px; padding: 1px; margin-top: 10px; border: #FF8e42 solid 1px; @@ -581,6 +581,12 @@ tr { margin-top: 5px; margin-bottom: -1px; } +#audiobar_right, +#sigbar_right, +#snrbar_right { + background-color: #ffffff; +} + .y_epg_info { border: 1px solid #CCCCCC; background-color: white; diff --git a/src/nhttpd/web/Y_Menue.yhtm b/src/nhttpd/web/Y_Menue.yhtm index 62f37cf28..c901098b1 100644 --- a/src/nhttpd/web/Y_Menue.yhtm +++ b/src/nhttpd/web/Y_Menue.yhtm @@ -75,7 +75,7 @@ function vlc() { diff --git a/src/nhttpd/web/Y_Tools_Screenshot.yhtm b/src/nhttpd/web/Y_Tools_Screenshot.yhtm index 5051e5b27..14dfde13e 100644 --- a/src/nhttpd/web/Y_Tools_Screenshot.yhtm +++ b/src/nhttpd/web/Y_Tools_Screenshot.yhtm @@ -110,7 +110,7 @@ function do_switchrc_txt(){
-
+
{=include-block:Y_Blocks.txt;remote=} diff --git a/src/nhttpd/web/Y_User.css b/src/nhttpd/web/Y_User.css new file mode 100644 index 000000000..aea4ab400 --- /dev/null +++ b/src/nhttpd/web/Y_User.css @@ -0,0 +1,10 @@ +/* Y_User.css - User style sheet for yWeb */ + +/* +body { + background-color: #eee; +} +body.iframe { + background-color: #fff; +} +*/ diff --git a/src/nhttpd/web/Y_Version.txt b/src/nhttpd/web/Y_Version.txt index 92a6eec7a..64b26e93c 100644 --- a/src/nhttpd/web/Y_Version.txt +++ b/src/nhttpd/web/Y_Version.txt @@ -1,4 +1,4 @@ -version=2.8.0.69 +version=2.9.0.0 date=25.02.2015 type=Release info=Port CST diff --git a/src/nhttpd/web/Y_blank.htm b/src/nhttpd/web/Y_blank.htm index fc906f34e..24aba0065 100644 --- a/src/nhttpd/web/Y_blank.htm +++ b/src/nhttpd/web/Y_blank.htm @@ -4,8 +4,9 @@ yWeb + + - diff --git a/src/nhttpd/web/images/Makefile.am b/src/nhttpd/web/images/Makefile.am index b356d9bdf..1952641ae 100644 --- a/src/nhttpd/web/images/Makefile.am +++ b/src/nhttpd/web/images/Makefile.am @@ -9,7 +9,7 @@ install_DATA = accept.png \ arrowright.png \ arrowup.gif \ arrowup.png \ - audiobar.gif \ + audiobar.png \ blank.gif \ check_green.gif \ chmod.gif \ @@ -90,7 +90,7 @@ install_DATA = accept.png \ time_up.png \ transcode.png \ tux.gif \ - tux-yweb.gif \ + tux-yweb.png \ udp_switch_off.png \ udp_switch_on.png \ unlock.gif \ @@ -106,7 +106,6 @@ install_DATA = accept.png \ wait.gif \ wget.gif \ x_red.gif \ - yjogol.gif \ y.png \ zap.png diff --git a/src/nhttpd/web/images/audiobar.gif b/src/nhttpd/web/images/audiobar.gif deleted file mode 100644 index 45974b211..000000000 Binary files a/src/nhttpd/web/images/audiobar.gif and /dev/null differ diff --git a/src/nhttpd/web/images/audiobar.png b/src/nhttpd/web/images/audiobar.png new file mode 100644 index 000000000..00d21ebd9 Binary files /dev/null and b/src/nhttpd/web/images/audiobar.png differ diff --git a/src/nhttpd/web/images/tux-yweb.gif b/src/nhttpd/web/images/tux-yweb.gif deleted file mode 100644 index fa1398fde..000000000 Binary files a/src/nhttpd/web/images/tux-yweb.gif and /dev/null differ diff --git a/src/nhttpd/web/images/tux-yweb.png b/src/nhttpd/web/images/tux-yweb.png new file mode 100644 index 000000000..8ec4ff506 Binary files /dev/null and b/src/nhttpd/web/images/tux-yweb.png differ diff --git a/src/nhttpd/web/images/yjogol.gif b/src/nhttpd/web/images/yjogol.gif deleted file mode 100644 index ec54c9699..000000000 Binary files a/src/nhttpd/web/images/yjogol.gif and /dev/null differ