[BUGFIX] Impexp: Make CSH useable again 43/46443/2
authorDaniel Goerz <ervaude@gmail.com>
Tue, 2 Feb 2016 09:31:48 +0000 (10:31 +0100)
committerMarkus Klein <markus.klein@typo3.org>
Wed, 3 Feb 2016 21:45:25 +0000 (22:45 +0100)
Change-Id: Ia43f66a74aafa558c2b5a098cc6edecb2c2d8acd
Resolves: #73079
Releases: master
Reviewed-on: https://review.typo3.org/46443
Reviewed-by: Claus Due <claus@phpmind.net>
Reviewed-by: Michael Oehlhof <typo3@oehlhof.de>
Tested-by: Michael Oehlhof <typo3@oehlhof.de>
Tested-by: Gianluigi Martino <gmartino27@gmail.com>
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
typo3/sysext/impexp/Resources/Private/Partials/Export/AdvancedOptions.html
typo3/sysext/impexp/Resources/Private/Partials/Export/Configuration.html
typo3/sysext/impexp/Resources/Private/Partials/Import/Import.html

index b4210bd..df4524d 100644 (file)
@@ -4,8 +4,8 @@
        <label for="checkExcludeHTMLfileResources">
                <f:form.checkbox name="tx_impexp[excludeHTMLfileResources]" id="checkExcludeHTMLfileResources" value="1" checked="{inData.excludeHTMLfileResources} == 1" />
                <f:translate key="makeadvanc_excludeHtmlCssFile" />
-               <f:be.buttons.csh table="xMOD_tx_impexp" field="htmlCssResources" />
        </label>
+       <f:be.buttons.csh table="xMOD_tx_impexp" field="htmlCssResources" />
 </div>
 <h4><f:translate key="makeadvanc_files" /></h4>
 <div class="form-group">
 </div>
 <h4><f:translate key="makeadvanc_extensionDependencies" /></h4>
 <div class="form-group">
-       <label for="saveFilesOutsideExportFile">
+       <label for="extensionDependencies">
                <f:translate key="makeadvanc_selectExtensionsThatThe" />
+       </label>
                <f:be.buttons.csh table="xMOD_tx_impexp" field="extensionDependencies" />
                <f:form.select class="form-control" name="tx_impexp[extension_dep]" multiple="multiple"
                                                                         size="{f:if(condition: '{extensions -> f:count()} > 9', then: '10', else: '5')}"
-                                                                        options="{extensions}" value="{inData.extension_dep}"/>
-       </label>
+                                                                        options="{extensions}" value="{inData.extension_dep}" id="extensionDependencies"/>
 </div>
 <div class="form-group">
        <f:form.submit class="btn btn-default" value="{f:translate(key: 'makesavefo_update')}" />
index db45732..9b42c35 100644 (file)
        <div class="form-group">
                <label for="impexp-pagetree-levels">
                        <f:translate key="makeconfig_levels" />
-                       <f:be.buttons.csh table="xMOD_tx_impexp" field="pageTreeMode" />
                </label>
+               <f:be.buttons.csh table="xMOD_tx_impexp" field="pageTreeMode" />
                <f:form.select class="form-control" name="tx_impexp[pagetree][levels]" id="impexp-pagetree-levels" options="{levelSelectOptions}" value="{inData.pagetree.levels}" />
        </div>
        <div class="form-group">
                <label for="impexp-pagetree-includetables">
                        <f:translate key="makeconfig_includeTables" />
-                       <f:be.buttons.csh table="xMOD_tx_impexp" field="pageTreeRecordLimit" />
                </label>
+               <f:be.buttons.csh table="xMOD_tx_impexp" field="pageTreeRecordLimit"/>
                <f:form.select class="form-control" name="tx_impexp[pagetree][tables]" id="impexp-pagetree-includetables"
                                                                         options="{tableSelectOptions}" multiple="multiple" value="{inData.pagetree.tables}"
                                                                         size="{f:if(condition: '{tableSelectOptions -> f:count()} > 9', then: '10', else: '5')}" />
@@ -99,8 +99,8 @@
 <div class="form-group">
        <label for="impexp-externalref-tables">
                <f:translate key="makeconfig_includeRelationsToTables" />
-               <f:be.buttons.csh table="xMOD_tx_impexp" field="inclRelations" />
        </label>
+       <f:be.buttons.csh table="xMOD_tx_impexp" field="inclRelations" />
        <f:form.select class="form-control" name="tx_impexp[external_ref][tables]" id="impexp-externalref-tables"
                                                                 options="{externalReferenceTableSelectOptions}" multiple="multiple" value="{inData.external_ref.tables}"
                                                                 size="{f:if(condition: '{externalReferenceTableSelectOptions -> f:count()} > 9', then: '10', else: '5')}" />
 <div class="form-group">
        <label for="impexp-externalstatic-tables">
                <f:translate key="makeconfig_useStaticRelationsFor" />
-               <f:be.buttons.csh table="xMOD_tx_impexp" field="staticRelations" />
        </label>
+       <f:be.buttons.csh table="xMOD_tx_impexp" field="staticRelations" />
        <f:form.select class="form-control" name="tx_impexp[external_static][tables]" id="impexp-externalstatic-tables"
                                                                 options="{externalStaticTableSelectOptions}" multiple="multiple" value="{inData.external_static.tables}"
                                                                 size="{f:if(condition: '{externalStaticTableSelectOptions -> f:count()} > 9', then: '10', else: '5')}" />
index e121ef5..5d18ba0 100644 (file)
@@ -3,12 +3,11 @@
 <div class="form-group">
        <label for="impexp-file">
                <f:translate key="importdata_file" />
-               <f:be.buttons.csh table="xMOD_tx_impexp" field="importFile" />
        </label>
+       <f:be.buttons.csh table="xMOD_tx_impexp" field="importFile" />
        <f:form.select name="tx_impexp[file]" class="form-control" id="impexp-file" value="{inData.file}" options="{fileSelectOptions}" />
        <p class="help-block">{importPath}</p>
        <f:if condition="{import.compress}">
-               <f:then></f:then>
                <f:else><span class="text-danger"><f:translate key="importdata_noteNoDecompressorAvailable" /></span></f:else>
        </f:if>
 </div>