From 662c791026def8aa5bfcf717450787e560cd5bcf Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 18 Mar 2019 16:07:05 +0000
Subject: [PATCH] Generate favicon.ico and Apple Icons from logo

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 .gitignore              |   2 ++
 Makefile.am             |  18 ++++++++++++++++++
 configure.ac            |   3 +++
 src/static/favicon.ico  | Bin 4286 -> 0 bytes
 src/templates/base.html |   6 ++++++
 5 files changed, 29 insertions(+)
 delete mode 100644 src/static/favicon.ico

diff --git a/.gitignore b/.gitignore
index 53e64486..bb7d9e71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,8 @@
 /src/scss/main.css
 /src/scripts/ipfire.org
 /src/scripts/ipfire.org-webapp
+/src/static/favicon.ico
+/src/static/img/apple-touch-icon-*-precomposed.png
 /src/systemd/ipfire.org-webapp-*.service
 /ipfire.org.conf.sample
 Makefile
diff --git a/Makefile.am b/Makefile.am
index 322348da..b0a34eaf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -882,6 +882,14 @@ static_fonts_DATA = \
 static_fontsdir = $(staticdir)/fonts
 
 static_images_DATA = \
+	src/static/img/apple-touch-icon-192x192-precomposed.png \
+	src/static/img/apple-touch-icon-180x180-precomposed.png \
+	src/static/img/apple-touch-icon-152x152-precomposed.png \
+	src/static/img/apple-touch-icon-144x144-precomposed.png \
+	src/static/img/apple-touch-icon-120x120-precomposed.png \
+	src/static/img/apple-touch-icon-76x76-precomposed.png \
+	src/static/img/apple-touch-icon-72x72-precomposed.png \
+	src/static/img/apple-touch-icon-60x60-precomposed.png \
 	src/static/img/default-avatar.jpg \
 	src/static/img/ipfire-tux.png \
 	src/static/img/iuse-not-found.png \
@@ -982,6 +990,16 @@ src/scss/main.css: $(SCSS_FILES) Makefile
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 		$(SASSC) --style compressed $< > $@
 
+src/static/favicon.ico: src/static/img/ipfire-tux.png Makefile
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+	$(CONVERT) $< -background none -flatten -density 1200 \
+		-define icon:auto-resize=64,48,32,16 $@
+
+src/static/img/apple-touch-icon-%-precomposed.png: src/static/img/ipfire-tux.png Makefile
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+	$(CONVERT) -background none -flatten -density 1200 -bordercolor none -border 5%x5% \
+		-resize $(patsubst src/static/img/apple-touch-icon-%-precomposed.png,%,$@) $< $@
+
 # Docker
 .PHONY: docker
 docker: Dockerfile
diff --git a/configure.ac b/configure.ac
index 937a5823..97e5f21c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,9 @@ AM_PATH_PYTHON([3.4])
 # scss
 AC_CHECK_PROG(SASSC, [sassc], [sassc])
 
+# convert from ImageMagick
+AC_CHECK_PROG(CONVERT, [convert], [convert])
+
 # ------------------------------------------------------------------------------
 
 AC_ARG_WITH([systemd],
diff --git a/src/static/favicon.ico b/src/static/favicon.ico
deleted file mode 100644
index 565ba7bd6b7546f86104540ad6e9b468202ea4ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc-jL100001

literal 4286
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
D{@WKG

diff --git a/src/templates/base.html b/src/templates/base.html
index 021c15fc..d9ee78a0 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -8,6 +8,12 @@
 		<meta name="keywords" content="Linux, Firewall, IPFire, Security, IPCop, Open Source, Free, ARM, VPN, Proxy, IDS, IPS" />
 		<meta name="description" content="{{ _("IPFire is a free firewall distribution based on Linux.") }}" />
 
+		<link rel="icon" sizes="192x192" href="{{ static_url("img/apple-touch-icon-192x192-precomposed.png") }}">
+		{% for res in ("72x72", "76x76", "120x120", "144x144", "152x152", "180x180") %}
+			<link rel="apple-touch-icon-precomposed" sizes="{{ res }}" href="{{ static_url("img/apple-touch-icon-%s-precomposed.png" % res )}}">
+		{% end %}
+		<link rel="apple-touch-icon-precomposed" href="{{ static_url("img/apple-touch-icon-60x60-precomposed.png") }}">
+
 		<!-- styling stuff -->
 		<link rel="stylesheet" type="text/css" href="{{ static_url("main.css") }}" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
-- 
2.39.2