fix: add icon and logo path for white label

devscast-software · Jul 15, 2024 · 4ee240b · 4ee240b
1 parent dd72b80
commit 4ee240b
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 18 deletions.
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -39,6 +39,7 @@ public function addApplicationSection(ArrayNodeDefinition|NodeDefinition $root):
             ->scalarNode('icon_path')->isRequired()->end()
             ->scalarNode('version')->defaultValue('1.0.0')->end()
             ->scalarNode('copyrights')->defaultValue('')->end()
+            ->scalarNode('theme_color')->defaultValue('#000000')->end()
             ->end()
             ->end()
             ->end();

diff --git a/templates/component/layout/footer.html.twig b/templates/component/layout/footer.html.twig
@@ -5,7 +5,7 @@
                 © {{ 'now' | date('Y') }} <strong>{{ this.copyRight }}.</strong> Tous droits réservés.
             </div>
             <div class="nk-footer-copyright">
-                Développé par <a href="https://devscast.tech">Devscast</a>
+                Développé par <a href="https://devscast.tech" rel="nofollow">Devscast Software</a>
             </div>
         </div>
     </div>

diff --git a/templates/layout/base.html.twig b/templates/layout/base.html.twig
@@ -5,19 +5,21 @@
             <meta charset="utf-8">
             <meta name="author" content="devscast">
             <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-            <link rel="shortcut icon" href="{{ asset('/images/logo.png') }}">
-            <title>{% block title %}{% endblock %} | administration | {{ devscast_dashlite.application.name }}</title>
+            <link rel="shortcut icon" href="{{ asset(devscast_dashlite.application.icon_path) }}">
+            <title>{% block title %}{% endblock %} | {{ devscast_dashlite.application.name }}</title>
 
-            {# PWA support #}
-            <meta name="theme-color" content="#05FFBA">
-            <link rel="manifest" href="{{ asset('manifest.json') }}">
+            <twig:block name="pwa">
+                {# PWA support #}
+                <meta name="theme-color" content="#05FFBA">
+                <link rel="manifest" href="{{ asset('manifest.json') }}">
 
-            {# PWA Support IOS #}
-            <link rel="apple-touch-icon" sizes="192x192" href="{{ asset('images/icons/logo/maskable_icon_x192.png') }}">
-            <link rel="apple-touch-icon" sizes="512x512" href="{{ asset('images/icons/logo/maskable_icon_x512.png') }}">
-            <link rel="apple-touch-startup-image" href="{{ asset('images/icons/logo/maskable_icon.png') }}">
-            <meta name="apple-mobile-web-app-capable" content="yes">
-            <meta name="apple-mobile-web-app-status-bar-style" content="black">
+                {# PWA Support IOS #}
+                <link rel="apple-touch-icon" sizes="192x192" href="{{ asset('images/icons/logo/maskable_icon_x192.png') }}">
+                <link rel="apple-touch-icon" sizes="512x512" href="{{ asset('images/icons/logo/maskable_icon_x512.png') }}">
+                <link rel="apple-touch-startup-image" href="{{ asset('images/icons/logo/maskable_icon.png') }}">
+                <meta name="apple-mobile-web-app-capable" content="yes">
+                <meta name="apple-mobile-web-app-status-bar-style" content="black">
+            </twig:block>
 
             <twig:block name="meta"></twig:block>
 

diff --git a/templates/layout/error.html.twig b/templates/layout/error.html.twig
@@ -4,7 +4,7 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-        <link rel="shortcut icon" href="{{ asset('images/logo.png') }}">
+        <link rel="shortcut icon" href="{{ asset(devscast_dashlite.application.icon_path) }}">
         <title>{{ exception.statusCode }} {{ exception.statusText }} | {{ devscast_dashlite.application.name }}</title>
         <twig:block name="assets">
             {{ encore_entry_link_tags('admin') }}
@@ -14,7 +14,7 @@
         <style>
             .pattern {
                 background-color: #e5e5f7;
-                background-image:  repeating-radial-gradient( circle at 0 0, transparent 0, #e5e5f7 20px ), repeating-linear-gradient( rgba(31, 90, 94, 0.1), rgba(31, 90, 94, 0.2) );
+                background-image:  repeating-radial-gradient( circle at 0 0, transparent 0, #e5e5f7 20px ), repeating-linear-gradient( rgba(31, 90, 94, 0.1), rgb(27, 58, 103));
             }
         </style>
     </head>
@@ -26,10 +26,10 @@
                 <div class="nk-content ">
                     <div class="nk-block nk-block-middle wide-xs mx-auto">
                         <div class="nk-block-content nk-error-ld text-center">
-                            <img src="{{ asset('/logo/Logo2.png') }}" alt="logo" class="mb-5">
+                            <img src="{{ asset(devscast_dashlite.application.logo_path) }}" alt="logo" class="mb-5">
                             <h3 class="nk-error-title">{{ exception.statusCode }} {{ exception.statusText }}</h3>
-                            <p class="nk-error-text">Désolé nous n'arrivons pas à charger cette page...</p>
-                            <a href="/" class="btn btn-lg btn-primary mt-2">Rentrer sur terre</a>
+                            <p class="nk-error-text">Désolé, nous n'arrivons pas à charger cette page...</p>
+                            <a href="/" class="btn btn-lg btn-primary mt-2">Revenir à l'accueil</a>
                         </div>
                     </div>
                 </div>

diff --git a/templates/mailing/base.html.twig b/templates/mailing/base.html.twig
@@ -33,7 +33,7 @@
                     <tr>
                         <td class="header">
                             <a href="{{ absolute_url('/') }}" style="display: inline-block;">
-                                <img src="{{ absolute_url(asset('/logo/Logo1.png')) }}" class="logo" alt="Devscast Logo">
+                                <img src="{{ absolute_url({{ devscast_dashlite.application.logo_path }}) }}" class="logo" alt="{{ devscast_dashlite.application.name }}">
                             </a>
                         </td>
                         <!-- Email Body -->