diff --git a/pages/UI.php b/pages/UI.php index 0de5428f1..dee5a471f 100644 --- a/pages/UI.php +++ b/pages/UI.php @@ -41,7 +41,7 @@ function DisplayWelcomePopup(WebPage $oP): void $oWelcomePopupService = WelcomePopupService::GetInstance(); $aProvidersMessagesData = $oWelcomePopupService->GetMessages(); if (count($aProvidersMessagesData) > 0) { - TwigHelper::RenderIntoPage($oP, APPROOT."/", "templates/application/welcome_popup/layout", [ + TwigHelper::RenderIntoPage($oP, APPROOT."/", "templates/application/welcome-popup/layout", [ "aProvidersMessagesData" => $aProvidersMessagesData, "sEndpointAbsURIForAcknowledgeMessage" => Router::GetInstance()->GenerateUrl(WelcomePopupController::ROUTE_NAMESPACE . ".acknowledge_message"), ]); diff --git a/sources/Application/WelcomePopup/Message.php b/sources/Application/WelcomePopup/Message.php index 18bf3a9fe..80face188 100644 --- a/sources/Application/WelcomePopup/Message.php +++ b/sources/Application/WelcomePopup/Message.php @@ -20,7 +20,7 @@ use utils; */ class Message { /** @var string Default TWIG template */ - protected const DEFAULT_TWIG_TEMPLATE_REL_PATH = 'templates/application/welcome_popup/templates/left-title-description-right-illustration.html.twig'; + protected const DEFAULT_TWIG_TEMPLATE_REL_PATH = 'templates/application/welcome-popup/templates/left-title-description-right-illustration.html.twig'; /** @var string Unique ID of the message within its provider */ protected readonly string $sId; diff --git a/sources/Application/WelcomePopup/MessageFactory.php b/sources/Application/WelcomePopup/MessageFactory.php index f6df8268f..2c357da86 100644 --- a/sources/Application/WelcomePopup/MessageFactory.php +++ b/sources/Application/WelcomePopup/MessageFactory.php @@ -38,7 +38,7 @@ class MessageFactory { $sIllustrationAbsURI, [], $iImportance, - "templates/application/welcome_popup/templates/left-title-description-right-illustration.html.twig" + "templates/application/welcome-popup/templates/left-title-description-right-illustration.html.twig" ); } @@ -61,7 +61,7 @@ class MessageFactory { $sIllustrationAbsURI, [], $iImportance, - "templates/application/welcome_popup/templates/left-illustration-right-title-description.html.twig" + "templates/application/welcome-popup/templates/left-illustration-right-title-description.html.twig" ); } @@ -74,7 +74,7 @@ class MessageFactory { $sIllustrationAbsURI, [], $iImportance, - "templates/application/welcome_popup/templates/left-illustration-as-svg-markup-right-title-description.html.twig" + "templates/application/welcome-popup/templates/left-illustration-as-svg-markup-right-title-description.html.twig" ); } @@ -87,7 +87,7 @@ class MessageFactory { $sIllustrationAbsURI, [], $iImportance, - "templates/application/welcome_popup/templates/left-title-description-right-illustration-as-svg-markup.html.twig" + "templates/application/welcome-popup/templates/left-title-description-right-illustration-as-svg-markup.html.twig" ); } diff --git a/templates/application/welcome_popup/layout.html.twig b/templates/application/welcome-popup/layout.html.twig similarity index 100% rename from templates/application/welcome_popup/layout.html.twig rename to templates/application/welcome-popup/layout.html.twig diff --git a/templates/application/welcome_popup/layout.ready.js.twig b/templates/application/welcome-popup/layout.ready.js.twig similarity index 100% rename from templates/application/welcome_popup/layout.ready.js.twig rename to templates/application/welcome-popup/layout.ready.js.twig diff --git a/templates/application/welcome_popup/templates/layout.html.twig b/templates/application/welcome-popup/templates/layout.html.twig similarity index 100% rename from templates/application/welcome_popup/templates/layout.html.twig rename to templates/application/welcome-popup/templates/layout.html.twig diff --git a/templates/application/welcome_popup/templates/left-illustration-as-svg-markup-right-title-description.html.twig b/templates/application/welcome-popup/templates/left-illustration-as-svg-markup-right-title-description.html.twig similarity index 80% rename from templates/application/welcome_popup/templates/left-illustration-as-svg-markup-right-title-description.html.twig rename to templates/application/welcome-popup/templates/left-illustration-as-svg-markup-right-title-description.html.twig index 3eee62f31..18ed960a0 100644 --- a/templates/application/welcome_popup/templates/left-illustration-as-svg-markup-right-title-description.html.twig +++ b/templates/application/welcome-popup/templates/left-illustration-as-svg-markup-right-title-description.html.twig @@ -1,4 +1,4 @@ -{% extends 'templates/application/welcome_popup/templates/left-illustration-right-title-description.html.twig' %} +{% extends 'templates/application/welcome-popup/templates/left-illustration-right-title-description.html.twig' %} {% block wpMessagIllustrationInner %}
diff --git a/templates/application/welcome_popup/templates/left-illustration-right-title-description.html.twig b/templates/application/welcome-popup/templates/left-illustration-right-title-description.html.twig similarity index 65% rename from templates/application/welcome_popup/templates/left-illustration-right-title-description.html.twig rename to templates/application/welcome-popup/templates/left-illustration-right-title-description.html.twig index 6be2c91f0..cccd80ed3 100644 --- a/templates/application/welcome_popup/templates/left-illustration-right-title-description.html.twig +++ b/templates/application/welcome-popup/templates/left-illustration-right-title-description.html.twig @@ -1,3 +1,3 @@ -{% extends 'templates/application/welcome_popup/templates/layout.html.twig' %} +{% extends 'templates/application/welcome-popup/templates/layout.html.twig' %} {% block wpMessageContentExtraCssClasses %}{{ parent() }} ibo-is-illustration-on-left-side{% endblock %} diff --git a/templates/application/welcome_popup/templates/left-title-description-right-illustration-as-svg-markup.html.twig b/templates/application/welcome-popup/templates/left-title-description-right-illustration-as-svg-markup.html.twig similarity index 80% rename from templates/application/welcome_popup/templates/left-title-description-right-illustration-as-svg-markup.html.twig rename to templates/application/welcome-popup/templates/left-title-description-right-illustration-as-svg-markup.html.twig index be787a90c..ebfee4df9 100644 --- a/templates/application/welcome_popup/templates/left-title-description-right-illustration-as-svg-markup.html.twig +++ b/templates/application/welcome-popup/templates/left-title-description-right-illustration-as-svg-markup.html.twig @@ -1,4 +1,4 @@ -{% extends 'templates/application/welcome_popup/templates/left-title-description-right-illustration.html.twig' %} +{% extends 'templates/application/welcome-popup/templates/left-title-description-right-illustration.html.twig' %} {% block wpMessagIllustrationInner %}
diff --git a/templates/application/welcome_popup/templates/left-title-description-right-illustration.html.twig b/templates/application/welcome-popup/templates/left-title-description-right-illustration.html.twig similarity index 69% rename from templates/application/welcome_popup/templates/left-title-description-right-illustration.html.twig rename to templates/application/welcome-popup/templates/left-title-description-right-illustration.html.twig index e7523c5cf..7b56ce599 100644 --- a/templates/application/welcome_popup/templates/left-title-description-right-illustration.html.twig +++ b/templates/application/welcome-popup/templates/left-title-description-right-illustration.html.twig @@ -1,3 +1,3 @@ -{% extends 'templates/application/welcome_popup/templates/layout.html.twig' %} +{% extends 'templates/application/welcome-popup/templates/layout.html.twig' %} {# Nothing there, it's exactly the default template. The file only exists to ease people understanding what the default layout is. #} \ No newline at end of file