Skip to content

Commit c598219

Browse files
garbastgarbast
committed
Merge branch 'release/6.0.1'
2 parents 3eab041 + 5e7be1a commit c598219

8 files changed

Lines changed: 186 additions & 204 deletions

File tree

‎Documentation/guides.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
interlink-shortcode="evoweb/ew-llxml2xliff"
1717
/>
1818
<project title="ew_llxml2xliff"
19-
release="6.0.0"
20-
version="6.0.0"
19+
release="6.0.1"
20+
version="6.0.1"
2121
copyright="since 2016 by evoWeb"
2222
/>
2323
<inventory id="t3tsref" url="https://docs.typo3.org/m/typo3/reference-typoscript/main/en-us/"/>

‎Resources/Private/Language/locallang.xlf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</trans-unit>
1313

1414
<trans-unit id="select_extension">
15-
<source>select extension</source>
15+
<source>Select extension</source>
1616
</trans-unit>
1717

1818
<trans-unit id="selected_extension">
@@ -24,7 +24,7 @@
2424
</trans-unit>
2525

2626
<trans-unit id="select_file">
27-
<source>select file</source>
27+
<source>Select file</source>
2828
</trans-unit>
2929

3030
<trans-unit id="selected_file">

‎Resources/Private/Partials/Progressbar.html‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
22

3-
<div class="modal-footer py-2 px-4 border-top">
4-
<div class="progress" role="progressbar" aria-valuemin="0" aria-valuenow="25" aria-valuemax="100" aria-label="Choose">
5-
<div class="progress-bar first-step {f:if(condition: first, else: 'inactive')}" style="width: 25%;">
3+
<div class="modal-footer py-2 border-top">
4+
<div class="progress row-cols-xxl-4"
5+
role="progressbar"
6+
aria-valuemin="0" aria-valuenow="{now}" aria-valuemax="100" aria-label="Choose"
7+
style="--bs-progress-height: 32px; --bs-border-color: var(--module-bg);">
8+
<div class="progress-bar col border-end {f:if(condition: '{now} == 25', else: 'inactive')}">
69
<f:translate id="extension" extensionName="ew_llxml2xliff"/>
710
</div>
8-
<div class="progress-bar step {f:if(condition: second, else: 'inactive')}" style="width: 25%;">
11+
<div class="progress-bar col border-end {f:if(condition: '{now} == 50', else: 'inactive')}">
912
<f:translate id="file" extensionName="ew_llxml2xliff"/>
1013
</div>
11-
<div class="progress-bar step {f:if(condition: third, else: 'inactive')}" style="width: 25%;">
14+
<div class="progress-bar col border-end {f:if(condition: '{now} == 75', else: 'inactive')}">
1215
<f:translate id="confirm_selection" extensionName="ew_llxml2xliff"/>
1316
</div>
14-
<div class="progress-bar last-step {f:if(condition: forth, else: 'inactive')}" style="width: 25%;">
17+
<div class="progress-bar col {f:if(condition: '{now} == 100', else: 'inactive')}">
1518
<f:translate id="finish" extensionName="ew_llxml2xliff"/>
1619
</div>
1720
</div>

‎Resources/Private/Templates/File/ConfirmConversion.html‎

Lines changed: 40 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -5,57 +5,52 @@
55
<f:layout name="Module"/>
66

77
<f:section name="Content">
8-
<h1><f:translate id="LLL:EXT:ew_llxml2xliff/Resources/Private/Language/locallang.xlf:header.conversion"/></h1>
8+
<div class="container">
9+
<h1><f:translate id="LLL:EXT:ew_llxml2xliff/Resources/Private/Language/locallang.xlf:header.conversion"/></h1>
910

10-
<div class="modal-multi-step-wizard">
11-
<div class="modal-content">
12-
<div class="modal-body py-2 px-4">
13-
<div class="carousel slide" data-bs-ride="false">
14-
<div class="carousel-inner" role="listbox">
15-
<div class="carousel-item active" data-bs-slide="new-form-step-1" data-step="0">
16-
<div class="new-form-modal">
17-
<h5 class="form-section-headline selected-parameter">
18-
<span><f:translate id="selected_extension" extensionName="ew_llxml2xliff"/>:</span>
19-
<span class="icon">
20-
<f:if condition="{selectedExtension.icon}">
21-
<f:then>
22-
<img class="extension-icon" src="{selectedExtension.icon}" alt="" />
23-
</f:then>
24-
<f:else>
25-
<core:icon identifier="empty-empty" />
26-
</f:else>
27-
</f:if>
28-
</span>
29-
<span>{selectedExtension.title}</span>
30-
</h5>
11+
<h5 class="form-section-headline selected-parameter">
12+
<span><f:translate id="selected_extension" extensionName="ew_llxml2xliff"/>:</span>
13+
<span class="icon">
14+
<f:if condition="{selectedExtension.icon}">
15+
<f:then>
16+
<img class="extension-icon" src="{selectedExtension.icon}" alt="" />
17+
</f:then>
18+
<f:else>
19+
<core:icon identifier="empty-empty" />
20+
</f:else>
21+
</f:if>
22+
</span>
23+
<span>{selectedExtension.title}</span>
24+
</h5>
3125

32-
<h5 class="form-section-headline selected-parameter">
33-
<span><f:translate id="selected_file" extensionName="ew_llxml2xliff"/>:</span>
34-
<core:icon identifier="empty-empty" />
35-
<span>{selectedFile.filename}</span>
36-
</h5>
26+
<h5 class="form-section-headline selected-parameter">
27+
<span><f:translate id="selected_file" extensionName="ew_llxml2xliff"/>:</span>
28+
<core:icon identifier="empty-empty" />
29+
<span>{selectedFile.filename}</span>
30+
</h5>
3731

38-
<div>
39-
<a href="{f:be.uri(route: 'web_EwLlxml2xliff')}">
40-
<button type="button" class="btn btn-default" data-inline="1" value="blank" data-identifier="convertExtension">
41-
<core:icon identifier="actions-exclamation-triangle"/>
42-
<f:translate id="cancel" extensionName="ew_llxml2xliff"/>
43-
</button>
44-
</a>
45-
<a href="{f:be.uri(route: 'web_EwLlxml2xliff.convertFile', parameters: {extension: selectedExtension.key, file: selectedFile.filename})}">
46-
<button type="button" class="btn btn-success" data-inline="1" value="blank" data-identifier="convertExtension">
47-
<core:icon identifier="llxml2xliff-convert" alternativeMarkupIdentifier="inline"/>
48-
<f:translate id="confirm" extensionName="ew_llxml2xliff"/>
49-
</button>
50-
</a>
51-
</div>
52-
</div>
53-
</div>
54-
</div>
32+
<div class="card-container">
33+
<div class="card card-size-small">
34+
<div class="card-body">
35+
<a href="{f:be.uri(route: 'web_EwLlxml2xliff')}">
36+
<button type="button" class="btn btn-default" data-inline="1" value="blank" data-identifier="convertExtension">
37+
<core:icon identifier="actions-exclamation-triangle"/>
38+
<f:translate id="cancel" extensionName="ew_llxml2xliff"/>
39+
</button>
40+
</a>
41+
<a href="{f:be.uri(route: 'web_EwLlxml2xliff.convertFile', parameters: {extension: selectedExtension.key, file: selectedFile.filename})}">
42+
<button type="button" class="btn btn-default" data-inline="1" value="blank" data-identifier="convertExtension">
43+
<f:translate id="confirm" extensionName="ew_llxml2xliff"/>
44+
</button>
45+
</a>
5546
</div>
5647
</div>
48+
</div>
5749

58-
<f:render partial="Progressbar" arguments="{third: 'true'}"/>
50+
<div class="modal-multi-step-wizard">
51+
<div class="modal-content">
52+
<f:render partial="Progressbar" arguments="{now: 75}"/>
53+
</div>
5954
</div>
6055
</div>
6156
</f:section>

‎Resources/Private/Templates/File/ConvertFile.html‎

Lines changed: 44 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -5,60 +5,56 @@
55
<f:layout name="Module"/>
66

77
<f:section name="Content">
8-
<h1><f:translate id="LLL:EXT:ew_llxml2xliff/Resources/Private/Language/locallang.xlf:header.conversion"/></h1>
8+
<div class="container">
9+
<h1><f:translate id="LLL:EXT:ew_llxml2xliff/Resources/Private/Language/locallang.xlf:header.conversion"/></h1>
910

10-
<div class="modal-multi-step-wizard">
11-
<div class="modal-content">
12-
<div class="modal-body py-2 px-4">
13-
<div class="carousel slide" data-bs-ride="false">
14-
<div class="carousel-inner" role="listbox">
15-
<div class="carousel-item active" data-bs-slide="new-form-step-1" data-step="0">
16-
<div class="new-form-modal">
17-
<h5 class="form-section-headline selected-parameter">
18-
<span><f:translate id="selected_extension" extensionName="ew_llxml2xliff"/>:</span>
19-
<span class="icon">
20-
<f:if condition="{selectedExtension.icon}">
21-
<f:then>
22-
<img class="extension-icon" src="{selectedExtension.icon}" alt="" />
23-
</f:then>
24-
<f:else>
25-
<core:icon identifier="empty-empty" />
26-
</f:else>
27-
</f:if>
28-
</span>
29-
<span>{selectedExtension.title}</span>
30-
</h5>
11+
<h5 class="form-section-headline selected-parameter">
12+
<span><f:translate id="selected_extension" extensionName="ew_llxml2xliff"/>:</span>
13+
<span class="icon">
14+
<f:if condition="{selectedExtension.icon}">
15+
<f:then>
16+
<img class="extension-icon" src="{selectedExtension.icon}" alt="" />
17+
</f:then>
18+
<f:else>
19+
<core:icon identifier="empty-empty" />
20+
</f:else>
21+
</f:if>
22+
</span>
23+
<span>{selectedExtension.title}</span>
24+
</h5>
3125

32-
<h5 class="form-section-headline selected-parameter">
33-
<span><f:translate id="selected_file" extensionName="ew_llxml2xliff"/>:</span>
34-
<core:icon identifier="empty-empty" />
35-
<span>{selectedFile.filename}</span>
36-
</h5>
26+
<h5 class="form-section-headline selected-parameter">
27+
<span><f:translate id="selected_file" extensionName="ew_llxml2xliff"/>:</span>
28+
<core:icon identifier="empty-empty" />
29+
<span>{selectedFile.filename}</span>
30+
</h5>
3731

38-
<div>
39-
<p>
40-
<f:translate id="processedFile" extensionName="ew_llxml2xliff" arguments="{0: selectedFileKey, 1: selectedExtensionKey}"/>
41-
<f:if condition="{wasConvertedPreviously}">
42-
<f:then>
43-
<f:translate id="wasConvertedPreviously" extensionName="ew_llxml2xliff"/>
44-
</f:then>
45-
<f:else if="{fileConvertedSuccessfully}">
46-
<f:translate id="fileConvertedSuccessfully" extensionName="ew_llxml2xliff"/>
47-
</f:else>
48-
<f:else>
49-
<f:translate id="fileCouldntBeConverted" extensionName="ew_llxml2xliff"/>
50-
</f:else>
51-
</f:if><br>
52-
<f:format.raw>{messages}</f:format.raw>
53-
</p>
54-
</div>
55-
</div>
56-
</div>
57-
</div>
32+
<div class="card-container">
33+
<div class="card card-size-small">
34+
<div class="card-body">
35+
<p class="card-text">
36+
<f:translate id="processedFile" extensionName="ew_llxml2xliff" arguments="{0: selectedFileKey, 1: selectedExtensionKey}"/>
37+
<f:if condition="{wasConvertedPreviously}">
38+
<f:then>
39+
<f:translate id="wasConvertedPreviously" extensionName="ew_llxml2xliff"/>
40+
</f:then>
41+
<f:else if="{fileConvertedSuccessfully}">
42+
<f:translate id="fileConvertedSuccessfully" extensionName="ew_llxml2xliff"/>
43+
</f:else>
44+
<f:else>
45+
<f:translate id="fileCouldntBeConverted" extensionName="ew_llxml2xliff"/>
46+
</f:else>
47+
</f:if><br>
48+
<f:format.raw>{messages}</f:format.raw>
49+
</p>
5850
</div>
5951
</div>
52+
</div>
6053

61-
<f:render partial="Progressbar" arguments="{forth: 'true'}"/>
54+
<div class="modal-multi-step-wizard">
55+
<div class="modal-content">
56+
<f:render partial="Progressbar" arguments="{now: 100}"/>
57+
</div>
6258
</div>
6359
</div>
6460
</f:section>

0 commit comments

Comments
 (0)