Skip to content
Snippets Groups Projects
Commit a15d819f authored by Frank Nägler's avatar Frank Nägler Committed by Mathias Schreiber
Browse files

[TASK] Streamline output of flashMessages in BE

Resolves: #71249
Relaeses: master
Change-Id: I5be260c96e6ae689a6716efe6a059e697f184872
Reviewed-on: https://review.typo3.org/44479


Reviewed-by: default avatarAndreas Fernandez <typo3@scripting-base.de>
Tested-by: default avatarAndreas Fernandez <typo3@scripting-base.de>
Reviewed-by: default avatarMathias Schreiber <mathias.schreiber@wmdb.de>
Tested-by: default avatarMathias Schreiber <mathias.schreiber@wmdb.de>
parent 843d6337
Branches
Tags
No related merge requests found
Showing
with 69 additions and 15 deletions
......@@ -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" />
......@@ -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();
}
}
<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>
......@@ -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" />
......@@ -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">&nbsp;</span> <f:translate key="dependencyCheck.unresolvedDependencies.proceed" />
</f:link.action>
</f:section>
\ No newline at end of file
</f:section>
<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>
......@@ -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>
......@@ -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')}"
......
......@@ -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" />
......
<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" />
<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>
......@@ -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>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment