[BUGFIX] Filelist: make CSH useable

In the "new" view of filelist the CSH is not useable because it is
located inside the label tag. This patch adjusts the markup.

Additionally a CSH for adding media assets is added.

Change-Id: I9deab9f747c54c2a4e8f3b4ee987d71cd6027f1f
Resolves: #72512
Releases: master, 7.6
Reviewed-on: https://review.typo3.org/45666
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>

diff --git a/typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php b/typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php
index d9cf2b1..bb16c05 100644 (file)
--- a/typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php
+++ b/typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php
@@ -162,7 +162,7 @@ class CreateFolderController extends AbstractModule
                                <div class="form-group">
                                        <div class="form-section">
                                                <div class="form-group">
-                                                       <label for="number-of-new-folders">' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.number_of_folders') . ' ' . BackendUtility::cshItem('xMOD_csh_corebe', 'file_newfolder') . '</label>
+                                                       <label for="number-of-new-folders">' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.number_of_folders') . '</label> ' . BackendUtility::cshItem('xMOD_csh_corebe', 'file_newfolder') . '
                                                        <div class="form-control-wrap">
                                                                <div class="input-group">
                                                                        <select class="form-control form-control-adapt" name="number" id="number-of-new-folders" onchange="reload(this.options[this.selectedIndex].value);">';
@@ -217,7 +217,7 @@ class CreateFolderController extends AbstractModule
                                <div class="form-group">
                                        <div class="form-section">
                                                <div class="form-group">
-                                                       <label for="newMedia">' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:online_media.new_media.label', true) . ' ' . BackendUtility::cshItem('xMOD_csh_corebe', 'file_newMedia') . '</label>
+                                                       <label for="newMedia">' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:online_media.new_media.label', true) . '</label> ' . BackendUtility::cshItem('xMOD_csh_corebe', 'file_newMedia') . '
                                                        <div class="form-control-wrap">
                                                                <input class="form-control" type="text" id="newMedia" name="file[newMedia][0][url]"
                                                                        placeholder="' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:online_media.new_media.placeholder', true) . '" />
@@ -256,7 +256,7 @@ class CreateFolderController extends AbstractModule
                                <div class="form-group">
                                        <div class="form-section">
                                                <div class="form-group">
-                                                       <label for="newfile">' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.label_newfile', true) . ' ' . BackendUtility::cshItem('xMOD_csh_corebe', 'file_newfile') . '</label>
+                                                       <label for="newfile">' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.label_newfile', true) . '</label> ' . BackendUtility::cshItem('xMOD_csh_corebe', 'file_newfile') . '
                                                        <div class="form-control-wrap">
                                                                <input class="form-control" type="text" id="newfile" name="file[newfile][0][data]" onchange="changed=true;" />
                                                                <input type="hidden" name="file[newfile][0][target]" value="' . htmlspecialchars($this->target) . '" />

diff --git a/typo3/sysext/lang/locallang_csh_corebe.xlf b/typo3/sysext/lang/locallang_csh_corebe.xlf
index 8752440..1afa4f1 100644 (file)
--- a/typo3/sysext/lang/locallang_csh_corebe.xlf
+++ b/typo3/sysext/lang/locallang_csh_corebe.xlf
@@ -728,7 +728,7 @@ After pressing the "Create folders" button the folders will appear in the folder
                                <source>Creating a new file</source>
                        </trans-unit>
                        <trans-unit id="file_newfile.description">
-                               <source>Enter a filename here if you want to create a new text-based file. Notice that it must have one of the endings in the list of text-endings shown above (except "php" endings).</source>
+                               <source>Enter a filename here if you want to create a new text-based file. Notice that it must have one of the endings in the list of text-endings shown below (except "php" endings).</source>
                        </trans-unit>
                        <trans-unit id="file_newfile.details">
                                <source>Newly created files will have the size of 0 (zero). After creating a new file it would be natural that you wanted to edit the file to put content into it. This is done simply by clicking the icon of the file and select "Edit" from the clickmenu.</source>
@@ -751,6 +751,12 @@ EXT:lang/cshimages/core_55.png,</source>
 Then enter the filename in the dialog in the right frame.
 After pressing "Create file" you will see a new, empty file in the folder you selected.</source>
                        </trans-unit>
+                       <trans-unit id="file_newMedia.alttitle">
+                               <source>Adding a new media asset</source>
+                       </trans-unit>
+                       <trans-unit id="file_newMedia.description">
+                               <source>Enter an URL to a media asset here. Notice that it must be from one of the allowed providers listed below.</source>
+                       </trans-unit>
                        <trans-unit id="file_rename.alttitle">
                                <source>Rename a file or folder</source>
                        </trans-unit>
@@ -949,4 +955,4 @@ When working in the default Draft workspace or any customly created workspaces c
                        </trans-unit>
                </body>
        </file>
-</xliff>
\ No newline at end of file
+</xliff>