From: Jaroslav Kysela Date: Fri, 6 May 2016 16:23:38 +0000 (+0200) Subject: change logo X-Git-Tag: v4.2.1~562 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d56cc1f404ff7d80d9c1918c9a805bbfc81e6b96;p=thirdparty%2Ftvheadend.git change logo Copyright: Matti DH Attribution-ShareAlike license: http://creativecommons.org/licenses/by-sa/4.0/ --- diff --git a/src/webui/extjs.c b/src/webui/extjs.c index f2b796896..59c9d5667 100644 --- a/src/webui/extjs.c +++ b/src/webui/extjs.c @@ -98,6 +98,7 @@ extjs_root(http_connection_t *hc, const char *remain, void *opaque) htsbuf_append_str(hq, "\n"); htsbuf_append_str(hq, "\n"); + htsbuf_append_str(hq, "\n"); htsbuf_append_str(hq, "\n"); if (tvheadend_webui_debug) { @@ -111,7 +112,7 @@ extjs_root(http_connection_t *hc, const char *remain, void *opaque) } extjs_exec(hq, "\ -Ext.BLANK_IMAGE_URL = \'" EXTJSPATH "/resources/images/default/s.gif';\r\n\ +Ext.BLANK_IMAGE_URL = \'" EXTJSPATH "/resources/images/default/s.gif';\n\ Ext.onReady(tvheadend.app.init, tvheadend.app);\ "); @@ -158,6 +159,7 @@ extjs_livetv(http_connection_t *hc, const char *remain, void *opaque) htsbuf_append_str(hq, "\n"); htsbuf_append_str(hq, "\n"); htsbuf_append_str(hq, "\n"); + htsbuf_append_str(hq, "\n"); htsbuf_append_str(hq, ""); htsbuf_append_str(hq, config.server_name); htsbuf_append_str(hq, "\n"); @@ -196,7 +198,7 @@ page_about(http_connection_t *hc, const char *remain, void *opaque) htsbuf_qprintf(hq, "
\n\
HTS Tvheadend %s
\n\

© 2006 - 2016 Andreas \303\226man, Jaroslav Kysela, Adam Sutton, et al.

\n\ -

\n\ +

\n\

https://tvheadend.org

\n", tvheadend_version); diff --git a/src/webui/static/htslogo.png b/src/webui/static/htslogo.png deleted file mode 100644 index 66fccddcd..000000000 Binary files a/src/webui/static/htslogo.png and /dev/null differ diff --git a/src/webui/static/img/logo.png b/src/webui/static/img/logo.png index 52edd4811..0c73d3fcf 100644 Binary files a/src/webui/static/img/logo.png and b/src/webui/static/img/logo.png differ diff --git a/src/webui/static/img/logobig.png b/src/webui/static/img/logobig.png index f0bb3997e..e50c52765 100644 Binary files a/src/webui/static/img/logobig.png and b/src/webui/static/img/logobig.png differ diff --git a/src/webui/webui.c b/src/webui/webui.c index dbe56fadb..d68cefcdf 100644 --- a/src/webui/webui.c +++ b/src/webui/webui.c @@ -249,6 +249,8 @@ page_static_file(http_connection_t *hc, const char *_remain, void *opaque) nogzip = 1; else if(!strcmp(postfix, "jpg")) nogzip = 1; + else if(!strcmp(postfix, "png")) + nogzip = 1; } fb_file *fp = fb_open(path, 0, (nogzip || gzip) ? 0 : 1); @@ -1736,8 +1738,7 @@ webui_static_content(const char *http_path, const char *source) static int favicon(http_connection_t *hc, const char *remain, void *opaque) { - http_redirect(hc, "static/htslogo.png", NULL, 0); - return 0; + return page_static_file(hc, "logo.png", (void *)"src/webui/static/img"); } /**