[BUGFIX] Make Install Tool forms submitable via keyboard 56/48556/3
authorMarkus Klein <markus.klein@typo3.org>
Sun, 29 May 2016 13:15:16 +0000 (15:15 +0200)
committerWouter Wolters <typo3@wouterwolters.nl>
Wed, 15 Jun 2016 06:31:44 +0000 (08:31 +0200)
Additionally fix missing input-label association and simplify
Fluid inline if usage.

Resolves: #76363
Releases: master, 7.6
Change-Id: I8a01047c3eb5b28494313fce0e031a296696ece9
Reviewed-on: https://review.typo3.org/48556
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
18 files changed:
typo3/sysext/install/Resources/Private/Partials/Action/Common/SubmitButton.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Charset/CoreInternal.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Charset/Custom.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Charset/Iconv.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Charset/Mbstring.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context/Custom.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context/Debug.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Context/Live.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/ExtbaseObjectCache/Apc.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/ExtbaseObjectCache/Apcu.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/ExtbaseObjectCache/Database.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image/Custom.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image/GraphicsMagick.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Image/ImageMagick6.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Mail/Custom.html
typo3/sysext/install/Resources/Private/Partials/Action/Tool/Configuration/Mail/Sendmail.html

index 91f3928..60f4514 100644 (file)
@@ -1 +1,2 @@
-<button class="btn btn-default {className}" type="submit" name="install[set][{name}]">{text}</button>
\ No newline at end of file
+<button class="btn btn-default {className}" type="submit">{text}</button>
+<input type="hidden" name="install[set][{name}]" value="submit" />
index e3b57ae..eda1f55 100644 (file)
@@ -7,7 +7,7 @@
                                id="t3-install-tool-configuration-charset-coreinternal"
                                name="install[values][{feature.name}][enable]"
                                value="{preset.name}"
-                               {f:if(condition:'{preset.isActive}', then:'checked="checked"')}
+                               {f:if(condition: preset.isActive, then:'checked="checked"')}
                        />
                        <label
                                for="t3-install-tool-configuration-charset-coreinternal"
@@ -16,7 +16,7 @@
                                <strong>
                                        Internal core handling
                                </strong>
-                               {f:if(condition:'{preset.isActive}', then:' [Active]')}
+                               {f:if(condition: preset.isActive, then:' [Active]')}
                        </label>
                </div>
        </div>
@@ -26,4 +26,4 @@
                is no other option available - and upgrade your system to include mbstring soon!
        </div>
 </div>
-<p></p>
\ No newline at end of file
+<p></p>
index b4df518..9bff416 100644 (file)
@@ -7,7 +7,7 @@
                                id="t3-install-tool-configuration-charset-custom"
                                name="install[values][{feature.name}][enable]"
                                value="{preset.name}"
-                               {f:if(condition:'{preset.isActive}', then:'checked="checked"')}
+                               {f:if(condition: preset.isActive, then:'checked="checked"')}
                        />
                        <label
                                for="t3-install-tool-configuration-charset-custom"
@@ -16,7 +16,7 @@
                                <strong>
                                        Custom configuration
                                </strong>
-                               {f:if(condition:'{preset.isActive}', then:' [Active]')}
+                               {f:if(condition: preset.isActive, then:' [Active]')}
                        </label>
                </div>
        </div>
 
                <f:for each="{preset.configurationValues}" as="configurationValue" key="configurationKey">
                        <div class="form-group">
-                               <label class="col-sm-4 control-label">{configurationKey}</label>
+                               <label class="col-sm-4 control-label" for="{feature.name}{preset.name}{configurationKey}">{configurationKey}</label>
                                <div class="col-sm-8">
                                        <input
-                                               type="input"
+                                               id="{feature.name}{preset.name}{configurationKey}"
+                                               type="text"
                                                name="install[values][{feature.name}][{preset.name}][{configurationKey}]"
                                                value="{configurationValue}"
                                                class="form-control t3js-custom-preset"
index 47f3bdc..d968b1e 100644 (file)
@@ -8,7 +8,7 @@
                                name="install[values][{feature.name}][enable]"
                                value="{preset.name}"
                                {f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
-                               {f:if(condition:'{preset.isActive}', then:'checked="checked"')}
+                               {f:if(condition: preset.isActive, then:'checked="checked"')}
                        />
                        <label
                                for="t3-install-tool-configuration-charset-iconv"
@@ -17,7 +17,7 @@
                                <strong>
                                        iconv
                                </strong>
-                               {f:if(condition:'{preset.isActive}', then:' [Active]')}
+                               {f:if(condition: preset.isActive, then:' [Active]')}
                        </label>
                </div>
        </div>
@@ -26,4 +26,4 @@
                mbstring should be preferred if available.
        </div>
 </div>
-<p></p>
\ No newline at end of file
+<p></p>
index 6371f3d..b48a38b 100644 (file)
@@ -8,7 +8,7 @@
                                name="install[values][{feature.name}][enable]"
                                value="{preset.name}"
                                {f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
-                               {f:if(condition:'{preset.isActive}', then:'checked="checked"')}
+                               {f:if(condition: preset.isActive, then:'checked="checked"')}
                        />
                        <label
                                for="t3-install-tool-configuration-charset-mbstring"
@@ -17,7 +17,7 @@
                                <strong>
                                        mbstring
                                </strong>
-                               {f:if(condition:'{preset.isActive}', then:' [Active]')}
+                               {f:if(condition: preset.isActive, then:' [Active]')}
                        </label>
                </div>
        </div>
@@ -25,4 +25,4 @@
                mbstring conversion is based on a PHP module and is usually the quickest option.
        </div>
 </div>
-<p></p>
\ No newline at end of file
+<p></p>
index 7b9d137..864d266 100644 (file)
@@ -7,7 +7,7 @@
                                id="t3-install-tool-configuration-context-custom"
                                name="install[values][{feature.name}][enable]"
                                value="{preset.name}"
-                               {f:if(condition:'{preset.isActive}', then:'checked="checked"')}
+                               {f:if(condition: preset.isActive, then:'checked="checked"')}
                        />
                        <label
                                for="t3-install-tool-configuration-context-custom"
@@ -16,7 +16,7 @@
                                <strong>
                                        Custom configuration
                                </strong>
-                               {f:if(condition:'{preset.isActive}', then:' [Active]')}
+                               {f:if(condition: preset.isActive, then:' [Active]')}
                        </label>
                </div>
        </div>
 
                <f:for each="{preset.configurationValues}" as="configurationValue" key="configurationKey">
                        <div class="form-group">
-                               <label class="col-sm-4 control-label">{configurationKey}</label>
+                               <label class="col-sm-4 control-label" for="{feature.name}{preset.name}{configurationKey}">{configurationKey}</label>
                                <div class="col-sm-8">
                                        <input
-                                               type="input"
+                                               id="{feature.name}{preset.name}{configurationKey}"
+                                               type="text"
                                                name="install[values][{feature.name}][{preset.name}][{configurationKey}]"
                                                value="{configurationValue}"
                                                class="form-control t3js-custom-preset"
@@ -41,4 +42,4 @@
                </f:for>
        </div>
 </div>
-<p></p>
\ No newline at end of file
+<p></p>
index de184ba..596fb9e 100644 (file)
@@ -7,14 +7,14 @@
                                id="t3-install-tool-configuration-context-debug"
                                name="install[values][{feature.name}][enable]"
                                value="{preset.name}"
-                               {f:if(condition:'{preset.isActive}', then:'checked="checked"')}
+                               {f:if(condition: preset.isActive, then:'checked="checked"')}
                        />
                        <label
                                for="t3-install-tool-configuration-context-debug"
                                class="t3-install-tool-configuration-radio-label"
                        >
                                <strong>Debug</strong>
-                               {f:if(condition:'{preset.isActive}', then:' [Active]')}
+                               {f:if(condition: preset.isActive, then:' [Active]')}
                        </label>
                </div>
        </div>
index e9ebcc9..53a0e04 100644 (file)
@@ -7,14 +7,14 @@
                                id="t3-install-tool-configuration-context-live"
                                name="install[values][{feature.name}][enable]"
                                value="{preset.name}"
-                               {f:if(condition:'{preset.isActive}', then:'checked="checked"')}
+                               {f:if(condition: preset.isActive, then:'checked="checked"')}
                        />
                        <label
                                for="t3-install-tool-configuration-context-live"
                                class="t3-install-tool-configuration-radio-label"
                        >
                                <strong>Live</strong>
-                               {f:if(condition:'{preset.isActive}', then:' [Active]')}
+                               {f:if(condition: preset.isActive, then:' [Active]')}
                        </label>
                </div>
        </div>
index f4e80a6..c2ce156 100644 (file)
@@ -8,7 +8,7 @@
                                name="install[values][{feature.name}][enable]"
                                value="{preset.name}"
                                {f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
-                               {f:if(condition:'{preset.isActive}', then:'checked="checked"')}
+                               {f:if(condition: preset.isActive, then:'checked="checked"')}
                        />
                        <label
                                for="t3-install-tool-configuration-extbaseobjectcache-apc"
@@ -17,7 +17,7 @@
                                <strong>
                                        APC cache backend
                                </strong>
-                               {f:if(condition:'{preset.isActive}', then:' [Active]')}
+                               {f:if(condition: preset.isActive, then:' [Active]')}
                        </label>
                </div>
        </div>
index 9557ab7..c59e654 100644 (file)
@@ -8,7 +8,7 @@
                                name="install[values][{feature.name}][enable]"
                                value="{preset.name}"
                                {f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
-                               {f:if(condition:'{preset.isActive}', then:'checked="checked"')}
+                               {f:if(condition: preset.isActive, then:'checked="checked"')}
                        />
                        <label
                                for="t3-install-tool-configuration-extbaseobjectcache-apc"
@@ -17,7 +17,7 @@
                                <strong>
                                        APCu cache backend
                                </strong>
-                               {f:if(condition:'{preset.isActive}', then:' [Active]')}
+                               {f:if(condition: preset.isActive, then:' [Active]')}
                        </label>
                </div>
        </div>
index 5be8a2d..ed76452 100644 (file)
@@ -7,7 +7,7 @@
                                id="t3-install-tool-configuration-extbaseobjectcache-database"
                                name="install[values][{feature.name}][enable]"
                                value="{preset.name}"
-                               {f:if(condition:'{preset.isActive}', then:'checked="checked"')}
+                               {f:if(condition: preset.isActive, then:'checked="checked"')}
                        />
                        <label
                                for="t3-install-tool-configuration-extbaseobjectcache-database"
@@ -16,7 +16,7 @@
                                <strong>
                                        Database cache backend
                                </strong>
-                               {f:if(condition:'{preset.isActive}', then:' [Active]')}
+                               {f:if(condition: preset.isActive, then:' [Active]')}
                        </label>
                </div>
        </div>
@@ -25,4 +25,4 @@
                fallback if APC is not available.
        </div>
 </div>
-<p></p>
\ No newline at end of file
+<p></p>
index b5db6c7..8e40e0e 100644 (file)
@@ -28,7 +28,7 @@
                                <div class="col-sm-12">
                                        <div class="input-group">
                                                <input
-                                                               type="input"
+                                                               type="text"
                                                                name="install[values][{feature.name}][additionalSearchPath]"
                                                                value="{feature.additionalSearchPath}"
                                                                class="form-control"
index deda64c..0568b03 100644 (file)
@@ -7,7 +7,7 @@
                                id="t3-install-tool-configuration-image-custom"
                                name="install[values][{feature.name}][enable]"
                                value="{preset.name}"
-                               {f:if(condition:'{preset.isActive}', then:'checked="checked"')}
+                               {f:if(condition: preset.isActive, then:'checked="checked"')}
                        />
                        <label
                                for="t3-install-tool-configuration-image-custom"
@@ -16,7 +16,7 @@
                                <strong>
                                        Custom configuration
                                </strong>
-                               {f:if(condition:'{preset.isActive}', then:' [Active]')}
+                               {f:if(condition: preset.isActive, then:' [Active]')}
                        </label>
                </div>
        </div>
 
                <f:for each="{preset.configurationValues}" as="configurationValue" key="configurationKey">
                        <div class="form-group">
-                               <label class="col-sm-4 control-label">{configurationKey}</label>
+                               <label class="col-sm-4 control-label" for="{feature.name}{preset.name}{configurationKey}">{configurationKey}</label>
                                <div class="col-sm-8">
                                        <input
-                                               type="input"
+                                               id="{feature.name}{preset.name}{configurationKey}"
+                                               type="text"
                                                name="install[values][{feature.name}][{preset.name}][{configurationKey}]"
                                                value="{configurationValue}"
                                                class="form-control t3js-custom-preset"
@@ -41,4 +42,4 @@
                </f:for>
        </div>
 </div>
-<p></p>
\ No newline at end of file
+<p></p>
index f64f235..243f0e9 100644 (file)
@@ -8,7 +8,7 @@
                                name="install[values][{feature.name}][enable]"
                                value="{preset.name}"
                                {f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
-                               {f:if(condition:'{preset.isActive}', then:'checked="checked"')}
+                               {f:if(condition: preset.isActive, then:'checked="checked"')}
                        />
                        <label
                                for="t3-install-tool-configuration-image-graphicsmagick"
@@ -17,7 +17,7 @@
                                <strong>
                                        Graphics Magick
                                </strong>
-                               {f:if(condition:'{preset.isActive}', then:' [Active]')}
+                               {f:if(condition: preset.isActive, then:' [Active]')}
                        </label>
                </div>
        </div>
@@ -34,4 +34,4 @@
                </f:if>
        </div>
 </div>
-<p></p>
\ No newline at end of file
+<p></p>
index 15b80a0..5062e83 100644 (file)
@@ -8,7 +8,7 @@
                                name="install[values][{feature.name}][enable]"
                                value="{preset.name}"
                                {f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
-                               {f:if(condition:'{preset.isActive}', then:'checked="checked"')}
+                               {f:if(condition: preset.isActive, then:'checked="checked"')}
                        />
                        <label
                                for="t3-install-tool-configuration-image-imagemagick6"
@@ -17,7 +17,7 @@
                                <strong>
                                        Image Magick version 6 or higher
                                </strong>
-                               {f:if(condition:'{preset.isActive}', then:' [Active]')}
+                               {f:if(condition: preset.isActive, then:' [Active]')}
                        </label>
                </div>
        </div>
@@ -34,4 +34,4 @@
                </f:if>
        </div>
 </div>
-<p></p>
\ No newline at end of file
+<p></p>
index 9531c82..ce19ff3 100644 (file)
@@ -7,7 +7,7 @@
                                id="t3-install-tool-configuration-mail-custom"
                                name="install[values][{feature.name}][enable]"
                                value="{preset.name}"
-                               {f:if(condition:'{preset.isActive}', then:'checked="checked"')}
+                               {f:if(condition: preset.isActive, then:'checked="checked"')}
                        />
                        <label
                                for="t3-install-tool-configuration-mail-custom"
@@ -16,7 +16,7 @@
                                <strong>
                                        Custom configuration
                                </strong>
-                               {f:if(condition:'{preset.isActive}', then:' [Active]')}
+                               {f:if(condition: preset.isActive, then:' [Active]')}
                        </label>
                </div>
        </div>
 
                <f:for each="{preset.configurationValues}" as="configurationValue" key="configurationKey">
                        <div class="form-group">
-                               <label class="col-sm-6 control-label">{configurationKey}</label>
+                               <label class="col-sm-6 control-label" for="{feature.name}{preset.name}{configurationKey}">{configurationKey}</label>
                                <div class="col-sm-6">
                                        <input
-                                               type="input"
+                                               id="{feature.name}{preset.name}{configurationKey}"
+                                               type="text"
                                                name="install[values][{feature.name}][{preset.name}][{configurationKey}]"
                                                value="{configurationValue}"
                                                class="form-control t3js-custom-preset"
index 9ea3c6e..8f7fa02 100644 (file)
@@ -8,7 +8,7 @@
                                name="install[values][{feature.name}][enable]"
                                value="{preset.name}"
                                {f:if(condition:'{preset.isAvailable}', then:'', else:'disabled="disabled"')}
-                               {f:if(condition:'{preset.isActive}', then:'checked="checked"')}
+                               {f:if(condition: preset.isActive, then:'checked="checked"')}
                        />
                        <label
                                for="t3-install-tool-configuration-mail-sendmail"
@@ -17,7 +17,7 @@
                                <strong>
                                        Import sendmail command from PHP settings
                                </strong>
-                               {f:if(condition:'{preset.isActive}', then:' [Active]')}
+                               {f:if(condition: preset.isActive, then:' [Active]')}
                        </label>
                </div>
        </div>