diff --git a/src/gui/dboxinfo.cpp b/src/gui/dboxinfo.cpp index d6996f8b4..c43e01f80 100644 --- a/src/gui/dboxinfo.cpp +++ b/src/gui/dboxinfo.cpp @@ -317,7 +317,6 @@ void CDBoxInfoWidget::paint() nameWidth += diff; } height = h_max(height, 0); - x = getScreenStartX(width); y = getScreenStartY(height); // fprintf(stderr, "CDBoxInfoWidget::CDBoxInfoWidget() x = %d, y = %d, width = %d height = %d\n", x, y, width, height); @@ -348,15 +347,23 @@ void CDBoxInfoWidget::paint() title += ": "; title + cpuinfo["machine"]; } + char ss[17]; + sprintf(ss, "%016llx", cs_get_serial()); + title += ", S/N "; + title += ss; #endif title += ": "; title += g_info.hw_caps->boxvendor; title += " "; title += g_info.hw_caps->boxname; #if HAVE_COOL_HARDWARE - title += " - "; + title += " ("; + title += g_info.hw_caps->boxarch; + title += ") - "; title += g_info.hw_caps->frontend; #endif + width = max(width, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(title, true) + 50); + x = getScreenStartX(width); CComponentsHeader header(x, ypos, width, hheight, title, NEUTRINO_ICON_SHELL); header.paint(CC_SAVE_SCREEN_NO); diff --git a/src/nhttpd/web/languages/Deutsch b/src/nhttpd/web/languages/Deutsch index 8f5cf6c27..716ff9a4d 100644 --- a/src/nhttpd/web/languages/Deutsch +++ b/src/nhttpd/web/languages/Deutsch @@ -74,7 +74,7 @@ main.info=Info main.info_desc=Information über das yWeb, Version main.live_tv_desc=LiveTV main.live_tv_popup_desc=LiveTV Popup -main.remote_full_desc=Fernbedinung & OSD Vollbild +main.remote_full_desc=Fernbedienung & OSD Vollbild main.stream_to_vlc_client_desc=Live TV direkt im VLC Client main.version=Version @@ -85,7 +85,7 @@ bc.menue.control_desc=Box Funktionen (Neustart, Aufnahmemodus, ...) bc.menue.control=Steuerung bc.menue.messages_desc=Nachricht an die Box senden bc.menue.messages=Nachrichten -bc.menue.remote_desc=Fernbedinung +bc.menue.remote_desc=Fernbedienung bc.menue.remote=Fernbedienung bc.menue.lcd_screenshot_desc=LCD Screenshot erstellen bc.menue.lcd_screenshot=LCD Screenshot diff --git a/src/nhttpd/yhttpd_mods/mod_yparser.cpp b/src/nhttpd/yhttpd_mods/mod_yparser.cpp index fb42c643d..b75231fc7 100644 --- a/src/nhttpd/yhttpd_mods/mod_yparser.cpp +++ b/src/nhttpd/yhttpd_mods/mod_yparser.cpp @@ -528,10 +528,14 @@ std::string CyParser::YWeb_cgi_cmd(CyhookHandler *hh, std::string ycmd) { } else yresult = "ycgi-type unknown"; } else if (!hh->ParamList[ycmd].empty()) { +#if 0 if ((hh->ParamList[ycmd]).find("script") == std::string::npos) yresult = hh->ParamList[ycmd]; else yresult = ""; +#else + yresult = hh->ParamList[ycmd]; +#endif } return yresult;