From e6aa00a7a8f6ae4597eba81d8738868f090046fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20M=C3=BCller?= Date: Mon, 5 Aug 2024 11:31:21 +0200 Subject: [PATCH] fix: properly set public paths --- dcor_control/inspect/config_ckan.py | 14 ++++++++------ .../branding/medical/{ => public}/.gitignore | 0 .../branding/medical/{ => public}/favicon.ico | Bin .../branding/medical/{ => public}/favicon.svg | 0 .../medical/{ => public}/images/dcor-076.png | Bin .../medical/{ => public}/images/dcor-096.png | Bin .../medical/{ => public}/images/dcor-152.png | Bin .../medical/{ => public}/images/dcor-180.png | Bin .../branding/mpl/{ => public}/.gitignore | 0 .../branding/mpl/{ => public}/favicon.ico | Bin .../branding/mpl/{ => public}/favicon.svg | 0 .../branding/testing/{ => public}/.gitignore | 0 .../branding/testing/{ => public}/favicon.ico | Bin .../branding/testing/{ => public}/favicon.svg | 0 .../testing/{ => public}/images/dcor-076.png | Bin .../testing/{ => public}/images/dcor-096.png | Bin .../testing/{ => public}/images/dcor-152.png | Bin .../testing/{ => public}/images/dcor-180.png | Bin 18 files changed, 8 insertions(+), 6 deletions(-) rename dcor_control/resources/branding/medical/{ => public}/.gitignore (100%) rename dcor_control/resources/branding/medical/{ => public}/favicon.ico (100%) rename dcor_control/resources/branding/medical/{ => public}/favicon.svg (100%) rename dcor_control/resources/branding/medical/{ => public}/images/dcor-076.png (100%) rename dcor_control/resources/branding/medical/{ => public}/images/dcor-096.png (100%) rename dcor_control/resources/branding/medical/{ => public}/images/dcor-152.png (100%) rename dcor_control/resources/branding/medical/{ => public}/images/dcor-180.png (100%) rename dcor_control/resources/branding/mpl/{ => public}/.gitignore (100%) rename dcor_control/resources/branding/mpl/{ => public}/favicon.ico (100%) rename dcor_control/resources/branding/mpl/{ => public}/favicon.svg (100%) rename dcor_control/resources/branding/testing/{ => public}/.gitignore (100%) rename dcor_control/resources/branding/testing/{ => public}/favicon.ico (100%) rename dcor_control/resources/branding/testing/{ => public}/favicon.svg (100%) rename dcor_control/resources/branding/testing/{ => public}/images/dcor-076.png (100%) rename dcor_control/resources/branding/testing/{ => public}/images/dcor-096.png (100%) rename dcor_control/resources/branding/testing/{ => public}/images/dcor-152.png (100%) rename dcor_control/resources/branding/testing/{ => public}/images/dcor-180.png (100%) diff --git a/dcor_control/inspect/config_ckan.py b/dcor_control/inspect/config_ckan.py index b086d52..bbefed7 100644 --- a/dcor_control/inspect/config_ckan.py +++ b/dcor_control/inspect/config_ckan.py @@ -234,12 +234,14 @@ def get_expected_site_options(dcor_site_config_dir): if template_paths: cfg["ckan.ini"]["extra_template_paths"] = ",".join(template_paths) - # Branding: Set favicon - for pi in reversed(cfg.get("branding_paths", [])): - pf = (dcor_site_config_dir / pi).resolve() / "favicon.ico" - if pf.exists(): - cfg["ckan.ini"]["ckan.favicon"] = str(pf) - break + # Branding: Set extra public paths + public_paths = [] + for pi in cfg.get("branding_paths", []): + pp = (dcor_site_config_dir / pi).resolve() / "public" + if pp.exists(): + public_paths.append(str(pp)) + if public_paths: + cfg["ckan.ini"]["extra_public_paths"] = ",".join(public_paths) # Fill in template variables update_expected_ckan_options_templates(cfg) diff --git a/dcor_control/resources/branding/medical/.gitignore b/dcor_control/resources/branding/medical/public/.gitignore similarity index 100% rename from dcor_control/resources/branding/medical/.gitignore rename to dcor_control/resources/branding/medical/public/.gitignore diff --git a/dcor_control/resources/branding/medical/favicon.ico b/dcor_control/resources/branding/medical/public/favicon.ico similarity index 100% rename from dcor_control/resources/branding/medical/favicon.ico rename to dcor_control/resources/branding/medical/public/favicon.ico diff --git a/dcor_control/resources/branding/medical/favicon.svg b/dcor_control/resources/branding/medical/public/favicon.svg similarity index 100% rename from dcor_control/resources/branding/medical/favicon.svg rename to dcor_control/resources/branding/medical/public/favicon.svg diff --git a/dcor_control/resources/branding/medical/images/dcor-076.png b/dcor_control/resources/branding/medical/public/images/dcor-076.png similarity index 100% rename from dcor_control/resources/branding/medical/images/dcor-076.png rename to dcor_control/resources/branding/medical/public/images/dcor-076.png diff --git a/dcor_control/resources/branding/medical/images/dcor-096.png b/dcor_control/resources/branding/medical/public/images/dcor-096.png similarity index 100% rename from dcor_control/resources/branding/medical/images/dcor-096.png rename to dcor_control/resources/branding/medical/public/images/dcor-096.png diff --git a/dcor_control/resources/branding/medical/images/dcor-152.png b/dcor_control/resources/branding/medical/public/images/dcor-152.png similarity index 100% rename from dcor_control/resources/branding/medical/images/dcor-152.png rename to dcor_control/resources/branding/medical/public/images/dcor-152.png diff --git a/dcor_control/resources/branding/medical/images/dcor-180.png b/dcor_control/resources/branding/medical/public/images/dcor-180.png similarity index 100% rename from dcor_control/resources/branding/medical/images/dcor-180.png rename to dcor_control/resources/branding/medical/public/images/dcor-180.png diff --git a/dcor_control/resources/branding/mpl/.gitignore b/dcor_control/resources/branding/mpl/public/.gitignore similarity index 100% rename from dcor_control/resources/branding/mpl/.gitignore rename to dcor_control/resources/branding/mpl/public/.gitignore diff --git a/dcor_control/resources/branding/mpl/favicon.ico b/dcor_control/resources/branding/mpl/public/favicon.ico similarity index 100% rename from dcor_control/resources/branding/mpl/favicon.ico rename to dcor_control/resources/branding/mpl/public/favicon.ico diff --git a/dcor_control/resources/branding/mpl/favicon.svg b/dcor_control/resources/branding/mpl/public/favicon.svg similarity index 100% rename from dcor_control/resources/branding/mpl/favicon.svg rename to dcor_control/resources/branding/mpl/public/favicon.svg diff --git a/dcor_control/resources/branding/testing/.gitignore b/dcor_control/resources/branding/testing/public/.gitignore similarity index 100% rename from dcor_control/resources/branding/testing/.gitignore rename to dcor_control/resources/branding/testing/public/.gitignore diff --git a/dcor_control/resources/branding/testing/favicon.ico b/dcor_control/resources/branding/testing/public/favicon.ico similarity index 100% rename from dcor_control/resources/branding/testing/favicon.ico rename to dcor_control/resources/branding/testing/public/favicon.ico diff --git a/dcor_control/resources/branding/testing/favicon.svg b/dcor_control/resources/branding/testing/public/favicon.svg similarity index 100% rename from dcor_control/resources/branding/testing/favicon.svg rename to dcor_control/resources/branding/testing/public/favicon.svg diff --git a/dcor_control/resources/branding/testing/images/dcor-076.png b/dcor_control/resources/branding/testing/public/images/dcor-076.png similarity index 100% rename from dcor_control/resources/branding/testing/images/dcor-076.png rename to dcor_control/resources/branding/testing/public/images/dcor-076.png diff --git a/dcor_control/resources/branding/testing/images/dcor-096.png b/dcor_control/resources/branding/testing/public/images/dcor-096.png similarity index 100% rename from dcor_control/resources/branding/testing/images/dcor-096.png rename to dcor_control/resources/branding/testing/public/images/dcor-096.png diff --git a/dcor_control/resources/branding/testing/images/dcor-152.png b/dcor_control/resources/branding/testing/public/images/dcor-152.png similarity index 100% rename from dcor_control/resources/branding/testing/images/dcor-152.png rename to dcor_control/resources/branding/testing/public/images/dcor-152.png diff --git a/dcor_control/resources/branding/testing/images/dcor-180.png b/dcor_control/resources/branding/testing/public/images/dcor-180.png similarity index 100% rename from dcor_control/resources/branding/testing/images/dcor-180.png rename to dcor_control/resources/branding/testing/public/images/dcor-180.png