Skip to content
GitLab
Commit 84cffd31 authored by Georg Ringer's avatar Georg Ringer Committed by Anja Leichsenring
Browse files

[TASK] Show description of tests in Install Tool at start 

The description of the following tests should be shown right away
instead after the test:

- Combining images
- Converting images
- Gdlib
- Scaling images
- Write gif & png

Furthermore the tag is used to highlight code.

Resolves: #79561
Releases: master
Change-Id: I90d1d3ff9f14cc193d4f67124e7a804085586106
Reviewed-on: https://review.typo3.org/51478


Tested-by: Riccardo De Contardi's avatarRiccardo De Contardi <erredeco@gmail.com>
Reviewed-by: Wouter Wolters's avatarWouter Wolters <typo3@wouterwolters.nl>
Tested-by: default avatarTYPO3com <no-reply@typo3.com>
Reviewed-by: Anja Leichsenring's avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring's avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
parent dca4d5d7
Hide whitespace changes
Inline Side-by-side
typo3/sysext/install/Resources/Private/Partials/Action/Tool/TestSetup/CombiningImages.html
View file @ 84cffd31
......@@ -2,26 +2,21 @@
<form method="post">
<f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
<h4>Combining images</h4>
<p>
This verifies that the ImageMagick tools, <code>combine</code>, <code>composite</code>, are able to
combine two images through a grayscale mask.
</p>
<f:if condition="{combiningImagesTested}">
<f:then>
<p>Test-Image by Rotkaeppchen68 (in de.wikipedia) [<a href="http://www.gnu.org/copyleft/fdl.html">GFDL</a> or <a href="http://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA-3.0</a>], <a href="https://commons.wikimedia.org/wiki/File%3AFuBK-Testbild.png">via Wikimedia Commons</a></p>
<p>
This verifies that the ImageMagick tool, 'combine'/'composite', is able to
combine two images through a grayscale mask.
</p>
<p>Test-Image by Rotkaeppchen68 (in de.wikipedia) [<a href="http://www.gnu.org/copyleft/fdl.html">GFDL</a> or <a href="http://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA-3.0</a>], <a href="https://commons.wikimedia.org/wiki/File%3AFuBK-Testbild.png">via Wikimedia Commons</a></p>
<f:for each="{testResults}" as="test">
<f:render partial="Action/Tool/TestSetup/DisplayTwinImage" arguments="{_all}"/>
</f:for>
<f:for each="{testResults}" as="test">
<f:render partial="Action/Tool/TestSetup/DisplayTwinImage" arguments="{_all}"/>
</f:for>
<f:render partial="Action/Tool/TestSetup/AboutImageHandling" arguments="{_all}" />
<f:render partial="Action/Tool/TestSetup/VerifyTestResults" arguments="{_all}" />
<f:render partial="Action/Tool/TestSetup/CurrentConfiguration" arguments="{_all}" />
</f:then>
<f:else>
<h4>Combining images</h4>
</f:else>
<f:render partial="Action/Tool/TestSetup/AboutImageHandling" arguments="{_all}" />
<f:render partial="Action/Tool/TestSetup/VerifyTestResults" arguments="{_all}" />
<f:render partial="Action/Tool/TestSetup/CurrentConfiguration" arguments="{_all}" />
</f:if>
<f:render partial="Action/Common/SubmitButton" arguments="{name:'testCombiningImages', text:'Test combining images'}"/>
</form>
typo3/sysext/install/Resources/Private/Partials/Action/Tool/TestSetup/ConvertImageFormatsToJpg.html
View file @ 84cffd31
......@@ -2,42 +2,36 @@
<form method="post">
<f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
<h4>Convert image formats to jpg</h4>
<p>
This verifies that your ImageMagick installation is able to read the default
formats <code>jpg</code>, <code>gif</code>, <code>png</code>, <code>tif</code>, <code>pdf</code> and <code>ai</code>.
The tool <code>identify</code> is used to read the pixeldimensions of non-web formats and 'convert' is used to
read the image and convert it to <code>jpg</code>.
</p>
<f:if condition="{convertImageFormatsToJpgTested}">
<f:then>
<p>Test-Image by Rotkaeppchen68 (in de.wikipedia) [<a href="http://www.gnu.org/copyleft/fdl.html">GFDL</a> or <a href="http://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA-3.0</a>], <a href="https://commons.wikimedia.org/wiki/File%3AFuBK-Testbild.png">via Wikimedia Commons</a></p>
<p>
This verifies that your ImageMagick installation is able to read the default
formats jpg, gif, png, tif, pdf and ai. The tool 'identify' is
used to read the pixeldimensions of non-web formats and 'convert' is used to
read the image and convert it to jpg.
</p>
<p>Test-Image by Rotkaeppchen68 (in de.wikipedia) [<a href="http://www.gnu.org/copyleft/fdl.html">GFDL</a> or <a href="http://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA-3.0</a>], <a href="https://commons.wikimedia.org/wiki/File%3AFuBK-Testbild.png">via Wikimedia Commons</a></p>
<div class="typo3-message message-notice">
<div class="header-container">
<div class="message-header">
<strong>Dark images</strong>
</div>
</div>
<div class="message-body">
In case the images appear remarkably darker than the reference images,
try to set [TYPO3_CONF_VARS][GFX][colorspace] = sRGB.
<div class="typo3-message message-notice">
<div class="header-container">
<div class="message-header">
<strong>Dark images</strong>
</div>
</div>
<p></p>
<div class="message-body">
In case the images appear remarkably darker than the reference images,
try to set [TYPO3_CONF_VARS][GFX][colorspace] = sRGB.
</div>
</div>
<p></p>
<f:for each="{testResults}" as="test">
<f:render partial="Action/Tool/TestSetup/DisplayTwinImage" arguments="{_all}"/>
</f:for>
<f:for each="{testResults}" as="test">
<f:render partial="Action/Tool/TestSetup/DisplayTwinImage" arguments="{_all}"/>
</f:for>
<f:render partial="Action/Tool/TestSetup/AboutImageHandling" arguments="{_all}" />
<f:render partial="Action/Tool/TestSetup/VerifyTestResults" arguments="{_all}" />
<f:render partial="Action/Tool/TestSetup/CurrentConfiguration" arguments="{_all}" />
</f:then>
<f:else>
<h4>Convert image formats to jpg</h4>
</f:else>
<f:render partial="Action/Tool/TestSetup/AboutImageHandling" arguments="{_all}" />
<f:render partial="Action/Tool/TestSetup/VerifyTestResults" arguments="{_all}" />
<f:render partial="Action/Tool/TestSetup/CurrentConfiguration" arguments="{_all}" />
</f:if>
<f:render partial="Action/Common/SubmitButton" arguments="{name:'testConvertImageFormatsToJpg', text:'Test image formats'}"/>
</form>
typo3/sysext/install/Resources/Private/Partials/Action/Tool/TestSetup/Gdlib.html
View file @ 84cffd31
......@@ -2,13 +2,13 @@
<form method="post">
<f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
<p>
This verifies that the GDLib installation works properly.
</p>
<f:if condition="{gdlibTested}">
<f:render partial="Action/Tool/TestSetup/AboutImageHandling" arguments="{_all}" />
<f:render partial="Action/Tool/TestSetup/VerifyTestResults" arguments="{_all}" />
<f:render partial="Action/Tool/TestSetup/CurrentConfiguration" arguments="{_all}" />
<p>
This verifies that the GDLib installation works properly.
</p>
<p>Test-Image by Rotkaeppchen68 (in de.wikipedia) [<a href="http://www.gnu.org/copyleft/fdl.html">GFDL</a> or <a href="http://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA-3.0</a>], <a href="https://commons.wikimedia.org/wiki/File%3AFuBK-Testbild.png">via Wikimedia Commons</a></p>
<f:for each="{testResults}" as="test">
......
typo3/sysext/install/Resources/Private/Partials/Action/Tool/TestSetup/ScalingImages.html
View file @ 84cffd31
......@@ -2,25 +2,20 @@
<form method="post">
<f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
<h4>Scaling images</h4>
<p>
This shows how ImageMagick reacts when scaling transparent GIF and PNG files.
</p>
<f:if condition="{scalingImagesTested}">
<f:then>
<p>Test-Image by Rotkaeppchen68 (in de.wikipedia) [<a href="http://www.gnu.org/copyleft/fdl.html">GFDL</a> or <a href="http://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA-3.0</a>], <a href="https://commons.wikimedia.org/wiki/File%3AFuBK-Testbild.png">via Wikimedia Commons</a></p>
<p>
This shows how ImageMagick reacts when scaling transparent GIF and PNG files.
</p>
<p>Test-Image by Rotkaeppchen68 (in de.wikipedia) [<a href="http://www.gnu.org/copyleft/fdl.html">GFDL</a> or <a href="http://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA-3.0</a>], <a href="https://commons.wikimedia.org/wiki/File%3AFuBK-Testbild.png">via Wikimedia Commons</a></p>
<f:for each="{testResults}" as="test">
<f:render partial="Action/Tool/TestSetup/DisplayTwinImage" arguments="{_all}"/>
</f:for>
<f:for each="{testResults}" as="test">
<f:render partial="Action/Tool/TestSetup/DisplayTwinImage" arguments="{_all}"/>
</f:for>
<f:render partial="Action/Tool/TestSetup/AboutImageHandling" arguments="{_all}" />
<f:render partial="Action/Tool/TestSetup/VerifyTestResults" arguments="{_all}" />
<f:render partial="Action/Tool/TestSetup/CurrentConfiguration" arguments="{_all}" />
</f:then>
<f:else>
<h4>Scaling images</h4>
</f:else>
<f:render partial="Action/Tool/TestSetup/AboutImageHandling" arguments="{_all}" />
<f:render partial="Action/Tool/TestSetup/VerifyTestResults" arguments="{_all}" />
<f:render partial="Action/Tool/TestSetup/CurrentConfiguration" arguments="{_all}" />
</f:if>
<f:render partial="Action/Common/SubmitButton" arguments="{name:'testScalingImages', text:'Test scaling images'}"/>
</form>
typo3/sysext/install/Resources/Private/Partials/Action/Tool/TestSetup/WriteGifAndPng.html
View file @ 84cffd31
......@@ -2,28 +2,22 @@
<form method="post">
<f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
<h4>Writing gif and png</h4>
<p>
This verifies that ImageMagick is able to write GIF and PNG files.
The GIF-file is attempted compressed with LZW by the
<code>\TYPO3\CMS\Core\Imaging\GraphicalFunctions::gifCompress()</code> function.
</p>
<f:if condition="{writeGifAndPngTested}">
<f:then>
<p>Test-Image by Rotkaeppchen68 (in de.wikipedia) [<a href="http://www.gnu.org/copyleft/fdl.html">GFDL</a> or <a href="http://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA-3.0</a>], <a href="https://commons.wikimedia.org/wiki/File%3AFuBK-Testbild.png">via Wikimedia Commons</a></p>
<p>
This verifies that ImageMagick is able to write GIF and PNG files.
The GIF-file is attempted compressed with LZW by the
\TYPO3\CMS\Core\Imaging\GraphicalFunctions::gifCompress() function.
</p>
<f:for each="{testResults}" as="test">
<f:render partial="Action/Tool/TestSetup/DisplayTwinImage" arguments="{_all}"/>
</f:for>
<p>Test-Image by Rotkaeppchen68 (in de.wikipedia) [<a href="http://www.gnu.org/copyleft/fdl.html">GFDL</a> or <a href="http://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA-3.0</a>], <a href="https://commons.wikimedia.org/wiki/File%3AFuBK-Testbild.png">via Wikimedia Commons</a></p>
<f:for each="{testResults}" as="test">
<f:render partial="Action/Tool/TestSetup/DisplayTwinImage" arguments="{_all}"/>
</f:for>
<f:render partial="Action/Tool/TestSetup/AboutImageHandling" arguments="{_all}" />
<f:render partial="Action/Tool/TestSetup/VerifyTestResults" arguments="{_all}" />
<f:render partial="Action/Tool/TestSetup/CurrentConfiguration" arguments="{_all}" />
</f:then>
<f:else>
<h4>Writing gif and png</h4>
</f:else>
<f:render partial="Action/Tool/TestSetup/AboutImageHandling" arguments="{_all}" />
<f:render partial="Action/Tool/TestSetup/VerifyTestResults" arguments="{_all}" />
<f:render partial="Action/Tool/TestSetup/CurrentConfiguration" arguments="{_all}" />
</f:if>
<f:render partial="Action/Common/SubmitButton" arguments="{name:'testWriteGifAndPng', text:'Test image formats'}"/>
</form>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment