From: Philipp Gampe <philipp.gampe@typo3.org>
Date: Fri, 17 May 2013 04:28:54 +0000 (+0200)
Subject: [BUGFIX] file_upload missing back icon
X-Git-Tag: TYPO3_6-2-0alpha1~37
X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/commitdiff_plain/d8a2c80f6b8c6320ab7604d6f97b04e1d4ef179c?hp=23e5f4d8caa56238c247e1af36bd67f40cce99f1

[BUGFIX] file_upload missing back icon

Add a back button to:
 * file_upload
 * file_rename
 * file_newfolder

The code is taken from recordlist.

Resolves: #48065
Releases: 6.2, 6.1, 6.0
Change-Id: If328dd20f09875ab486fa3419ec5de9df8955956
Reviewed-on: https://review.typo3.org/20859
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters
Reviewed-by: Felix Kopp
Tested-by: Felix Kopp
Reviewed-by: Dmitry Dulepov
Tested-by: Dmitry Dulepov
---

diff --git a/typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php b/typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php
index 0cc9f99036e5..b3669baa7c3c 100644
--- a/typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php
+++ b/typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php
@@ -221,7 +221,13 @@ class CreateFolderController {
 		$pageContent .= $this->doc->section($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.newfile'), $code);
 		$pageContent .= $this->doc->sectionEnd();
 		$pageContent .= '</form>';
-		$docHeaderButtons = array();
+		$docHeaderButtons = array(
+			'back' => ''
+		);
+		// Back
+		if ($this->returnUrl) {
+			$docHeaderButtons['back'] = '<a href="' . htmlspecialchars(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisUrl($this->returnUrl)) . '" class="typo3-goBack" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.goBack', TRUE) . '">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-view-go-back') . '</a>';
+		}
 		// Add the HTML as a section:
 		$markerArray = array(
 			'CSH' => $docHeaderButtons['csh'],
diff --git a/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php b/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php
index 0e41ed811512..f767fdf6ead5 100644
--- a/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php
+++ b/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php
@@ -125,7 +125,8 @@ class FileUploadController {
 		$pageContent = $this->doc->header($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:file_upload.php.pagetitle')) . $this->doc->section('', $form);
 		// Header Buttons
 		$docHeaderButtons = array(
-			'csh' => BackendUtility::cshItem('xMOD_csh_corebe', 'file_upload', $GLOBALS['BACK_PATH'])
+			'csh' => BackendUtility::cshItem('xMOD_csh_corebe', 'file_upload', $GLOBALS['BACK_PATH']),
+			'back' => ''
 		);
 		$markerArray = array(
 			'CSH' => $docHeaderButtons['csh'],
@@ -133,6 +134,10 @@ class FileUploadController {
 			'CONTENT' => $pageContent,
 			'PATH' => $this->title
 		);
+		// Back
+		if ($this->returnUrl) {
+			$docHeaderButtons['back'] = '<a href="' . htmlspecialchars(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisUrl($this->returnUrl)) . '" class="typo3-goBack" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.goBack', TRUE) . '">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-view-go-back') . '</a>';
+		}
 		$this->content .= $this->doc->moduleBody(array(), $docHeaderButtons, $markerArray);
 		$this->content .= $this->doc->endPage();
 		$this->content = $this->doc->insertStylesAndJS($this->content);
diff --git a/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php b/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php
index 8eaa8bc0d1c3..241b1ba8b0b5 100644
--- a/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php
+++ b/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php
@@ -161,8 +161,14 @@ class RenameFileController {
 		$code .= '</form>';
 		// Add the HTML as a section:
 		$pageContent .= $code;
-		$docHeaderButtons = array();
+		$docHeaderButtons = array(
+			'back' => ''
+		);
 		$docHeaderButtons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'file_rename', $GLOBALS['BACK_PATH']);
+		// Back
+		if ($this->returnUrl) {
+			$docHeaderButtons['back'] = '<a href="' . htmlspecialchars(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisUrl($this->returnUrl)) . '" class="typo3-goBack" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.goBack', TRUE) . '">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-view-go-back') . '</a>';
+		}
 		// Add the HTML as a section:
 		$markerArray = array(
 			'CSH' => $docHeaderButtons['csh'],
diff --git a/typo3/sysext/backend/Resources/Private/Templates/file_newfolder.html b/typo3/sysext/backend/Resources/Private/Templates/file_newfolder.html
index 7ccda1c00307..4259a748f2bf 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/file_newfolder.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/file_newfolder.html
@@ -26,7 +26,7 @@
 <!-- ###BUTTON_GROUP_WRAP### -->
 
 <!-- ###BUTTON_GROUPS_LEFT### -->
-<!-- ###BUTTON_GROUP4### --><!-- ###BUTTON_GROUP4### -->
+<!-- ###BUTTON_GROUP4### -->###BACK###<!-- ###BUTTON_GROUP4### -->
 <!-- ###BUTTON_GROUPS_LEFT### -->
 
 <!-- ###BUTTON_GROUPS_RIGHT### -->
diff --git a/typo3/sysext/backend/Resources/Private/Templates/file_rename.html b/typo3/sysext/backend/Resources/Private/Templates/file_rename.html
index a42539982dee..1a2d42c94a28 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/file_rename.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/file_rename.html
@@ -26,7 +26,7 @@
 <!-- ###BUTTON_GROUP_WRAP### -->
 
 <!-- ###BUTTON_GROUPS_LEFT### -->
-<!-- ###BUTTON_GROUP4### --><!-- ###BUTTON_GROUP4### -->
+<!-- ###BUTTON_GROUP4### -->###BACK###<!-- ###BUTTON_GROUP4### -->
 <!-- ###BUTTON_GROUPS_LEFT### -->
 
 <!-- ###BUTTON_GROUPS_RIGHT### -->
diff --git a/typo3/sysext/backend/Resources/Private/Templates/file_upload.html b/typo3/sysext/backend/Resources/Private/Templates/file_upload.html
index a42539982dee..1a2d42c94a28 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/file_upload.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/file_upload.html
@@ -26,7 +26,7 @@
 <!-- ###BUTTON_GROUP_WRAP### -->
 
 <!-- ###BUTTON_GROUPS_LEFT### -->
-<!-- ###BUTTON_GROUP4### --><!-- ###BUTTON_GROUP4### -->
+<!-- ###BUTTON_GROUP4### -->###BACK###<!-- ###BUTTON_GROUP4### -->
 <!-- ###BUTTON_GROUPS_LEFT### -->
 
 <!-- ###BUTTON_GROUPS_RIGHT### -->