Always use aprsc-logo.png for the logo name, no logo version in filename.

* Allow loading with aprsc-logo2.png and aprsc-logo3.png for a few versions.
2014-01-05 14:31:27 +02:00 · 2014-01-05 14:31:27 +02:00 · bbf3ff0927
parent 78c6701d14
commit bbf3ff0927
6 changed files with 6 additions and 4 deletions
--- a/src/Makefile.in
+++ b/src/Makefile.in
@ -107,7 +107,7 @@ WEBFILES = \
 	src/web/aprsc.css src/web/aprsc.js \
 	src/web/index.html \
 	src/web/favicon.ico \
-	src/web/aprsc-logo3.png \
+	src/web/aprsc-logo.png \
 	src/web/aprsc-joulukissa.jpg \
 	src/web/excanvas.min.js \
 	src/web/jquery.flot.min.js \
--- a/src/gfx/aprsc-logo1.png
+++ b/src/gfx/aprsc-logo1.png
--- a/src/gfx/aprsc-logo2.png
+++ b/src/gfx/aprsc-logo2.png
--- a/src/http.c
+++ b/src/http.c
@ -83,8 +83,10 @@ static struct http_static_t http_static_files[] = {
 	{ "/favicon.ico", "favicon.ico" },
 	{ "/aprsc.css", "aprsc.css" },
 	{ "/aprsc.js", "aprsc.js" },
-	{ "/aprsc-logo2.png", "aprsc-logo2.png" },
-	{ "/aprsc-logo3.png", "aprsc-logo3.png" },
+	/* allow old index.html versions to load the new logo */
+	{ "/aprsc-logo.png", "aprsc-logo.png" },
+	{ "/aprsc-logo2.png", "aprsc-logo.png" },
+	{ "/aprsc-logo3.png", "aprsc-logo.png" },
 	{ "/aprsc-joulukissa.jpg", "aprsc-joulukissa.jpg" },
 	{ "/excanvas.min.js", "excanvas.min.js" },
 	{ "/jquery.flot.min.js", "jquery.flot.min.js" },
--- a/src/web/aprsc-logo3.png
+++ b/src/web/aprsc-logo3.png
--- a/src/web/index.html
+++ b/src/web/index.html
@ -11,7 +11,7 @@

 <body onclick='ttip_hide();'>

-<div style='float: right;'><img id="logo" src="/aprsc-logo3.png" /></div>
+<div style='float: right;'><img id="logo" src="/aprsc-logo.png" /></div>
 <div class="page_title" id="title"><span id='serverid'></span> aprsc status <span id='upt'></span></div>
 <div id='status'></div>
 <div id='alarms' style='display: none;'></div>