From 70a7ed3a9a8e4462618c81a47122d6825ab7d70f Mon Sep 17 00:00:00 2001
From: Helmut Hummel <helmut.hummel@typo3.org>
Date: Sun, 30 Nov 2014 16:39:32 +0100
Subject: [PATCH] [!!!][FEATURE] Flash message view helper add deferred
 rendering

Deprecate renderMode in favor of a flexible deferred
rendering of flash messages in the Fluid template.

This means that flash messages should no longer contain HTML tags
but only plain text, if rendered by the default rendering.

The rendered output will by default now be a <ul> list.
The usage of renderMode in the Core is removed and styles are
adapted to match the previous output.

The core is adapted to now use htmlspecialchars in a controller context
for user input. Encoding is now taken care of during rendering of
the Fluid template.

Resolves: #63453
Releases: master
Change-Id: Ie02d2e1441ca2b3c7c159ffa917f7040f50327b5
Reviewed-on: http://review.typo3.org/34818
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
---
 .../Controller/PermissionController.php       |   4 +-
 .../Resources/Private/Layouts/Default.html    |   2 +-
 .../Resources/Private/Layouts/Permission.html |  11 +-
 ...ngedRenderingOfFlashMessagesViewHelper.rst |  40 +++++++
 ...rModeAttributeOfFlashMessageViewHelper.rst |  40 +++++++
 ...plateSupportForFlashMessagesViewHelper.rst |  27 +++++
 .../Private/Templates/Content/Edit.html       |   2 +-
 .../Private/Templates/Content/List.html       |   2 +-
 .../Private/Templates/Content/New.html        |   2 +-
 .../Private/Templates/Content/Show.html       |   2 +-
 .../Classes/Controller/DocumentController.php |  25 +---
 .../Resources/Private/Layouts/Default.html    |   2 +-
 .../Classes/Controller/ActionController.php   |   6 +-
 .../Classes/Controller/DownloadController.php |   6 +-
 .../Classes/Controller/ListController.php     |   2 +-
 .../UploadExtensionFileController.php         |   8 +-
 .../Classes/Utility/DownloadUtility.php       |   2 +-
 .../Utility/Parser/ExtensionXmlPullParser.php |   2 +-
 .../Utility/Parser/ExtensionXmlPushParser.php |   4 +-
 .../Utility/Parser/MirrorXmlPullParser.php    |   2 +-
 .../Utility/Parser/MirrorXmlPushParser.php    |   4 +-
 .../Classes/Utility/Repository/Helper.php     |   4 +-
 .../Private/Templates/Distribution/Show.html  |   2 +-
 .../Private/Templates/List/Distributions.html |   2 +-
 .../Private/Templates/List/Index.html         |   2 +-
 .../List/UnresolvedDependencies.html          |   2 +-
 .../ViewHelpers/FlashMessagesViewHelper.php   | 111 +++++++++++++-----
 .../Administration/StatisticDetails.html      |   2 +-
 .../Templates/Language/ListLanguages.html     |  93 +++++++++------
 .../Templates/Language/ListTranslations.html  |   4 +-
 .../Templates/Backend/Configuration.html      |   2 -
 .../Resources/Private/Layouts/Default.html    |   2 +-
 .../Resources/Private/Layouts/Default.html    |   3 +-
 .../Resources/Private/Layouts/Module.html     |   2 +-
 .../Resources/Private/Layouts/Nodoc.html      |   2 +-
 35 files changed, 301 insertions(+), 127 deletions(-)
 create mode 100644 typo3/sysext/core/Documentation/Changelog/master/Breaking-63453-ChangedRenderingOfFlashMessagesViewHelper.rst
 create mode 100644 typo3/sysext/core/Documentation/Changelog/master/Deprecation-63453-DeprecateRenderModeAttributeOfFlashMessageViewHelper.rst
 create mode 100644 typo3/sysext/core/Documentation/Changelog/master/Feature-63453-TemplateSupportForFlashMessagesViewHelper.rst

diff --git a/typo3/sysext/beuser/Classes/Controller/PermissionController.php b/typo3/sysext/beuser/Classes/Controller/PermissionController.php
index 3d613fa01765..88dfa4ad60af 100644
--- a/typo3/sysext/beuser/Classes/Controller/PermissionController.php
+++ b/typo3/sysext/beuser/Classes/Controller/PermissionController.php
@@ -120,8 +120,8 @@ public function indexAction() {
 		if ($this->getBackendUser()->workspace != 0) {
 			// Adding section with the permission setting matrix:
 			$this->addFlashMessage(
-				LocalizationUtility::translate('LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:WorkspaceWarningText', 'beuser'),
-				LocalizationUtility::translate('LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:WorkspaceWarning', 'beuser'),
+				'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:WorkspaceWarningText',
+				'LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:WorkspaceWarning',
 				FlashMessage::WARNING
 			);
 		}
diff --git a/typo3/sysext/beuser/Resources/Private/Layouts/Default.html b/typo3/sysext/beuser/Resources/Private/Layouts/Default.html
index c691e8bfa89c..28bfc821420d 100644
--- a/typo3/sysext/beuser/Resources/Private/Layouts/Default.html
+++ b/typo3/sysext/beuser/Resources/Private/Layouts/Default.html
@@ -26,7 +26,7 @@
 			<div id="typo3-inner-docbody">
 				<f:render section="headline" />
 
-				<f:flashMessages renderMode="div" />
+				<f:flashMessages />
 
 				<f:render section="content" />
 			</div>
diff --git a/typo3/sysext/beuser/Resources/Private/Layouts/Permission.html b/typo3/sysext/beuser/Resources/Private/Layouts/Permission.html
index 604545f4fa5b..da2918ae6298 100644
--- a/typo3/sysext/beuser/Resources/Private/Layouts/Permission.html
+++ b/typo3/sysext/beuser/Resources/Private/Layouts/Permission.html
@@ -23,7 +23,16 @@
 			<div id="typo3-inner-docbody">
 				<f:render section="headline" />
 
-				<f:flashMessages renderMode="div" />
+				<f:flashMessages as="flashMessages">
+					<ul class="typo3-flashMessages">
+						<f:for each="{flashMessages}" as="flashMessage">
+							<li class="alert {flashMessage.class}">
+								<h4><f:translate id="{flashMessage.title}" extensionName="beuser" /></h4>
+								<f:translate id="{flashMessage.message}" extensionName="beuser" />
+							</li>
+						</f:for>
+					</ul>
+				</f:flashMessages>
 
 				<f:render section="content" />
 			</div>
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-63453-ChangedRenderingOfFlashMessagesViewHelper.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-63453-ChangedRenderingOfFlashMessagesViewHelper.rst
new file mode 100644
index 000000000000..70734ec33d2f
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/master/Breaking-63453-ChangedRenderingOfFlashMessagesViewHelper.rst
@@ -0,0 +1,40 @@
+===============================================================
+Breaking: #63453 - Changed rendering of FlashMessagesViewHelper
+===============================================================
+
+Description
+===========
+
+The default (``renderMode="ul"``) rendering output of the ``FlashMessagesViewHelper`` has been changed.
+
+By default the view helper rendered an unordered list, each list item containing one message.
+This output has been adjusted and more markup is added.
+
+
+Impact
+======
+
+You may see unexpected formatting of flash messages.
+
+
+Affected Installations
+======================
+
+Any template using the ``FlashMessagesViewHelper`` unless the attribute ``renderMode`` is set to "div".
+Be aware, though, that the ``renderMode`` attribute is deprecated.
+
+
+Migration
+=========
+
+Add a custom rendering template for the flash messages, like outlined in the example, to obtain the same output as before.
+
+.. code-block:: html
+
+	<f:flashMessages as="flashMessages">
+		<ul class="myFlashMessages">
+			<f:for each="{flashMessages}" as="flashMessage">
+				<li>{flashMessage.message}</li>
+			</f:for>
+		</ul>
+	</f:flashMessages>
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-63453-DeprecateRenderModeAttributeOfFlashMessageViewHelper.rst b/typo3/sysext/core/Documentation/Changelog/master/Deprecation-63453-DeprecateRenderModeAttributeOfFlashMessageViewHelper.rst
new file mode 100644
index 000000000000..2d6847682fdd
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/master/Deprecation-63453-DeprecateRenderModeAttributeOfFlashMessageViewHelper.rst
@@ -0,0 +1,40 @@
+===============================================================================
+Deprecation: #63453 - Deprecate renderMode attribute of FlashMessagesViewHelper
+===============================================================================
+
+Description
+===========
+
+Deprecated renderMode in favor of a flexible deferred rendering of flash messages in the Fluid template.
+This means that flash messages should no longer contain HTML, but the HTML output can and should be adjusted in the Fluid template.
+
+
+Impact
+======
+
+Using renderMode on FlashMessage output will throw a deprecation warning.
+
+
+Affected Installations
+======================
+
+All instances using the renderMode attribute in FlashMessage output.
+
+
+Migration
+=========
+
+Adjust flash messages to contain only plain text and remove the renderMode attribute in the output Templates.
+
+.. code-block:: html
+
+	<f:flashMessages as="flashMessages">
+		<ul class="typo3-flashMessages">
+			<f:for each="{flashMessages}" as="flashMessage">
+				<li class="alert {flashMessage.class}">
+					<h4>{flashMessage.title}</h4>
+					{flashMessage.message}
+				</li>
+			</f:for>
+		</ul>
+	</f:flashMessages>
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Feature-63453-TemplateSupportForFlashMessagesViewHelper.rst b/typo3/sysext/core/Documentation/Changelog/master/Feature-63453-TemplateSupportForFlashMessagesViewHelper.rst
new file mode 100644
index 000000000000..412430504fd5
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/master/Feature-63453-TemplateSupportForFlashMessagesViewHelper.rst
@@ -0,0 +1,27 @@
+==============================================================
+Feature: #63453 - Template support for FlashMessagesViewHelper
+==============================================================
+
+Description
+===========
+
+Template support for ``FlashMessagesViewHelper`` has been added.
+This allows to define a custom rendering for flash messages.
+
+The new attribute ``as`` for the ``FlashMessagesViewHelper`` allows to specify a variable name,
+which can be used within the view helper's child elements to access the flash messages.
+
+Example usage:
+
+.. code-block:: html
+
+	<f:flashMessages as="flashMessages">
+		<ul class="myFlashMessages">
+			<f:for each="{flashMessages}" as="flashMessage">
+				<li class="alert {flashMessage.class}">
+					<h4>{flashMessage.title}</h4>
+					<span class="fancy-icon">{flashMessage.message}</span>
+				</li>
+			</f:for>
+		</ul>
+	</f:flashMessages>
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/Edit.html b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/Edit.html
index bb2d18871e8d..21b6c046b0d8 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/Edit.html
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/Edit.html
@@ -15,7 +15,7 @@
 <f:section name="main">
 <h1>Edit Content</h1>
 
-<f:flashMessages renderMode="div" />
+<f:flashMessages />
 
 <f:render partial="FormErrors" arguments="{object:Content}" />
 
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/List.html b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/List.html
index bcba1b1d6cdf..996a16f3ef59 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/List.html
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/List.html
@@ -15,7 +15,7 @@
 <f:section name="main">
 <h1>Listing for Content</h1>
 
-<f:flashMessages renderMode="div" />
+<f:flashMessages />
 
 <table  class="tx_irretutorial" >
 	<tr>
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/New.html b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/New.html
index 64f19c639b4c..9b8feb5aed38 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/New.html
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/New.html
@@ -15,7 +15,7 @@
 <f:section name="main">
 <h1>New Content</h1>
 
-<f:flashMessages renderMode="div" />
+<f:flashMessages />
 
 <f:render partial="FormErrors" arguments="{object:Content}" />
 
diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/Show.html b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/Show.html
index dfb338e7fd9f..98c18ea45ef7 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/Show.html
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial/Resources/Private/Templates/Content/Show.html
@@ -16,7 +16,7 @@
 <h1>Single View for Content</h1>
 <f:debug>{content}</f:debug>
 
-<f:flashMessages renderMode="div" />
+<f:flashMessages />
 <f:render partial="Content/Properties" arguments="{content:content}" />
 <f:link.action action="list">Back to list</f:link.action><br />
 <f:link.action action="new">New Content</f:link.action>
diff --git a/typo3/sysext/documentation/Classes/Controller/DocumentController.php b/typo3/sysext/documentation/Classes/Controller/DocumentController.php
index 1c0481526f84..57784c9b03ab 100644
--- a/typo3/sysext/documentation/Classes/Controller/DocumentController.php
+++ b/typo3/sysext/documentation/Classes/Controller/DocumentController.php
@@ -149,23 +149,17 @@ public function fetchAction($url, $key, $version = NULL) {
 		$language = $this->languageUtility->getDocumentationLanguage();
 		try {
 			$result = $this->documentationService->fetchNearestDocument($url, $key, $version ?: 'latest', $language);
-
 			if ($result) {
-				/** @var FlashMessage $message */
-				$message = GeneralUtility::makeInstance(
-					FlashMessage::class,
+				$this->addFlashMessage(
 					\TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate(
 						'downloadSucceeded',
 						'documentation'
 					),
 					'',
-					\TYPO3\CMS\Core\Messaging\AbstractMessage::OK,
-					TRUE
+					FlashMessage::OK
 				);
 			} else {
-				/** @var FlashMessage $message */
-				$message = GeneralUtility::makeInstance(
-					FlashMessage::class,
+				$this->addFlashMessage(
 					\TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate(
 						'downloadFailedNoArchive',
 						'documentation'
@@ -174,16 +168,11 @@ public function fetchAction($url, $key, $version = NULL) {
 						'downloadFailed',
 						'documentation'
 					),
-					FlashMessage::ERROR,
-					TRUE
+					FlashMessage::ERROR
 				);
-
 			}
-			$this->controllerContext->getFlashMessageQueue()->enqueue($message);
 		} catch (\Exception $e) {
-			/** @var FlashMessage $message */
-			$message = GeneralUtility::makeInstance(
-				FlashMessage::class,
+			$this->addFlashMessage(
 				\TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate(
 					'downloadFailedDetails',
 					'documentation',
@@ -197,10 +186,8 @@ public function fetchAction($url, $key, $version = NULL) {
 					'downloadFailed',
 					'documentation'
 				),
-				FlashMessage::ERROR,
-				TRUE
+				FlashMessage::ERROR
 			);
-			$this->controllerContext->getFlashMessageQueue()->enqueue($message);
 		}
 		$this->redirect('download');
 	}
diff --git a/typo3/sysext/documentation/Resources/Private/Layouts/Default.html b/typo3/sysext/documentation/Resources/Private/Layouts/Default.html
index c210a5ffc889..b39f7997de22 100644
--- a/typo3/sysext/documentation/Resources/Private/Layouts/Default.html
+++ b/typo3/sysext/documentation/Resources/Private/Layouts/Default.html
@@ -19,7 +19,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody" class="typo3-documentation">
 			<f:render section="module-headline" />
-			<f:flashMessages renderMode="div" />
+			<f:flashMessages />
 			<f:render section="Content" />
 		</div>
 	</div>
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/ActionController.php b/typo3/sysext/extensionmanager/Classes/Controller/ActionController.php
index 1019342508c6..ccfdf5fc9ee9 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/ActionController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/ActionController.php
@@ -67,9 +67,9 @@ protected function toggleExtensionInstallationStateAction($extensionKey) {
 				}
 			}
 		} catch (\TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException $e) {
-			$this->addFlashMessage(htmlspecialchars($e->getMessage()), '', \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
+			$this->addFlashMessage($e->getMessage(), '', \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
 		} catch (\TYPO3\CMS\Core\Package\Exception\PackageStatesFileNotWritableException $e) {
-			$this->addFlashMessage(htmlspecialchars($e->getMessage()), '', \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
+			$this->addFlashMessage($e->getMessage(), '', \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
 		}
 		$this->redirect('index', 'List', NULL, array(self::TRIGGER_RefreshModuleMenu => TRUE));
 	}
@@ -104,7 +104,7 @@ protected function removeExtensionAction($extension) {
 				)
 			);
 		} catch (\TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException $e) {
-			$this->addFlashMessage(htmlspecialchars($e->getMessage()), '', \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
+			$this->addFlashMessage($e->getMessage(), '', \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
 		}
 
 		return '';
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php b/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
index 35030049108d..3adebe91de1b 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
@@ -168,7 +168,7 @@ public function installDistributionAction(\TYPO3\CMS\Extensionmanager\Domain\Mod
 			// FlashMessage that extension is installed
 			$this->addFlashMessage(
 				\TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('distribution.welcome.message', 'extensionmanager')
-					. ' <strong>' . $extension->getExtensionKey() . '</strong>',
+					. $extension->getExtensionKey(),
 				\TYPO3\CMS\Extbase\Utility\LocalizationUtility::translate('distribution.welcome.headline', 'extensionmanager')
 			);
 
@@ -206,11 +206,11 @@ protected function updateExtensionAction() {
 				$this->managementService->downloadMainExtension($extension);
 			}
 			$this->addFlashMessage(
-				htmlspecialchars($this->translate('extensionList.updateFlashMessage.body', array($extensionKey))),
+				$this->translate('extensionList.updateFlashMessage.body', array($extensionKey)),
 				$this->translate('extensionList.updateFlashMessage.title')
 			);
 		} catch (\Exception $e) {
-			$this->addFlashMessage(htmlspecialchars($e->getMessage()), '', FlashMessage::ERROR);
+			$this->addFlashMessage($e->getMessage(), '', FlashMessage::ERROR);
 		}
 
 		return '';
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/ListController.php b/typo3/sysext/extensionmanager/Classes/Controller/ListController.php
index 2f1f06130445..7dfcaebfbcdb 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/ListController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/ListController.php
@@ -132,7 +132,7 @@ public function distributionsAction() {
 					$repositoryHelper->updateExtList();
 				}
 			} catch (ExtensionManagerException $e) {
-				$this->addFlashMessage(htmlspecialchars($e->getMessage()), $e->getCode(), FlashMessage::ERROR);
+				$this->addFlashMessage($e->getMessage(), $e->getCode(), FlashMessage::ERROR);
 			}
 
 			$officialDistributions = $this->extensionRepository->findAllOfficialDistributions();
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/UploadExtensionFileController.php b/typo3/sysext/extensionmanager/Classes/Controller/UploadExtensionFileController.php
index 2974c966eb84..10495e3192ed 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/UploadExtensionFileController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/UploadExtensionFileController.php
@@ -100,14 +100,14 @@ public function extractAction($overwrite = FALSE) {
 			$emConfiguration = $this->configurationUtility->getCurrentConfiguration('extensionmanager');
 			if (!$emConfiguration['automaticInstallation']['value']) {
 				$this->addFlashMessage(
-					htmlspecialchars($this->translate('extensionList.uploadFlashMessage.message', array($extensionData['extKey']))),
-					htmlspecialchars($this->translate('extensionList.uploadFlashMessage.title')),
+					$this->translate('extensionList.uploadFlashMessage.message', array($extensionData['extKey'])),
+					$this->translate('extensionList.uploadFlashMessage.title'),
 					FlashMessage::OK
 				);
 			} else {
 				if ($this->activateExtension($extensionData['extKey'])) {
 					$this->addFlashMessage(
-						htmlspecialchars($this->translate('extensionList.installedFlashMessage.message', array($extensionData['extKey']))),
+						$this->translate('extensionList.installedFlashMessage.message', array($extensionData['extKey'])),
 						'',
 						FlashMessage::OK
 					);
@@ -119,7 +119,7 @@ public function extractAction($overwrite = FALSE) {
 			throw $exception;
 		} catch (\Exception $exception) {
 			$this->removeExtensionAndRestoreFromBackup($fileName);
-			$this->addFlashMessage(htmlspecialchars($exception->getMessage()), '', FlashMessage::ERROR);
+			$this->addFlashMessage($exception->getMessage(), '', FlashMessage::ERROR);
 		}
 		$this->redirect('index', 'List', NULL, array(self::TRIGGER_RefreshModuleMenu => TRUE));
 	}
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/DownloadUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/DownloadUtility.php
index 4f3711cb9333..a64c1d65753d 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/DownloadUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/DownloadUtility.php
@@ -67,7 +67,7 @@ public function download(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension $ext
 	 */
 	public function setDownloadPath($downloadPath) {
 		if (!in_array($downloadPath, \TYPO3\CMS\Extensionmanager\Domain\Model\Extension::returnAllowedInstallTypes())) {
-			throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException(htmlspecialchars($downloadPath) . ' not in allowed download paths', 1344766387);
+			throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException($downloadPath . ' not in allowed download paths', 1344766387);
 		}
 		$this->downloadPath = $downloadPath;
 	}
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPullParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPullParser.php
index d814e5b3211c..41b8ba0707a2 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPullParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPullParser.php
@@ -58,7 +58,7 @@ public function parseXml($file) {
 			throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException('Unable to create XML parser.', 1342640540);
 		}
 		if ($this->objXml->open($file, 'utf-8') === FALSE) {
-			throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException(sprintf('Unable to open file resource %s.', htmlspecialchars($file)));
+			throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException(sprintf('Unable to open file resource %s.', $file));
 		}
 		while ($this->objXml->read()) {
 			if ($this->objXml->nodeType == \XMLReader::ELEMENT) {
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPushParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPushParser.php
index 17a12aa7f50d..7cf58d3f3457 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPushParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPushParser.php
@@ -76,11 +76,11 @@ public function parseXml($file) {
 		xml_set_element_handler($this->objXml, 'startElement', 'endElement');
 		xml_set_character_data_handler($this->objXml, 'characterData');
 		if (!($fp = fopen($file, 'r'))) {
-			throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException(sprintf('Unable to open file resource %s.', htmlspecialchars($file)), 1342640689);
+			throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException(sprintf('Unable to open file resource %s.', $file), 1342640689);
 		}
 		while ($data = fread($fp, 4096)) {
 			if (!xml_parse($this->objXml, $data, feof($fp))) {
-				throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException(sprintf('XML error %s in line %u of file resource %s.', xml_error_string(xml_get_error_code($this->objXml)), xml_get_current_line_number($this->objXml), htmlspecialchars($file)), 1342640703);
+				throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException(sprintf('XML error %s in line %u of file resource %s.', xml_error_string(xml_get_error_code($this->objXml)), xml_get_current_line_number($this->objXml), $file), 1342640703);
 			}
 		}
 		xml_parser_free($this->objXml);
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPullParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPullParser.php
index 82359eb129c8..a44c1487c238 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPullParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPullParser.php
@@ -57,7 +57,7 @@ public function parseXml($file) {
 			throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException('Unable to create XML parser.', 1342640820);
 		}
 		if ($this->objXml->open($file, 'utf-8') === FALSE) {
-			throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException(sprintf('Unable to open file resource %s.', htmlspecialchars($file)), 1342640893);
+			throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException(sprintf('Unable to open file resource %s.', $file), 1342640893);
 		}
 		while ($this->objXml->read()) {
 			if ($this->objXml->nodeType == \XMLReader::ELEMENT) {
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPushParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPushParser.php
index 5fbd3e933b00..ef4b8254628e 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPushParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPushParser.php
@@ -71,11 +71,11 @@ public function parseXml($file) {
 		xml_set_element_handler($this->objXml, 'startElement', 'endElement');
 		xml_set_character_data_handler($this->objXml, 'characterData');
 		if (!($fp = fopen($file, 'r'))) {
-			throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException(sprintf('Unable to open file resource %s.', htmlspecialchars($file)), 1342641010);
+			throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException(sprintf('Unable to open file resource %s.', $file), 1342641010);
 		}
 		while ($data = fread($fp, 4096)) {
 			if (!xml_parse($this->objXml, $data, feof($fp))) {
-				throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException(sprintf('XML error %s in line %u of file resource %s.', xml_error_string(xml_get_error_code($this->objXml)), xml_get_current_line_number($this->objXml), htmlspecialchars($file)), 1342641011);
+				throw new \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException(sprintf('XML error %s in line %u of file resource %s.', xml_error_string(xml_get_error_code($this->objXml)), xml_get_current_line_number($this->objXml), $file), 1342641011);
 			}
 		}
 		xml_parser_free($this->objXml);
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Repository/Helper.php b/typo3/sysext/extensionmanager/Classes/Utility/Repository/Helper.php
index 3f1ea73232c5..2b85b2764709 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Repository/Helper.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Repository/Helper.php
@@ -139,10 +139,10 @@ protected function fetchFile($remoteResource, $localResource) {
 			$fileContent = \TYPO3\CMS\Core\Utility\GeneralUtility::getUrl($remoteResource, 0, array(TYPO3_user_agent));
 			if ($fileContent !== FALSE) {
 				if (\TYPO3\CMS\Core\Utility\GeneralUtility::writeFile($localResource, $fileContent) === FALSE) {
-					throw new ExtensionManagerException(sprintf('Could not write to file %s.', htmlspecialchars($localResource)), 1342635378);
+					throw new ExtensionManagerException(sprintf('Could not write to file %s.', $localResource), 1342635378);
 				}
 			} else {
-				throw new ExtensionManagerException(sprintf('Could not access remote resource %s.', htmlspecialchars($remoteResource)), 1342635425);
+				throw new ExtensionManagerException(sprintf('Could not access remote resource %s.', $remoteResource), 1342635425);
 			}
 		}
 	}
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Show.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Show.html
index c3147f4f5c09..d393f7f9391d 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Show.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/Distribution/Show.html
@@ -9,7 +9,7 @@
 </f:section>
 
 <f:section name="Content">
-	<f:flashMessages class="distribution-detail-flashmessage" renderMode="div" />
+	<f:flashMessages class="distribution-detail-flashmessage" />
 	<div class="distribution-detail">
 		<div class="distribution-detail-previewpane">
 			<em:image
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Distributions.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Distributions.html
index 15aff02a7344..d85293ca9f68 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Distributions.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Distributions.html
@@ -10,7 +10,7 @@ <h1><f:translate key="distributions">Get Distributions</f:translate></h1>
 </f:section>
 
 <f:section name="Content">
-	<f:flashMessages renderMode="div" />
+	<f:flashMessages />
 	<f:if condition="{enableDistributionsView}">
 		<f:then>
 			<div class="distribution-holder">
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html
index e76fa962bc19..805d37406f63 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/Index.html
@@ -13,7 +13,7 @@ <h1><f:translate key="installedExtensions" /></h1>
 </f:section>
 
 <f:section name="Content">
-	<f:flashMessages renderMode="div" />
+	<f:flashMessages />
 
 	<f:render partial="List/UploadForm" />
 
diff --git a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/UnresolvedDependencies.html b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/UnresolvedDependencies.html
index 90b187ab4e88..38323c4a83e0 100644
--- a/typo3/sysext/extensionmanager/Resources/Private/Templates/List/UnresolvedDependencies.html
+++ b/typo3/sysext/extensionmanager/Resources/Private/Templates/List/UnresolvedDependencies.html
@@ -10,7 +10,7 @@ <h1><f:translate key="installExtension">Install extension</f:translate></h1>
 </f:section>
 
 <f:section name="Content">
-	<f:flashMessages renderMode="div" />
+	<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" />
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/FlashMessagesViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/FlashMessagesViewHelper.php
index 01da12b692cb..a3c05b073308 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/FlashMessagesViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/FlashMessagesViewHelper.php
@@ -20,6 +20,8 @@
  *                                                                        *
  * The TYPO3 project - inspiring people to share!                         *
  *                                                                        */
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+
 /**
  * View helper which renders the flash messages (if there are any) as an unsorted list.
  *
@@ -45,18 +47,34 @@
  * </output>
  *
  * <code title="TYPO3 core style">
- * <f:flashMessages renderMode="div" />
+ * <f:flashMessages />
  * </code>
  * <output>
- * <div class="typo3-messages">
- * <div class="alert alert-ok">
+ * <ul class="typo3-messages">
+ * <li class="alert alert-ok">
  * <h4>Some Message Header</h4>
- * <div class="alert-body">Some message body</div>
- * </div>
- * <div class="alert alert-notice">
- * <div class="alert-body">Some notice message without header</div>
- * </div>
- * </div>
+ * Some message body
+ * </li>
+ * <li class="alert alert-notice">
+ * Some notice message without header
+ * </li>
+ * </ul>
+ * </output>
+ * <code title="Output flash messages as a description list">
+ * <f:flashMessages as="flashMessages">
+ * 	<dl class="messages">
+ * 	<f:for each="{flashMessages}" as="flashMessage">
+ * 		<dt>{flashMessage.code}</dt>
+ * 		<dd>{flashMessage.message}</dd>
+ * 	</f:for>
+ * 	</dl>
+ * </f:flashMessages>
+ * </code>
+ * <output>
+ * <dl class="messages">
+ * 	<dt>1013</dt>
+ * 	<dd>Some Warning Message.</dd>
+ * </dl>
  * </output>
  *
  * @api
@@ -67,9 +85,9 @@ class FlashMessagesViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractT
 	const RENDER_MODE_DIV = 'div';
 
 	/**
-	 * @var \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
+	 * @var string
 	 */
-	protected $contentObject;
+	protected $tagName = 'ul';
 
 	/**
 	 * @var \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface
@@ -82,7 +100,6 @@ class FlashMessagesViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractT
 	 */
 	public function injectConfigurationManager(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface $configurationManager) {
 		$this->configurationManager = $configurationManager;
-		$this->contentObject = $this->configurationManager->getContentObject();
 	}
 
 	/**
@@ -101,51 +118,81 @@ public function initializeArguments() {
 	 * from being cached.
 	 *
 	 * @see \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::no_cache
-	 * @param string $renderMode one of the RENDER_MODE_* constants
+	 * @param string $renderMode @deprecated since TYPO3 CMS 7.3. If you need custom output, use <f:flashMessages as="messages"><f:for each="messages" as="message">...</f:for></f:flashMessages>
+	 * @param string $as The name of the current flashMessage variable for rendering inside
 	 * @return string rendered Flash Messages, if there are any.
 	 * @api
 	 */
-	public function render($renderMode = self::RENDER_MODE_UL) {
+	public function render($renderMode = NULL, $as = NULL) {
 		$flashMessages = $this->controllerContext->getFlashMessageQueue()->getAllMessagesAndFlush();
 		if ($flashMessages === NULL || count($flashMessages) === 0) {
 			return '';
 		}
-		if (isset($GLOBALS['TSFE']) && $this->contentObject->getUserObjectType() === \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::OBJECTTYPE_USER) {
-			$GLOBALS['TSFE']->no_cache = 1;
-		}
-		switch ($renderMode) {
-			case self::RENDER_MODE_UL:
-				return $this->renderUl($flashMessages);
-			case self::RENDER_MODE_DIV:
-				return $this->renderDiv($flashMessages);
-			default:
-				throw new \TYPO3\CMS\Fluid\Core\ViewHelper\Exception('Invalid render mode "' . $renderMode . '" passed to FlashMessageViewhelper', 1290697924);
+		if ($renderMode !== NULL) {
+			GeneralUtility::deprecationLog('renderMode has been deprecated in TYPO3 CMS 7.3 and will be removed in TYPO3 CMS 8');
+			if ($renderMode === self::RENDER_MODE_DIV) {
+				$content = $this->renderDiv($flashMessages);
+			} else {
+				$content = $this->renderAsList($flashMessages);
+			}
+		} else {
+			if ($as === NULL) {
+				$content = $this->renderAsList($flashMessages);
+			} else {
+				$content = $this->renderFromTemplate($flashMessages, $as);
+			}
 		}
+
+		return $content;
 	}
 
 	/**
 	 * Renders the flash messages as unordered list
 	 *
-	 * @param array $flashMessages array<\TYPO3\CMS\Core\Messaging\FlashMessage>
+	 * @param array $flashMessages \TYPO3\CMS\Core\Messaging\FlashMessage[]
 	 * @return string
 	 */
-	protected function renderUl(array $flashMessages) {
-		$this->tag->setTagName('ul');
-		if ($this->hasArgument('class')) {
-			$this->tag->addAttribute('class', $this->arguments['class']);
-		}
+	protected function renderAsList(array $flashMessages) {
+		$flashMessagesClass = $this->hasArgument('class') ? $this->arguments['class'] : 'typo3-messages';
 		$tagContent = '';
+		$this->tag->addAttribute('class', $flashMessagesClass);
+		/** @var $singleFlashMessage \TYPO3\CMS\Core\Messaging\FlashMessage */
 		foreach ($flashMessages as $singleFlashMessage) {
-			$tagContent .= '<li>' . htmlspecialchars($singleFlashMessage->getMessage()) . '</li>';
+			$severityClass = sprintf('alert %s', $singleFlashMessage->getClass());
+			$messageContent = htmlspecialchars($singleFlashMessage->getMessage());
+			if ($singleFlashMessage->getTitle() !== '') {
+				$messageContent = sprintf('<h4>%s</h4>', htmlspecialchars($singleFlashMessage->getTitle())) . $messageContent;
+			}
+			$tagContent .= sprintf('<li class="%s">%s</li>', htmlspecialchars($severityClass), $messageContent);
 		}
 		$this->tag->setContent($tagContent);
 		return $this->tag->render();
 	}
 
+	/**
+	 * Renders the flash messages as nested divs
+	 * Defer the rendering of Flash Messages to the template. In this case,
+	 * the flash messages are stored in the template inside the variable specified
+	 * in "as".
+	 *
+	 * @param array $flashMessages \TYPO3\CMS\Core\Messaging\FlashMessage[]
+	 * @param string $as
+	 * @return string
+	 */
+	protected function renderFromTemplate(array $flashMessages, $as) {
+		$templateVariableContainer = $this->renderingContext->getTemplateVariableContainer();
+		$templateVariableContainer->add($as, $flashMessages);
+		$content = $this->renderChildren();
+		$templateVariableContainer->remove($as);
+
+		return $content;
+	}
+
 	/**
 	 * Renders the flash messages as nested divs
 	 *
-	 * @param array $flashMessages array<\TYPO3\CMS\Core\Messaging\FlashMessage>
+	 * @deprecated in 7.3 will be removed in 8.0
+	 * @param array $flashMessages \TYPO3\CMS\Core\Messaging\FlashMessage[]
 	 * @return string
 	 */
 	protected function renderDiv(array $flashMessages) {
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 bcf7ee826b88..69283053113d 100644
--- a/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/StatisticDetails.html
+++ b/typo3/sysext/indexed_search/Resources/Private/Templates/Administration/StatisticDetails.html
@@ -4,7 +4,7 @@
 
 <f:section name="Content">
 	<p class="lead"><f:translate key="administration.document.description"/></p>
-	<f:flashMessages renderMode="div"/>
+	<f:flashMessages />
 	<f:if condition="{phashRow}">
 		<f:then>
 			<table class="table table-striped table-hover">
diff --git a/typo3/sysext/lang/Resources/Private/Templates/Language/ListLanguages.html b/typo3/sysext/lang/Resources/Private/Templates/Language/ListLanguages.html
index 53107c59b535..6f3adaa5cb02 100644
--- a/typo3/sysext/lang/Resources/Private/Templates/Language/ListLanguages.html
+++ b/typo3/sysext/lang/Resources/Private/Templates/Language/ListLanguages.html
@@ -7,58 +7,85 @@
 <f:section name="iconButtons">
 	<div class="menuItems">
 		<span class="menuItem updateItem" data-action="updateActiveLanguages">
-			<f:be.buttons.icon icon="actions-system-extension-download" title="{f:translate(key:'button.downloadAll')}" />
+			<f:be.buttons.icon icon="actions-system-extension-download"
+							   title="{f:translate(key:'button.downloadAll')}"/>
 		</span>
 		<span class="menuItem loadingItem">
 			<span title="" class="t3-icon fa fa-spin fa-circle-o-notch">&nbsp;</span>
 		</span>
 		<span class="menuItem cancelItem" data-action="cancelLanguageUpdate">
-			&nbsp;<f:be.buttons.icon icon="actions-document-close" title="{f:translate(key:'button.cancel')}" />
+			&nbsp;<f:be.buttons.icon icon="actions-document-close" title="{f:translate(key:'button.cancel')}"/>
 		</span>
 	</div>
 </f:section>
 
 <f:section name="content">
-	<h1><f:translate key="header.languages" /></h1>
-	<f:flashMessages renderMode="div" />
+	<h1>
+		<f:translate key="header.languages"/>
+	</h1>
+	<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:form.textfield name="typo3-language-searchfield" placeholder="{f:translate(key:'table.search')}"
+							  id="typo3-language-searchfield" value="{search}"
+							  class="form-control t3js-language-searchfield"/>
 		</div>
 	</form>
 	<table id="typo3-language-list" class="t3-table t3-datatable">
 		<thead>
-			<tr>
-				<th title="{f:translate(key:'table.ad.title')}"><f:translate key="table.ad" /></th>
-				<th><f:translate key="table.language" /></th>
-				<th><f:translate key="table.locale" /></th>
-				<th><f:translate key="table.date" /></th>
-				<th><f:translate key="table.actions" /></th>
-			</tr>
+		<tr>
+			<th title="{f:translate(key:'table.ad.title')}">
+				<f:translate key="table.ad"/>
+			</th>
+			<th>
+				<f:translate key="table.language"/>
+			</th>
+			<th>
+				<f:translate key="table.locale"/>
+			</th>
+			<th>
+				<f:translate key="table.date"/>
+			</th>
+			<th>
+				<f:translate key="table.actions"/>
+			</th>
+		</tr>
 		</thead>
 		<tbody>
-			<f:for each="{languages}" as="language" iteration="iterator">
-				<tr id="language-{language.locale}" data-locale="{language.locale}" class="{f:if(condition: language.selected, then: 'enabled', else: 'disabled')} {f:if(condition: iterator.isEven, then: 'even', else: 'odd')}" role="row">
-					<td>
-						<a class="btn btn-default deactivateLanguageLink" data-action="deactivateLanguage" data-locale="{language.locale}" data-language="{language.label}" data-selected="{f:if(condition: language.selected, then: 'true', else: 'false')}"><span title="Deactivate" class="t3-icon fa fa-minus-square"> </span></a>
-						<a class="btn btn-default activateLanguageLink" data-action="activateLanguage" data-locale="{language.locale}" data-language="{language.label}" data-selected="{f:if(condition: language.selected, then: 'true', else: 'false')}"><span title="Activate" class="t3-icon fa fa-plus-circle"> </span></a>
-					</td>
-					<td class="sorting_1">{language.label}</td>
-					<td>{language.locale}</td>
-					<td class="lastUpdate">
-						<f:format.date date="{language.lastUpdate}" format="Y-m-d H:i" />
-					</td>
-					<td class="actions">
-						<a class="btn btn-default updateLanguageLink" data-action="updateLanguage" data-locale="{language.locale}" data-language="{language.label}" data-selected="true"><span title="Download" class="t3-icon fa fa-download"> </span></a>
-						<div class="progressBar">
-							<div class="progress">
-								<div class="progress-text"></div>
-								<div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0%;"></div>
-							</div>
+		<f:for each="{languages}" as="language" iteration="iterator">
+			<tr id="language-{language.locale}" data-locale="{language.locale}"
+				class="{f:if(condition: language.selected, then: 'enabled', else: 'disabled')} {f:if(condition: iterator.isEven, then: 'even', else: 'odd')}"
+				role="row">
+				<td>
+					<a class="btn btn-default deactivateLanguageLink" data-action="deactivateLanguage"
+					   data-locale="{language.locale}" data-language="{language.label}"
+					   data-selected="{f:if(condition: language.selected, then: 'true', else: 'false')}"><span
+						title="Deactivate" class="t3-icon fa fa-minus-square"> </span></a>
+					<a class="btn btn-default activateLanguageLink" data-action="activateLanguage"
+					   data-locale="{language.locale}" data-language="{language.label}"
+					   data-selected="{f:if(condition: language.selected, then: 'true', else: 'false')}"><span
+						title="Activate" class="t3-icon fa fa-plus-circle"> </span></a>
+				</td>
+				<td class="sorting_1">{language.label}</td>
+				<td>{language.locale}</td>
+				<td class="lastUpdate">
+					<f:format.date date="{language.lastUpdate}" format="Y-m-d H:i"/>
+				</td>
+				<td class="actions">
+					<a class="btn btn-default updateLanguageLink" data-action="updateLanguage"
+					   data-locale="{language.locale}" data-language="{language.label}" data-selected="true"><span
+						title="Download" class="t3-icon fa fa-download"> </span></a>
+
+					<div class="progressBar">
+						<div class="progress">
+							<div class="progress-text"></div>
+							<div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0"
+								 aria-valuemax="100" style="width: 0;"></div>
 						</div>
-					</td>
-				</tr>
-			</f:for>
+					</div>
+				</td>
+			</tr>
+		</f:for>
 		</tbody>
 	</table>
 </f:section>
diff --git a/typo3/sysext/lang/Resources/Private/Templates/Language/ListTranslations.html b/typo3/sysext/lang/Resources/Private/Templates/Language/ListTranslations.html
index 2f8262efb290..11405c8afa7e 100644
--- a/typo3/sysext/lang/Resources/Private/Templates/Language/ListTranslations.html
+++ b/typo3/sysext/lang/Resources/Private/Templates/Language/ListTranslations.html
@@ -6,7 +6,7 @@
 
 <f:section name="content">
 	<h1><f:translate key="header.translations" /></h1>
-	<f:flashMessages renderMode="div" />
+	<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" />
@@ -26,4 +26,4 @@ <h1><f:translate key="header.translations" /></h1>
 			<!-- Will be filled by JS -->
 		</tbody>
 	</table>
-</f:section>
\ No newline at end of file
+</f:section>
diff --git a/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/Configuration.html b/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/Configuration.html
index 7b7d95a937dd..e26445a394ed 100644
--- a/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/Configuration.html
+++ b/typo3/sysext/lowlevel/Resources/Private/Templates/Backend/Configuration.html
@@ -1,5 +1,3 @@
-<f:flashMessages renderMode="div"/>
-
 <h1><f:translate key="configuration" /></h1>
 
 <h2>{label}</h2>
diff --git a/typo3/sysext/recycler/Resources/Private/Layouts/Default.html b/typo3/sysext/recycler/Resources/Private/Layouts/Default.html
index 11270b3567e3..f50c28776d11 100644
--- a/typo3/sysext/recycler/Resources/Private/Layouts/Default.html
+++ b/typo3/sysext/recycler/Resources/Private/Layouts/Default.html
@@ -27,7 +27,7 @@
 			<div id="typo3-inner-docbody">
 				<h1><f:translate key="title" /></h1>
 
-				<f:flashMessages renderMode="div" />
+				<f:flashMessages />
 
 				<f:render section="content" />
 			</div>
diff --git a/typo3/sysext/reports/Resources/Private/Layouts/Default.html b/typo3/sysext/reports/Resources/Private/Layouts/Default.html
index 9e3b5a5b6890..61d0adb04529 100644
--- a/typo3/sysext/reports/Resources/Private/Layouts/Default.html
+++ b/typo3/sysext/reports/Resources/Private/Layouts/Default.html
@@ -18,8 +18,7 @@
 		</div>
 		<div id="typo3-docbody">
 			<div id="typo3-inner-docbody">
-				<f:flashMessages renderMode="div" />
-
+				<f:flashMessages />
 				<f:render section="content" />
 			</div>
 		</div>
diff --git a/typo3/sysext/workspaces/Resources/Private/Layouts/Module.html b/typo3/sysext/workspaces/Resources/Private/Layouts/Module.html
index a78a7f5c796d..e4372553a554 100644
--- a/typo3/sysext/workspaces/Resources/Private/Layouts/Module.html
+++ b/typo3/sysext/workspaces/Resources/Private/Layouts/Module.html
@@ -26,7 +26,7 @@
 <div id="typo3-docbody">
 	<div id="typo3-inner-docbody">
 		<f:if condition="{pageTitle}"><h1>{pageTitle}</h1></f:if>
-		<f:flashMessages renderMode="div" />
+		<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>
diff --git a/typo3/sysext/workspaces/Resources/Private/Layouts/Nodoc.html b/typo3/sysext/workspaces/Resources/Private/Layouts/Nodoc.html
index d3ebb5069b45..7fcd5a34da60 100644
--- a/typo3/sysext/workspaces/Resources/Private/Layouts/Nodoc.html
+++ b/typo3/sysext/workspaces/Resources/Private/Layouts/Nodoc.html
@@ -3,7 +3,7 @@
 	<div id="typo3-docbody">
 		<div id="typo3-inner-docbody">
 
-			<f:flashMessages renderMode="div" />
+			<f:flashMessages />
 
 			<f:render section="main"/>
 		</div>