Skip to content

Commit

Permalink
[TASK] Remove redundancies in install tool ext conf template
Browse files Browse the repository at this point in the history 
This patch:

1. Removes a redundant usage of a "NoSpace" VH and
   the associated namespace import since there are no
   other usages.
2. Deletes the VH class since it is not used elsewhere.
3. Removes an always-true and therefore redundant "if"

Releases: master
Resolves: #89956
Change-Id: I943653e04fa731cdc4bdcbc8d6e32663e3ca30c9
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/62648
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Jan Stockfisch <typo3@jan-stockfisch.de>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Jan Stockfisch <typo3@jan-stockfisch.de>
Reviewed-by: Benni Mack <benni@typo3.org>
  • Loading branch information
@NamelessCoder @bmack
NamelessCoder authored and bmack committed Dec 17, 2019
1 parent fdf9cda commit b93798c
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 83 deletions.
52 changes: 0 additions & 52 deletions typo3/sysext/install/Classes/ViewHelpers/Format/NoSpaceViewHelper.php
View file

This file was deleted.

59 changes: 28 additions & 31 deletions ...ext/install/Resources/Private/Partials/Settings/ExtensionConfiguration/ExtensionForm.html
View file
@@ -1,5 +1,4 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:i="http://typo3.org/ns/TYPO3/CMS/Install/ViewHelpers"
xmlns:core="http://typo3.org/ns/TYPO3/CMS/Core/ViewHelpers"
data-namespace-typo3-fluid="true">

Expand All @@ -19,7 +18,7 @@ <h3 class="panel-title">
<f:for each="{extensionData.configuration}" as="category" key="categoryName" iteration="iteration">
<f:if condition="{categoryName}">
<li role="presentation" class="{f:if(condition:'{iteration.isFirst}', then:'active')}">
<a class="text-capitalize" href="#{i:format.noSpace(value:'category-{extensionKey}-{categoryName}')}" aria-controls="category-{extensionKey}-{categoryName}" role="tab" data-toggle="tab">{categoryName}</a>
<a class="text-capitalize" href="#category-{extensionKey}-{categoryName}" aria-controls="category-{extensionKey}-{categoryName}" role="tab" data-toggle="tab">{categoryName}</a>
</li>
</f:if>
</f:for>
Expand All @@ -28,38 +27,36 @@ <h3 class="panel-title">
<form action="#" name="configurationform" autocomplete="off" class="t3js-extensionConfiguration-form extensionConfiguration-form" data-extensionKey="{extensionKey}">
<div class="tab-content">
<f:for each="{extensionData.configuration}" as="subcategories" key="categoryName" iteration="iteration">
<f:if condition="{categoryName}">
<div role="tabpanel" class="tab-pane {f:if(condition:'{iteration.isFirst}', then:'active')}" id="{i:format.noSpace(value:'category-{extensionKey}-{categoryName}')}">
<f:for each="{subcategories}" as="subcategory">
<div class="form-section">
<f:for each="{subcategory}" as="configurationItem" iteration="itemIterator">
<f:if condition="{itemIterator.isFirst}">
<h2 class="h4 form-section-headline">{configurationItem.subcat_label}</h2>
</f:if>
<div class="form-group form-group-dashed">
<label for="em-{configurationItem.extensionKey}-{configurationItem.name}">
{configurationItem.labels.0}
</label>
<p>
{categoryName}.{configurationItem.name}
<f:if condition="{configurationItem.type} != 'user'">
<f:if condition="{configurationItem.type}">
({configurationItem.type})
</f:if>
<div role="tabpanel" class="tab-pane {f:if(condition:'{iteration.isFirst}', then:'active')}" id="category-{extensionKey}-{categoryName}">
<f:for each="{subcategories}" as="subcategory">
<div class="form-section">
<f:for each="{subcategory}" as="configurationItem" iteration="itemIterator">
<f:if condition="{itemIterator.isFirst}">
<h2 class="h4 form-section-headline">{configurationItem.subcat_label}</h2>
</f:if>
<div class="form-group form-group-dashed">
<label for="em-{configurationItem.extensionKey}-{configurationItem.name}">
{configurationItem.labels.0}
</label>
<p>
{categoryName}.{configurationItem.name}
<f:if condition="{configurationItem.type} != 'user'">
<f:if condition="{configurationItem.type}">
({configurationItem.type})
</f:if>
</p>
<div class="form-control-wrap">
<core:form.typoScriptConstants configuration="{configurationItem}"/>
</div>
<f:if condition="{configurationItem.labels.1}">
<div class="help-block">{configurationItem.labels.1 -> f:format.nl2br()}</div>
</f:if>
</p>
<div class="form-control-wrap">
<core:form.typoScriptConstants configuration="{configurationItem}"/>
</div>
</f:for>
</div>
</f:for>
</div>
</f:if>
<f:if condition="{configurationItem.labels.1}">
<div class="help-block">{configurationItem.labels.1 -> f:format.nl2br()}</div>
</f:if>
</div>
</f:for>
</div>
</f:for>
</div>
</f:for>
</div>
<button type="submit" class="btn btn-default" name="save">Save "{extensionKey}" configuration</button>
Expand Down

0 comments on commit b93798c

Please sign in to comment.