Merge branch '8.4' into 9.0

dlubitz · dlubitz · commit 6bd96db6623d · 2025-05-14T21:33:52.000+02:00
diff --git a/Neos.Media.Browser/Resources/Private/Layouts/Default.html b/Neos.Media.Browser/Resources/Private/Layouts/Default.html
@@ -23,7 +23,7 @@
         </div>
         <div class="neos-media-content{f:if(condition: '{tags -> f:count()} > 25', then: ' neos-media-aside-condensed')}">
             <div class="neos-media-assets">
-                <div id="neos-notification-container" class="neos-notification-container">
+                <div id="neos-notification-container">
                     <f:render partial="FlashMessages"/>
                 </div>
                 <f:render section="Content"/>
diff --git a/Neos.Media.Browser/Resources/Private/Layouts/EditImage.html b/Neos.Media.Browser/Resources/Private/Layouts/EditImage.html
@@ -9,9 +9,10 @@
 	</f:for>
 </head>
 <body class="{settings.bodyClasses} media-browser-inspector">
-    <f:render partial="FlashMessages"/>
-
-    <f:render section="Content"/>
+	<div id="neos-notification-container">
+		<f:render partial="FlashMessages"/>
+	</div>
+	<f:render section="Content"/>
 	<script src="{f:uri.resource(path: 'resource://Neos.Media.Browser/Public/JavaScript/pdf.js')}"></script>
 	<f:for each="{settings.scripts}" as="script">
 		<script src="{f:uri.resource(path: script)}"></script>
diff --git a/Neos.Media.Browser/Resources/Private/Layouts/UploadImage.html b/Neos.Media.Browser/Resources/Private/Layouts/UploadImage.html
@@ -10,8 +10,9 @@
 </head>
 <body class="{settings.bodyClasses} media-browser-inspector">
 <div class="neos-row-fluid">
-	<f:render partial="FlashMessages" />
-
+	<div id="neos-notification-container">
+		<f:render partial="FlashMessages"/>
+	</div>
 	<f:render section="Content" />
 </div>
 <f:for each="{settings.scripts}" as="script">
diff --git a/Neos.Media.Browser/Resources/Private/Templates/Asset/Index.html b/Neos.Media.Browser/Resources/Private/Templates/Asset/Index.html
@@ -259,7 +259,7 @@ <h2>
     <f:if condition="!{activeAssetSource.readOnly}">
     <div id="dropzone" class="neos-upload-area">
         <div title="{neos:backend.translate(id: 'maxUploadSize', arguments: {0: humanReadableMaximumFileUploadSize}, package: 'Neos.Media.Browser')}" data-neos-toggle="tooltip">{neos:backend.translate(id: 'dropFiles', package: 'Neos.Media.Browser')}<i class="fas fa-arrow-down"></i><span> {neos:backend.translate(id: 'clickToUpload', package: 'Neos.Media.Browser')}</span></div>
-        <f:form method="post" action="create" addQueryString="true" object="{asset}" objectName="asset" enctype="multipart/form-data">
+        <f:form method="post" action="create" format="json" addQueryString="true" object="{asset}" objectName="asset" enctype="multipart/form-data">
             <f:form.upload id="resource" property="resource" additionalAttributes="{required: 'required', accept: constraints.mediaTypeAcceptAttribute}" />
             <f:render partial="ConstraintsHiddenFields" arguments="{constraints: constraints}" />
         </f:form>
@@ -325,7 +325,7 @@ <h2>{neos:backend.translate(id: 'connectionError', package: 'Neos.Media.Browser'
     <script type="text/javascript" src="{f:uri.resource(package: 'Neos.Media.Browser', path: 'Libraries/jquery-ui/js/jquery-ui-1.10.3.custom.js')}"></script>
     <f:if condition="!{activeAssetSource.readOnly}">
     <script type="text/javascript">
-        var uploadUrl = "{f:uri.action(action: 'upload', addQueryString: true, additionalParams: {__csrfToken: '{f:security.csrfToken()}'}, absolute: true) -> f:format.raw()}";
+        var uploadUrl = "{f:uri.action(action: 'upload', format: 'json', addQueryString: true, additionalParams: {__csrfToken: '{f:security.csrfToken()}'}, absolute: true) -> f:format.raw()}";
         var maximumFileUploadSize = {maximumFileUploadSize};
 <![CDATA[
         if (window.parent !== window && window.parent.NeosMediaBrowserCallbacks && window.parent.NeosMediaBrowserCallbacks.refreshThumbnail) {
diff --git a/Neos.Neos/composer.json b/Neos.Neos/composer.json
@@ -21,7 +21,7 @@
         "neos/contentrepository-export": "self.version",
         "neos/fusion": "self.version",
         "neos/fusion-afx": "self.version",
-        "neos/fusion-form": "^1.0 || ^2.0",
+        "neos/fusion-form": "^2.0 || ^3.0",
         "neos/fluid-adaptor": "~9.0.0",
         "neos/media": "self.version",
         "neos/workspace-ui": "self.version",
diff --git a/composer.json b/composer.json
@@ -42,7 +42,7 @@
         "neos/imagine": "^3.1.0",
         "imagine/imagine": "*",
         "neos/party": "~7.0.3",
-        "neos/fusion-form": "^1.0 || ^2.0",
+        "neos/fusion-form": "^2.0 || ^3.0",
         "neos/form": "*",
         "neos/kickstarter": "~9.0.0"
     },
