diff --git a/Dockerfile b/Dockerfile index baeede5..97c28c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,8 +15,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # PHP Upload-Limits fuer grosse Karate-Videos (500 MB) COPY config/php-uploads.ini /usr/local/etc/php/conf.d/zz-karate-uploads.ini -# Vereins-Logo ins Image kopieren -COPY assets/logo_goju-kai_Bleistift.png /var/www/html/resources/assets/logo_goju-kai_Bleistift.png +# Vereins-Logos & Favicon ins Image kopieren +COPY assets/ /var/www/html/resources/assets/ # DB-Initialisierungshilfe fuer Erst-Deployments auf dem Raspberry Pi COPY scripts/ensure-db-schema.php /usr/local/bin/ensure-db-schema.php diff --git a/assets/favicon-32x32.png b/assets/favicon-32x32.png new file mode 100644 index 0000000..a013c99 Binary files /dev/null and b/assets/favicon-32x32.png differ diff --git a/assets/logo.svg b/assets/logo.svg new file mode 100644 index 0000000..f42e5bc --- /dev/null +++ b/assets/logo.svg @@ -0,0 +1 @@ + diff --git a/config/LocalSettings.php b/config/LocalSettings.php index 1e740d9..fc41fdf 100644 --- a/config/LocalSettings.php +++ b/config/LocalSettings.php @@ -39,16 +39,18 @@ $wgServer = getenv( 'MW_SERVER' ) ?: ( $wgServer ?? 'https://www.gojukai-dojo.de $wgStylePath = "$wgScriptPath/skins"; $wgResourceBasePath = $wgScriptPath; -$wgLogo = "$wgResourceBasePath/resources/assets/logo_goju-kai_Bleistift.png"; +$wgLogo = "$wgResourceBasePath/resources/assets/logo.svg"; +$wgFavicon = "$wgResourceBasePath/resources/assets/favicon-32x32.png"; $wgLogos = [ '1x' => $wgLogo, + 'svg' => $wgLogo, 'icon' => $wgLogo, ]; // ---------------------------------------------------------------------------- // 2b. Individuelle Vereins-Anmeldeseite (Spezial:Anmelden) // ---------------------------------------------------------------------------- -$wgKarateLoginTitle = 'Goju-Kai Karate-Do'; +$wgKarateLoginTitle = 'Goju-Kai Dojo Heilbronn e.V.'; $wgKarateLoginSubtitle = 'Internes Vereins-Wiki & Technik-Videothek'; $wgKarateLoginNotice = 'Willkommen im Trainings- und Nachschlagewerk unseres Karate-Vereins! ' . 'Hier findest du alle Kata-, Bunkai- und Kihon-Lehrvideos, Prüfungsordnungen sowie unser Dojo-Wissen. ' diff --git a/docker-compose.dev-env.yml b/docker-compose.dev-env.yml index df28850..afb9358 100644 --- a/docker-compose.dev-env.yml +++ b/docker-compose.dev-env.yml @@ -41,6 +41,8 @@ services: volumes: - ./config/LocalSettings.php:/var/www/html/LocalSettings.php:ro - ./config/php-uploads.ini:/usr/local/etc/php/conf.d/zz-karate-uploads.ini:ro + - ./assets/logo.svg:/var/www/html/resources/assets/logo.svg:ro + - ./assets/favicon-32x32.png:/var/www/html/resources/assets/favicon-32x32.png:ro - ./assets/logo_goju-kai_Bleistift.png:/var/www/html/resources/assets/logo_goju-kai_Bleistift.png:ro - ./extensions-custom/KarateMedia:/var/www/html/extensions/KarateMedia:ro - dev-karatewiki-images:/var/www/html/images diff --git a/docker-compose.yml b/docker-compose.yml index 3a9c165..fed8a98 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,6 +43,8 @@ services: volumes: - ./config/LocalSettings.php:/var/www/html/LocalSettings.php:ro - ./config/php-uploads.ini:/usr/local/etc/php/conf.d/zz-karate-uploads.ini:ro + - ./assets/logo.svg:/var/www/html/resources/assets/logo.svg:ro + - ./assets/favicon-32x32.png:/var/www/html/resources/assets/favicon-32x32.png:ro - ./assets/logo_goju-kai_Bleistift.png:/var/www/html/resources/assets/logo_goju-kai_Bleistift.png:ro - ./extensions-custom/KarateMedia:/var/www/html/extensions/KarateMedia:ro - karatewiki-shared-images:/var/www/html/images