diff --git a/typo3/sysext/beuser/Resources/Private/Layouts/Default.html b/typo3/sysext/beuser/Resources/Private/Layouts/Default.html index 43895493b12ab9d40aefe05250978f417c80a73b..f9e814a33c33df64e72472a3dd9db2869875a226 100644 --- a/typo3/sysext/beuser/Resources/Private/Layouts/Default.html +++ b/typo3/sysext/beuser/Resources/Private/Layouts/Default.html @@ -2,6 +2,10 @@ <f:render section="headline" /> -<f:flashMessages /> +<f:flashMessages as="flashMessages"> + <f:for each="{flashMessages}" as="flashMessage"> + {flashMessage} + </f:for> +</f:flashMessages> <f:render section="content" /> diff --git a/typo3/sysext/core/Classes/Messaging/FlashMessage.php b/typo3/sysext/core/Classes/Messaging/FlashMessage.php index 186f2544859af94454a17d8972b5edeee51728b1..719b49abc6fbe8d6f7cf7a3cc2658e5e8660d96d 100644 --- a/typo3/sysext/core/Classes/Messaging/FlashMessage.php +++ b/typo3/sysext/core/Classes/Messaging/FlashMessage.php @@ -134,4 +134,13 @@ class FlashMessage extends AbstractMessage </div>'; return $message; } + + /** + * Renders the flash message, makes it possible to render a flashMessage in a fluid view. + * + * @return string + */ + public function __toString() { + return $this->render(); + } } diff --git a/typo3/sysext/documentation/Resources/Private/Layouts/Default.html b/typo3/sysext/documentation/Resources/Private/Layouts/Default.html index 7fdff46c7d5c3a1b4c48e58b6df9faf8469e056a..f3c0e8fc55540c94d3209317d6aca18a87fd3414 100644 --- a/typo3/sysext/documentation/Resources/Private/Layouts/Default.html +++ b/typo3/sysext/documentation/Resources/Private/Layouts/Default.html @@ -1,5 +1,9 @@ <div class="typo3-documentation"> <f:render section="module-headline" /> - <f:flashMessages /> + <f:flashMessages as="flashMessages"> + <f:for each="{flashMessages}" as="flashMessage"> + {flashMessage} + </f:for> + </f:flashMessages> <f:render section="Content" /> </div> diff --git a/typo3/sysext/extensionmanager/Resources/Private/Layouts/Main.html b/typo3/sysext/extensionmanager/Resources/Private/Layouts/Main.html index f60c3d81104f3b69f5349a79913d0f47d3e6cfdd..2dca2733c34d9483bf0737934b8f50b288191809 100644 --- a/typo3/sysext/extensionmanager/Resources/Private/Layouts/Main.html +++ b/typo3/sysext/extensionmanager/Resources/Private/Layouts/Main.html @@ -15,6 +15,10 @@ }" /> <f:render section="headline" /> -<f:flashMessages /> +<f:flashMessages as="flashMessages"> + <f:for each="{flashMessages}" as="flashMessage"> + {flashMessage} + </f:for> +</f:flashMessages> <f:render section="content" /> diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/UnresolvedDependencies.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/UnresolvedDependencies.html index 42aa024a8a4eab7b9e4621cc188bbcdb3583b493..3ed2957e747aa52fea68fddc85e988d44c130cff 100644 --- a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/UnresolvedDependencies.html +++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/UnresolvedDependencies.html @@ -7,7 +7,12 @@ </f:section> <f:section name="content"> - <f:flashMessages /> + <f:flashMessages as="flashMessages"> + <f:for each="{flashMessages}" as="flashMessage"> + {flashMessage} + </f:for> + </f:flashMessages> + <f:render partial="List/UnresolvedDependencies" arguments="{_all}" /> <f:be.infobox title="{f:translate(key: 'dependencyCheck.unresolvedDependencies.title')}" state="1"> <f:render partial="List/UnresolvedDependenciesMessage" /> @@ -18,4 +23,4 @@ <f:link.action action="installExtensionWithoutSystemDependencyCheck" controller="Action" arguments="{extensionKey: extension.extensionKey}" class="btn btn-default t3js-dependencies disabled onClickMaskExtensionManager"> <span class="t3-icon t3-icon-actions t3-icon-dialog-error"> </span> <f:translate key="dependencyCheck.unresolvedDependencies.proceed" /> </f:link.action> -</f:section> \ No newline at end of file +</f:section> diff --git a/typo3/sysext/filelist/Resources/Private/Layouts/Default.html b/typo3/sysext/filelist/Resources/Private/Layouts/Default.html index 162d368b06d5c72ceca2498939cd8e8a803e8cc2..3cf7a5f552f1eaa7363435ac0fa04b64a750665f 100644 --- a/typo3/sysext/filelist/Resources/Private/Layouts/Default.html +++ b/typo3/sysext/filelist/Resources/Private/Layouts/Default.html @@ -1,8 +1,12 @@ <f:render section="headline" /> -<f:flashMessages queueIdentifier="core.template.flashMessages" /> +<f:flashMessages as="flashMessages" queueIdentifier="core.template.flashMessages"> + <f:for each="{flashMessages}" as="flashMessage"> + {flashMessage} + </f:for> +</f:flashMessages> <f:render section="content" /> <div class="t3js-drag-uploader" data-target-folder="{folderIdentifier}" data-progress-container="#typo3-filelist" data-dropzone-trigger=".t3js-drag-uploader-trigger" data-dropzone-target=".t3js-module-body h1:first" data-file-deny-pattern="{fileDenyPattern}" data-max-file-size="{maxFileSize}" - ></div> \ No newline at end of file + ></div> diff --git a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/StatisticDetails.html b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/StatisticDetails.html index add1c334cf0d1cfe0bd0508875fa7c71fdfb4440..3b255f558f65265a292ef4e6d2c992156f092424 100644 --- a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/StatisticDetails.html +++ b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/StatisticDetails.html @@ -5,7 +5,11 @@ <f:section name="Content"> <p class="lead"><f:translate key="administration.document.description"/></p> - <f:flashMessages /> + <f:flashMessages as="flashMessages"> + <f:for each="{flashMessages}" as="flashMessage"> + {flashMessage} + </f:for> + </f:flashMessages> <f:if condition="{phashRow}"> <f:then> <table class="table table-striped table-hover"> @@ -192,4 +196,4 @@ </f:form> </f:if> -</f:section> \ No newline at end of file +</f:section> diff --git a/typo3/sysext/lang/Resources/Private/Templates/Language/ListLanguages.html b/typo3/sysext/lang/Resources/Private/Templates/Language/ListLanguages.html index d25cd9cbbda063758fbdb19f914b8c818fc6b7e5..96e0a1393e545e21708e240015687964500fea9c 100644 --- a/typo3/sysext/lang/Resources/Private/Templates/Language/ListLanguages.html +++ b/typo3/sysext/lang/Resources/Private/Templates/Language/ListLanguages.html @@ -9,7 +9,11 @@ <h1> <f:translate key="header.languages"/> </h1> - <f:flashMessages/> + <f:flashMessages as="flashMessages"> + <f:for each="{flashMessages}" as="flashMessage"> + {flashMessage} + </f:for> + </f:flashMessages> <form class="form-inline"> <div class="form-group"> <f:form.textfield name="typo3-language-searchfield" placeholder="{f:translate(key:'table.search')}" diff --git a/typo3/sysext/lang/Resources/Private/Templates/Language/ListTranslations.html b/typo3/sysext/lang/Resources/Private/Templates/Language/ListTranslations.html index 1f7eea7c5876f6adc473827fdb21ba8d17818444..a79c0f7d668df9a36bc9ca259dadd8262dfa584b 100644 --- a/typo3/sysext/lang/Resources/Private/Templates/Language/ListTranslations.html +++ b/typo3/sysext/lang/Resources/Private/Templates/Language/ListTranslations.html @@ -2,7 +2,11 @@ <f:section name="content"> <h1><f:translate key="header.translations" /></h1> - <f:flashMessages /> + <f:flashMessages as="flashMessages"> + <f:for each="{flashMessages}" as="flashMessage"> + {flashMessage} + </f:for> + </f:flashMessages> <form class="form-inline"> <div class="form-group"> <f:form.textfield name="typo3-language-searchfield" placeholder="{f:translate(key:'table.search')}" id="typo3-language-searchfield" value="{search}" class="form-control t3js-language-searchfield" /> diff --git a/typo3/sysext/recycler/Resources/Private/Layouts/Default.html b/typo3/sysext/recycler/Resources/Private/Layouts/Default.html index cb361978eab940e0c4f66a97cfefcdc6905c6a96..2732da54ccdc79ce5b1a52ffc98391a78d770099 100644 --- a/typo3/sysext/recycler/Resources/Private/Layouts/Default.html +++ b/typo3/sysext/recycler/Resources/Private/Layouts/Default.html @@ -1,4 +1,8 @@ <f:be.pageRenderer includeRequireJsModules="{0:'TYPO3/CMS/Recycler/Recycler'}" /> <h1><f:translate key="title" /></h1> -<f:flashMessages /> +<f:flashMessages as="flashMessages"> + <f:for each="{flashMessages}" as="flashMessage"> + {flashMessage} + </f:for> +</f:flashMessages> <f:render section="content" /> diff --git a/typo3/sysext/workspaces/Resources/Private/Layouts/Module.html b/typo3/sysext/workspaces/Resources/Private/Layouts/Module.html index 9fe98a141f4884845f707701da05b0f044c39b1a..b5a215ae98ff9cf5ba42c6ba9423e4f57c4d4c1b 100644 --- a/typo3/sysext/workspaces/Resources/Private/Layouts/Module.html +++ b/typo3/sysext/workspaces/Resources/Private/Layouts/Module.html @@ -1,5 +1,9 @@ <f:if condition="{pageTitle}"><h1>{pageTitle}</h1></f:if> -<f:flashMessages /> +<f:flashMessages as="flashMessages"> + <f:for each="{flashMessages}" as="flashMessage"> + {flashMessage} + </f:for> +</f:flashMessages> <div id="workspacetabs"></div> <div class="well well-sm"><f:render section="main" /></div> -<f:if condition="{showLegend}"><f:render partial="legend" /></f:if> \ No newline at end of file +<f:if condition="{showLegend}"><f:render partial="legend" /></f:if> diff --git a/typo3/sysext/workspaces/Resources/Private/Layouts/Nodoc.html b/typo3/sysext/workspaces/Resources/Private/Layouts/Nodoc.html index 7fcd5a34da60c5a30e4e53d230286bb3aa49e2b5..3bc0693a361a78f7a5e31c38f7631b8e9a49ec5d 100644 --- a/typo3/sysext/workspaces/Resources/Private/Layouts/Nodoc.html +++ b/typo3/sysext/workspaces/Resources/Private/Layouts/Nodoc.html @@ -3,7 +3,11 @@ <div id="typo3-docbody"> <div id="typo3-inner-docbody"> - <f:flashMessages /> + <f:flashMessages as="flashMessages"> + <f:for each="{flashMessages}" as="flashMessage"> + {flashMessage} + </f:for> + </f:flashMessages> <f:render section="main"/> </div>