diff --git a/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp b/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp index c9d119c7f..a71848bc5 100644 --- a/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp +++ b/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp @@ -415,7 +415,7 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std: (channel->getServiceType() == ST_NVOD_REFERENCE_SERVICE) ? " (NVOD)" : "", channel->getChannelID(), channel->getChannelID() & 0xFFFFFFFFFFFFULL, - ((NeutrinoAPI->ChannelListEvents[channel->getChannelID()]) ? "\"Program" : "")); + ((NeutrinoAPI->ChannelListEvents[channel->getChannelID()]) ? "\"Program" : "")); if (channel->getChannelID() == current_channel) yresult += string_printf("\n  \"Streaminfo\""); diff --git a/src/nhttpd/tuxboxapi/dbox/neutrinoyparser.cpp b/src/nhttpd/tuxboxapi/dbox/neutrinoyparser.cpp index 844d31c0e..9eba2014b 100644 --- a/src/nhttpd/tuxboxapi/dbox/neutrinoyparser.cpp +++ b/src/nhttpd/tuxboxapi/dbox/neutrinoyparser.cpp @@ -367,7 +367,7 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std: channel->name, (channel->service_type == ST_NVOD_REFERENCE_SERVICE) ? " (NVOD)" : "", channel->channel_id, - ((NeutrinoAPI->ChannelListEvents[channel->channel_id]) ? "\"Programmvorschau\"" : "")); + ((NeutrinoAPI->ChannelListEvents[channel->channel_id]) ? "\"Programmvorschau\"" : "")); if (channel->channel_id == current_channel) yresult += string_printf("\n  \"Streaminfo\""); diff --git a/src/nhttpd/web/Y_Boxcontrol_Menue.yhtm b/src/nhttpd/web/Y_Boxcontrol_Menue.yhtm index 1e27de247..9430e5096 100644 --- a/src/nhttpd/web/Y_Boxcontrol_Menue.yhtm +++ b/src/nhttpd/web/Y_Boxcontrol_Menue.yhtm @@ -195,7 +195,7 @@ function get_data(){ - + diff --git a/src/nhttpd/web/Y_Filemgr.yhtm b/src/nhttpd/web/Y_Filemgr.yhtm index 51fd6b535..10445fdf7 100644 --- a/src/nhttpd/web/Y_Filemgr.yhtm +++ b/src/nhttpd/web/Y_Filemgr.yhtm @@ -77,7 +77,7 @@ CyExplorer.prototype = { else fnamestr = ""+fp.get('fname')+""; /* if(editlink != "") - fdate = ""+fp.get('date'); + fdate = ""+fp.get('date'); */ var file_cell = new Element( 'td',{name: 'file'}).update(fnamestr); mycurrent_row.insert(file_cell); @@ -482,7 +482,7 @@ function prop_plugin_img(fullfname) function prop_plugin_ts(fullfname) { $('ext_title').update("Stream File"); - var html="start vlc"; + var html="start vlc"; $('ext_content').update(html); $('ext_diag').show(); } @@ -576,8 +576,8 @@ function ni() { - - + + diff --git a/src/nhttpd/web/Y_Filemgr_Edit.yhtm b/src/nhttpd/web/Y_Filemgr_Edit.yhtm index 4318080a1..2b013460a 100644 --- a/src/nhttpd/web/Y_Filemgr_Edit.yhtm +++ b/src/nhttpd/web/Y_Filemgr_Edit.yhtm @@ -52,7 +52,7 @@ function ni(){ --> - +
diff --git a/src/nhttpd/web/Y_Live.yhtm b/src/nhttpd/web/Y_Live.yhtm index 05bfba851..3aa771895 100644 --- a/src/nhttpd/web/Y_Live.yhtm +++ b/src/nhttpd/web/Y_Live.yhtm @@ -90,7 +90,7 @@ function view_transcode_mode(){ + diff --git a/src/nhttpd/web/Y_Main.css b/src/nhttpd/web/Y_Main.css index 42a00873e..91e9ecb4e 100644 --- a/src/nhttpd/web/Y_Main.css +++ b/src/nhttpd/web/Y_Main.css @@ -43,7 +43,7 @@ button[ytype]{ button[ytype="save"]{background-image:url(/images/save.png);} button[ytype="saveall"]{background-image:url(/images/saveall.png);} button[ytype="cancel"]{background-image:url(/images/cross.png);} -button[ytype="refresh"],button[ytype="reboot"]{background-image:url(/images/reload.gif);} +button[ytype="refresh"],button[ytype="reboot"]{background-image:url(/images/reload.png);} button[ytype="record"]{background-image:url(/images/record.png);} button[ytype="zap"]{background-image:url(/images/zap.png);} button[ytype="timeup"]{background-image:url(/images/time_up.png);} @@ -53,7 +53,7 @@ button[ytype="snapshot"]{background-image:url(/images/snapshot.png);} button[ytype="clearshot"]{background-image:url(/images/remove.png);} button[ytype="switchrc"]{background-image:url(/images/fb.png);} button[ytype="go"]{background-image:url(/images/accept.png);} -button[ytype="download"]{background-image:url(/images/wget.gif);} +button[ytype="download"]{background-image:url(/images/wget.png);} button[ytype="clear"]{background-image:url(/images/remove.png);} button[ytype="add"]{background-image:url(/images/new.png);} button[ytype="delete"]{background-image:url(/images/remove.png);} diff --git a/src/nhttpd/web/Y_Menue.yhtm b/src/nhttpd/web/Y_Menue.yhtm index c901098b1..fe461bf6b 100644 --- a/src/nhttpd/web/Y_Menue.yhtm +++ b/src/nhttpd/web/Y_Menue.yhtm @@ -111,10 +111,10 @@ function vlc() { - - + + - + diff --git a/src/nhttpd/web/Y_Timer_List.yhtm b/src/nhttpd/web/Y_Timer_List.yhtm index f09907fc7..d79a6409f 100644 --- a/src/nhttpd/web/Y_Timer_List.yhtm +++ b/src/nhttpd/web/Y_Timer_List.yhtm @@ -47,7 +47,7 @@ - Aktualisieren + Aktualisieren diff --git a/src/nhttpd/web/Y_Version.txt b/src/nhttpd/web/Y_Version.txt index 64b26e93c..7bf07d7cf 100644 --- a/src/nhttpd/web/Y_Version.txt +++ b/src/nhttpd/web/Y_Version.txt @@ -1,4 +1,4 @@ -version=2.9.0.0 +version=2.9.0.1 date=25.02.2015 type=Release info=Port CST diff --git a/src/nhttpd/web/images/LICENSE b/src/nhttpd/web/images/LICENSE index 71f5be81e..7c9ed72b6 100644 --- a/src/nhttpd/web/images/LICENSE +++ b/src/nhttpd/web/images/LICENSE @@ -6,14 +6,12 @@ Published under GPL v2 From Johannes Golombek yjogol@online.de: Published under GPL v2 -- y.png -- audiobar.gif +- audiobar.png - blank.gif -- help_white.gif From old (before yWeb): Published under GPL v2 -- elist.gif +- elist.png - streaminfo.png All others are from Mark James (www.famfamfam.com) diff --git a/src/nhttpd/web/images/Makefile.am b/src/nhttpd/web/images/Makefile.am index 1952641ae..f4192f7d3 100644 --- a/src/nhttpd/web/images/Makefile.am +++ b/src/nhttpd/web/images/Makefile.am @@ -1,26 +1,18 @@ installdir = $(DATADIR)/neutrino/httpd/images install_DATA = accept.png \ - addfolder.gif \ alert.gif \ - arrowdown.gif \ arrowdown.png \ arrowleft.png \ arrowright.png \ - arrowup.gif \ arrowup.png \ audiobar.png \ blank.gif \ - check_green.gif \ - chmod.gif \ - comment.gif \ + check_green.png \ comment.png \ cross.png \ - delete.gif \ - download.gif \ - elist.gif \ + elist.png \ epg.png \ - excl_yellow.gif \ exlink.gif \ ext_add.png \ ext_delete.png \ @@ -39,29 +31,18 @@ install_DATA = accept.png \ ftype_link.gif \ fullscreen.png \ help.gif \ - help_white.gif \ - hidden.gif \ - hidden.png \ - home-dir.gif \ - hourglas.gif \ info.png \ inlink.gif \ - live.gif \ - livelock.png \ live.png \ - live_popup.gif \ live_popup.png \ + livelock.png \ liveunlock.png \ - lock.gif \ - lock.png \ modify.png \ - new.gif \ new.png \ ok.gif \ pause.png \ play.png \ popup.png \ - properties.gif \ properties.png \ radio.png \ rc_cst_v1.jpg \ @@ -72,10 +53,8 @@ install_DATA = accept.png \ rc_cst_v6.jpg \ rc_dbox_nokia_old.jpg \ rc_dbox_philips.jpg \ - record.gif \ record.png \ - reload.gif \ - remotescreen.gif \ + reload.png \ remove.png \ rename.gif \ saveall.png \ @@ -93,27 +72,21 @@ install_DATA = accept.png \ tux-yweb.png \ udp_switch_off.png \ udp_switch_on.png \ - unlock.gif \ - unlock.png \ - upload.gif \ - visible.gif \ - visible.png \ - vlc.gif \ + vlc.png \ volumedown.png \ volumemute.png \ volumeunmute.png \ volumeup.png \ wait.gif \ - wget.gif \ - x_red.gif \ - y.png \ + wget.png \ + x_red.png \ zap.png # file manager install_DATA += chmod.png \ copy.gif \ cut.png \ - dir_up.gif \ + dir_up.png \ download.png \ film.png \ folder_add.png \ diff --git a/src/nhttpd/web/images/addfolder.gif b/src/nhttpd/web/images/addfolder.gif deleted file mode 100755 index b191cc40e..000000000 Binary files a/src/nhttpd/web/images/addfolder.gif and /dev/null differ diff --git a/src/nhttpd/web/images/arrowdown.gif b/src/nhttpd/web/images/arrowdown.gif deleted file mode 100644 index 76941dab9..000000000 Binary files a/src/nhttpd/web/images/arrowdown.gif and /dev/null differ diff --git a/src/nhttpd/web/images/arrowup.gif b/src/nhttpd/web/images/arrowup.gif deleted file mode 100644 index 505dab69a..000000000 Binary files a/src/nhttpd/web/images/arrowup.gif and /dev/null differ diff --git a/src/nhttpd/web/images/check_green.gif b/src/nhttpd/web/images/check_green.gif deleted file mode 100644 index 243b99b51..000000000 Binary files a/src/nhttpd/web/images/check_green.gif and /dev/null differ diff --git a/src/nhttpd/web/images/check_green.png b/src/nhttpd/web/images/check_green.png new file mode 100644 index 000000000..e8316bd95 Binary files /dev/null and b/src/nhttpd/web/images/check_green.png differ diff --git a/src/nhttpd/web/images/chmod.gif b/src/nhttpd/web/images/chmod.gif deleted file mode 100755 index 5710725f6..000000000 Binary files a/src/nhttpd/web/images/chmod.gif and /dev/null differ diff --git a/src/nhttpd/web/images/comment.gif b/src/nhttpd/web/images/comment.gif deleted file mode 100644 index 76db53250..000000000 Binary files a/src/nhttpd/web/images/comment.gif and /dev/null differ diff --git a/src/nhttpd/web/images/cross.png b/src/nhttpd/web/images/cross.png index 1514d51a3..cf92a2839 100644 Binary files a/src/nhttpd/web/images/cross.png and b/src/nhttpd/web/images/cross.png differ diff --git a/src/nhttpd/web/images/delete.gif b/src/nhttpd/web/images/delete.gif deleted file mode 100755 index 5a74564d0..000000000 Binary files a/src/nhttpd/web/images/delete.gif and /dev/null differ diff --git a/src/nhttpd/web/images/dir_up.gif b/src/nhttpd/web/images/dir_up.gif deleted file mode 100644 index 5394cc438..000000000 Binary files a/src/nhttpd/web/images/dir_up.gif and /dev/null differ diff --git a/src/nhttpd/web/images/dir_up.png b/src/nhttpd/web/images/dir_up.png new file mode 100644 index 000000000..61c870466 Binary files /dev/null and b/src/nhttpd/web/images/dir_up.png differ diff --git a/src/nhttpd/web/images/download.gif b/src/nhttpd/web/images/download.gif deleted file mode 100755 index f43af17b6..000000000 Binary files a/src/nhttpd/web/images/download.gif and /dev/null differ diff --git a/src/nhttpd/web/images/elist.gif b/src/nhttpd/web/images/elist.gif deleted file mode 100644 index d5281c0ee..000000000 Binary files a/src/nhttpd/web/images/elist.gif and /dev/null differ diff --git a/src/nhttpd/web/images/elist.png b/src/nhttpd/web/images/elist.png new file mode 100644 index 000000000..253521aa5 Binary files /dev/null and b/src/nhttpd/web/images/elist.png differ diff --git a/src/nhttpd/web/images/excl_yellow.gif b/src/nhttpd/web/images/excl_yellow.gif deleted file mode 100644 index e604db74e..000000000 Binary files a/src/nhttpd/web/images/excl_yellow.gif and /dev/null differ diff --git a/src/nhttpd/web/images/fb.png b/src/nhttpd/web/images/fb.png index e08d81e8b..834192bd6 100644 Binary files a/src/nhttpd/web/images/fb.png and b/src/nhttpd/web/images/fb.png differ diff --git a/src/nhttpd/web/images/help_white.gif b/src/nhttpd/web/images/help_white.gif deleted file mode 100644 index c8aa83cf1..000000000 Binary files a/src/nhttpd/web/images/help_white.gif and /dev/null differ diff --git a/src/nhttpd/web/images/hidden.gif b/src/nhttpd/web/images/hidden.gif deleted file mode 100644 index 0dde1842b..000000000 Binary files a/src/nhttpd/web/images/hidden.gif and /dev/null differ diff --git a/src/nhttpd/web/images/hidden.png b/src/nhttpd/web/images/hidden.png deleted file mode 100644 index fc5d6139e..000000000 Binary files a/src/nhttpd/web/images/hidden.png and /dev/null differ diff --git a/src/nhttpd/web/images/home-dir.gif b/src/nhttpd/web/images/home-dir.gif deleted file mode 100755 index 949be9d22..000000000 Binary files a/src/nhttpd/web/images/home-dir.gif and /dev/null differ diff --git a/src/nhttpd/web/images/hourglas.gif b/src/nhttpd/web/images/hourglas.gif deleted file mode 100644 index 1345110a8..000000000 Binary files a/src/nhttpd/web/images/hourglas.gif and /dev/null differ diff --git a/src/nhttpd/web/images/live.gif b/src/nhttpd/web/images/live.gif deleted file mode 100755 index 3f0c7c72a..000000000 Binary files a/src/nhttpd/web/images/live.gif and /dev/null differ diff --git a/src/nhttpd/web/images/live_popup.gif b/src/nhttpd/web/images/live_popup.gif deleted file mode 100755 index c1022b2b6..000000000 Binary files a/src/nhttpd/web/images/live_popup.gif and /dev/null differ diff --git a/src/nhttpd/web/images/lock.gif b/src/nhttpd/web/images/lock.gif deleted file mode 100644 index 720e21028..000000000 Binary files a/src/nhttpd/web/images/lock.gif and /dev/null differ diff --git a/src/nhttpd/web/images/lock.png b/src/nhttpd/web/images/lock.png deleted file mode 100644 index ecb50a93f..000000000 Binary files a/src/nhttpd/web/images/lock.png and /dev/null differ diff --git a/src/nhttpd/web/images/modify.png b/src/nhttpd/web/images/modify.png index fb2efb877..b73a4a3ed 100644 Binary files a/src/nhttpd/web/images/modify.png and b/src/nhttpd/web/images/modify.png differ diff --git a/src/nhttpd/web/images/new.gif b/src/nhttpd/web/images/new.gif deleted file mode 100644 index 1d739f13e..000000000 Binary files a/src/nhttpd/web/images/new.gif and /dev/null differ diff --git a/src/nhttpd/web/images/properties.gif b/src/nhttpd/web/images/properties.gif deleted file mode 100755 index 963ead1c9..000000000 Binary files a/src/nhttpd/web/images/properties.gif and /dev/null differ diff --git a/src/nhttpd/web/images/radio.png b/src/nhttpd/web/images/radio.png index fef6e8bad..192e88165 100644 Binary files a/src/nhttpd/web/images/radio.png and b/src/nhttpd/web/images/radio.png differ diff --git a/src/nhttpd/web/images/record.png b/src/nhttpd/web/images/record.png index 0cfd58596..570d58fc5 100644 Binary files a/src/nhttpd/web/images/record.png and b/src/nhttpd/web/images/record.png differ diff --git a/src/nhttpd/web/images/reload.gif b/src/nhttpd/web/images/reload.gif deleted file mode 100644 index 8268958a1..000000000 Binary files a/src/nhttpd/web/images/reload.gif and /dev/null differ diff --git a/src/nhttpd/web/images/reload.png b/src/nhttpd/web/images/reload.png new file mode 100644 index 000000000..70dce5192 Binary files /dev/null and b/src/nhttpd/web/images/reload.png differ diff --git a/src/nhttpd/web/images/remotescreen.gif b/src/nhttpd/web/images/remotescreen.gif deleted file mode 100644 index 3bc44a7ac..000000000 Binary files a/src/nhttpd/web/images/remotescreen.gif and /dev/null differ diff --git a/src/nhttpd/web/images/streaminfo.png b/src/nhttpd/web/images/streaminfo.png index 52a47319a..d1b964d26 100644 Binary files a/src/nhttpd/web/images/streaminfo.png and b/src/nhttpd/web/images/streaminfo.png differ diff --git a/src/nhttpd/web/images/unlock.gif b/src/nhttpd/web/images/unlock.gif deleted file mode 100644 index 10eb77697..000000000 Binary files a/src/nhttpd/web/images/unlock.gif and /dev/null differ diff --git a/src/nhttpd/web/images/unlock.png b/src/nhttpd/web/images/unlock.png deleted file mode 100644 index a7b566b1f..000000000 Binary files a/src/nhttpd/web/images/unlock.png and /dev/null differ diff --git a/src/nhttpd/web/images/upload.gif b/src/nhttpd/web/images/upload.gif deleted file mode 100755 index f76ba7c7a..000000000 Binary files a/src/nhttpd/web/images/upload.gif and /dev/null differ diff --git a/src/nhttpd/web/images/visible.gif b/src/nhttpd/web/images/visible.gif deleted file mode 100644 index 70c1c4b55..000000000 Binary files a/src/nhttpd/web/images/visible.gif and /dev/null differ diff --git a/src/nhttpd/web/images/visible.png b/src/nhttpd/web/images/visible.png deleted file mode 100644 index c260e1d96..000000000 Binary files a/src/nhttpd/web/images/visible.png and /dev/null differ diff --git a/src/nhttpd/web/images/vlc.gif b/src/nhttpd/web/images/vlc.gif deleted file mode 100755 index 2b18cb0e3..000000000 Binary files a/src/nhttpd/web/images/vlc.gif and /dev/null differ diff --git a/src/nhttpd/web/images/vlc.png b/src/nhttpd/web/images/vlc.png new file mode 100644 index 000000000..74a800c95 Binary files /dev/null and b/src/nhttpd/web/images/vlc.png differ diff --git a/src/nhttpd/web/images/wget.gif b/src/nhttpd/web/images/wget.gif deleted file mode 100644 index f99a5383b..000000000 Binary files a/src/nhttpd/web/images/wget.gif and /dev/null differ diff --git a/src/nhttpd/web/images/wget.png b/src/nhttpd/web/images/wget.png new file mode 100644 index 000000000..d1617425e Binary files /dev/null and b/src/nhttpd/web/images/wget.png differ diff --git a/src/nhttpd/web/images/x_red.gif b/src/nhttpd/web/images/x_red.gif deleted file mode 100644 index e5db0cf6f..000000000 Binary files a/src/nhttpd/web/images/x_red.gif and /dev/null differ diff --git a/src/nhttpd/web/images/x_red.png b/src/nhttpd/web/images/x_red.png new file mode 100644 index 000000000..cf92a2839 Binary files /dev/null and b/src/nhttpd/web/images/x_red.png differ diff --git a/src/nhttpd/web/images/y.png b/src/nhttpd/web/images/y.png deleted file mode 100644 index b1f19f549..000000000 Binary files a/src/nhttpd/web/images/y.png and /dev/null differ diff --git a/src/nhttpd/web/images/zap.png b/src/nhttpd/web/images/zap.png index d451ee061..87f15aaf9 100644 Binary files a/src/nhttpd/web/images/zap.png and b/src/nhttpd/web/images/zap.png differ