Use favicon from admin client

NatLibFi · Mar 12, 2024 · c042c6c · c042c6c
1 parent d76126c
commit c042c6c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/api/admin/config.py b/api/admin/config.py
@@ -19,12 +19,13 @@ class OperationalMode(str, Enum):
 class Configuration(LoggerMixin):
     APP_NAME = "E-kirjasto Collection Manager"
     PACKAGE_NAME = "@natlibfi/ekirjasto-circulation-admin"
-    PACKAGE_VERSION = "0.2.0"
+    PACKAGE_VERSION = "0.3.0"
 
     STATIC_ASSETS = {
         "admin_js": "circulation-admin.js",
         "admin_css": "circulation-admin.css",
         "admin_logo": "PalaceCollectionManagerLogo.svg",
+        "favicon": "favicon.ico",
     }
 
     # For proper operation, `package_url` MUST end with a slash ('/') and

diff --git a/api/admin/controller/view.py b/api/admin/controller/view.py
@@ -71,6 +71,7 @@ def __call__(self, collection, book, path=None):
         )
         admin_js = AdminClientConfig.lookup_asset_url(key="admin_js")
         admin_css = AdminClientConfig.lookup_asset_url(key="admin_css")
+        favicon_url = AdminClientConfig.lookup_asset_url(key="favicon")
 
         # Find the URL and text to use when rendering the Terms of
         # Service link in the footer.
@@ -101,6 +102,7 @@ def __call__(self, collection, book, path=None):
                 auth_type=auth_type,
                 admin_js=admin_js,
                 admin_css=admin_css,
+                favicon_url=favicon_url,
             )
         )
 

diff --git a/api/admin/templates.py b/api/admin/templates.py
@@ -4,7 +4,7 @@
 <head>
 <title>{{ app_name }}</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<link rel="shortcut icon" href="/images/favicon.ico">
+<link rel="shortcut icon" href="{{ favicon_url }}">
 <link href="{{ admin_css }}" rel="stylesheet" />
 </head>
 <body>

diff --git a/resources/images/favicon.ico b/resources/images/favicon.ico