From bbf3ff09272d4fa40ecad37db308ef625130f2bc Mon Sep 17 00:00:00 2001 From: Heikki Hannikainen Date: Sun, 5 Jan 2014 14:31:27 +0200 Subject: [PATCH] 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. --- src/Makefile.in | 2 +- src/{web => gfx}/aprsc-logo1.png | Bin src/{web => gfx}/aprsc-logo2.png | Bin src/http.c | 6 ++++-- src/web/{aprsc-logo3.png => aprsc-logo.png} | Bin src/web/index.html | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) rename src/{web => gfx}/aprsc-logo1.png (100%) rename src/{web => gfx}/aprsc-logo2.png (100%) rename src/web/{aprsc-logo3.png => aprsc-logo.png} (100%) diff --git a/src/Makefile.in b/src/Makefile.in index a41ea6b..04d0b7e 100644 --- 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 \ diff --git a/src/web/aprsc-logo1.png b/src/gfx/aprsc-logo1.png similarity index 100% rename from src/web/aprsc-logo1.png rename to src/gfx/aprsc-logo1.png diff --git a/src/web/aprsc-logo2.png b/src/gfx/aprsc-logo2.png similarity index 100% rename from src/web/aprsc-logo2.png rename to src/gfx/aprsc-logo2.png diff --git a/src/http.c b/src/http.c index 33a4658..d5e4746 100644 --- 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" }, diff --git a/src/web/aprsc-logo3.png b/src/web/aprsc-logo.png similarity index 100% rename from src/web/aprsc-logo3.png rename to src/web/aprsc-logo.png diff --git a/src/web/index.html b/src/web/index.html index 496eb57..1963acc 100644 --- a/src/web/index.html +++ b/src/web/index.html @@ -11,7 +11,7 @@ -
+
aprsc status