]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
projects / thirdparty / tvheadend.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4169e8e)
change logo
authorJaroslav Kysela <perex@perex.cz>
Fri, 6 May 2016 16:23:38 +0000 (18:23 +0200)
committerJaroslav Kysela <perex@perex.cz>
Fri, 6 May 2016 16:23:38 +0000 (18:23 +0200)
Copyright: Matti DH
Attribution-ShareAlike license: http://creativecommons.org/licenses/by-sa/4.0/

src/webui/extjs.c patch | blob | blame | history
src/webui/static/htslogo.png [deleted file] patch | blob | blame | history
src/webui/static/img/logo.png patch | blob | blame | history
src/webui/static/img/logobig.png patch | blob | blame | history
src/webui/webui.c patch | blob | blame | history

diff --git a/src/webui/extjs.c b/src/webui/extjs.c
index f2b79689647fd0ae0c9727bf587043372c228bcd..59c9d5667effe0a9d9e49b88187e0eafe38ef21f 100644 (file)
--- 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, "<html>\n");
   htsbuf_append_str(hq, "<head>\n");
 
+  htsbuf_append_str(hq, "<link rel=\"shortcut icon\" href=\"static/img/logo.png\" type=\"image/png\">\n");
   htsbuf_append_str(hq, "<meta name=\"apple-itunes-app\" content=\"app-id=638900112\">\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, "<!DOCTYPE html>\n");
   htsbuf_append_str(hq, "<html>\n");
   htsbuf_append_str(hq, "<head>\n");
+  htsbuf_append_str(hq, "<link rel=\"shortcut icon\" href=\"static/img/logo.png\" type=\"image/png\">\n");
   htsbuf_append_str(hq, "<title>");
   htsbuf_append_str(hq, config.server_name);
   htsbuf_append_str(hq, "</title>\n");
@@ -196,7 +198,7 @@ page_about(http_connection_t *hc, const char *remain, void *opaque)
   htsbuf_qprintf(hq, "<center class=\"about-tab\">\n\
 <div class=\"about-title\">HTS Tvheadend %s</div>\n\
 <p>&copy; 2006 - 2016 Andreas \303\226man, Jaroslav Kysela, Adam Sutton, et al.</p>\n\
-<p><img src=\"static/img/logobig.png\"></p>\n\
+<p><img width=\"25%%\" height=\"34%%\" src=\"static/img/logobig.png\"></p>\n\
 <p><a href=\"https://tvheadend.org\">https://tvheadend.org</a></p>\n",
     tvheadend_version);
 
diff --git a/src/webui/static/htslogo.png b/src/webui/static/htslogo.png
deleted file mode 100644 (file)
index 66fccdd..0000000
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 52edd4811f50e7dbb9da6b1cb5de2feff7376cee..0c73d3fcf5eaa136dce26ad4c06d53c01eae44cd 100644 (file)
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 f0bb3997e7e1359cb2dd0981e34770f8fe7dc2d5..e50c52765f783586db813cf6072f5e94c38d1f47 100644 (file)
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 dbe56fadb397caf6c7c9704103b7fd118bdc2c8a..d68cefcdf1e020f07f4d173f91b590ffb5b002ae 100644 (file)
--- 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");
 }
 
 /**
Mirror of https://github.com/tvheadend/tvheadend.git