From 5f1c43aac968e5e752402b49b5752185e3cb0eaf Mon Sep 17 00:00:00 2001
From: Bertrand Zuchuat <bertrand.zuchuat@rero.ch>
Date: Tue, 23 Jul 2024 10:59:53 +0200
Subject: [PATCH] fix: favicon

Co-Authored-by: Bertrand Zuchuat <bertrand.zuchuat@rero.ch>
---
 .../apple-touch-icon-144-precomposed.png      | Bin 4728 -> 0 bytes
 .../{site.webmanifest => manifest.json}       |   0
 .../theme/templates/rero_ils/_favicon.html    |  24 ++++++++++++++++++
 rero_ils/theme/templates/rero_ils/page.html   |  12 ++-------
 .../templates/rero_ils/professional.html      |   3 ++-
 5 files changed, 28 insertions(+), 11 deletions(-)
 delete mode 100644 rero_ils/theme/static/apple-touch-icon-144-precomposed.png
 rename rero_ils/theme/static/{site.webmanifest => manifest.json} (100%)
 create mode 100644 rero_ils/theme/templates/rero_ils/_favicon.html

diff --git a/rero_ils/theme/static/apple-touch-icon-144-precomposed.png b/rero_ils/theme/static/apple-touch-icon-144-precomposed.png
deleted file mode 100644
index bd53973c9c88d7274f808667f08273c38dd92853..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4728
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
O094;<Dptx{hWrO~<p5g%

diff --git a/rero_ils/theme/static/site.webmanifest b/rero_ils/theme/static/manifest.json
similarity index 100%
rename from rero_ils/theme/static/site.webmanifest
rename to rero_ils/theme/static/manifest.json
diff --git a/rero_ils/theme/templates/rero_ils/_favicon.html b/rero_ils/theme/templates/rero_ils/_favicon.html
new file mode 100644
index 0000000000..9e35a44416
--- /dev/null
+++ b/rero_ils/theme/templates/rero_ils/_favicon.html
@@ -0,0 +1,24 @@
+{# -*- coding: utf-8 -*-
+
+  RERO ILS
+  Copyright (C) 2024 RERO
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Affero General Public License as published by
+  the Free Software Foundation, version 3 of the License.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  GNU Affero General Public License for more details.
+
+  You should have received a copy of the GNU Affero General Public License
+  along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+#}
+
+<!--[if IE]><link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}" /><![endif]-->
+<link rel="apple-touch-icon" sizes="180x180" href="{{ url_for('static', filename="apple-touch-icon.png") }}" />
+<link rel="icon" type="image/png" sizes="32x32" href="{{ url_for('static', filename="favicon-32x32.png") }}" />
+<link rel="icon" type="image/png" sizes="16x16" href="{{ url_for('static', filename="favicon-16x16.png") }}" />
+<link rel="manifest" href="{{ url_for('static', filename="manifest.json") }}" />
diff --git a/rero_ils/theme/templates/rero_ils/page.html b/rero_ils/theme/templates/rero_ils/page.html
index 047f79825e..dce272d3d1 100644
--- a/rero_ils/theme/templates/rero_ils/page.html
+++ b/rero_ils/theme/templates/rero_ils/page.html
@@ -1,7 +1,7 @@
 {# -*- coding: utf-8 -*-
 
   RERO ILS
-  Copyright (C) 2019 RERO
+  Copyright (C) 2019-2024 RERO
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU Affero General Public License as published by
@@ -52,7 +52,6 @@
     <title>{{ title }}: {{ org_name }}</title>
     {%- endblock head_title %}
     {%- block head_links %}
-    <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}" />
     {%- if keywords %}
     <link rel="canonical" href="{{ canonical_url }}" />{% endif %}
     {%- block head_links_langs %}
@@ -62,14 +61,7 @@
     {%- endfor %}
     {%- endif %}
     {%- endblock %}
-    {%- block head_apple_icons %}
-    {# TODO: generate the appropriate files #}
-    {%- for size in [144, 114, 72, 57] %}
-    {%- set icon_name = 'apple-touch-icon-%d-precomposed.png' | format(size) %}
-    <link rel="apple-touch-icon-precomposed" sizes="{{ size }}x{{ size }}"
-      href="{{ url_for('static', filename=icon_name) }}" />
-    {%- endfor %}
-    {%- endblock head_apple_icons %}
+    {% include 'rero_ils/_favicon.html' %}
     {%- endblock head_links %}
     {%- block header %}{% endblock header %}
     {%- block css %}
diff --git a/rero_ils/theme/templates/rero_ils/professional.html b/rero_ils/theme/templates/rero_ils/professional.html
index 81a1248191..756dffe33a 100644
--- a/rero_ils/theme/templates/rero_ils/professional.html
+++ b/rero_ils/theme/templates/rero_ils/professional.html
@@ -1,7 +1,7 @@
 {# -*- coding: utf-8 -*-
 
 RERO ILS
-Copyright (C) 2019 RERO
+Copyright (C) 2019-2024 RERO
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
@@ -25,6 +25,7 @@
     <title>Admin</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <base href="/professional">
+    {% include 'rero_ils/_favicon.html' %}
     {{ node_assets('@rero/rero-ils-ui/dist/admin', ['styles.*css'], 'css') }}
     {{ node_assets('@rero/rero-ils-ui/dist/admin', ['styles.*css'], 'css', 'media="print" onload="this.media=\'all\'"') }}
 </head>