Skip to content

Commit 48e27d1

Browse files
jaumepresaspuigjaumepresaspuig
committed
Merge commit 'c20b68af9d9a0aec492e95be30726cdc9c548c44'
2 parents 6faeb35 + c20b68a commit 48e27d1

13 files changed

Lines changed: 148 additions & 5 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
Latest release: 1.0.2 (2026/03/31 14:34:08)
1+
Latest release: 1.0.3 (2026/04/08 12:34:12)
22

33
All release change logs:
44

5+
* [1.0.3 (2026/04/08) - Full list of changes](https://github.com/jaumepresaspuig/das/compare/1.0.2...1.0.3)
56
* [1.0.2 (2026/03/31) - Full list of changes](https://github.com/jaumepresaspuig/das/compare/1.0.1...1.0.2)
67
* [1.0.1 (2026/03/24) - Full list of changes](https://github.com/jaumepresaspuig/das/compare/1.0.0...1.0.1)
78
* 1.0.0 (2026/03/24) - First release

‎Documentation/EditorsManual/DasContentElements.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Das content elements
44
====================
55

6-
**Das** comes with a set of ready to use content elements, which cover a wide range of options: Accordion, Alert, Audio player, Before/after image, Buttons, Calendar, Cards, Carousel, Chart, Columns, Container, Counter, Faq's, Iframe, Jumbotron, Modal window, Paginator, Pricing table, Progress bars, Quotes, Social buttons, Tabs, and Timeline.
6+
**Das** comes with a set of ready to use content elements, which cover a wide range of options: Accordion, Alert, Audio player, Before/after image, Buttons, Calendar, Cards, Carousel, Chart, Columns, Container, Counter, Faq's, Iframe, Jumbotron, Masked image, Modal window, Paginator, Pricing table, Progress bars, Quotes, Social buttons, Tabs, and Timeline.
77

88
.. figure:: ../Images/dasce-1.png
99
:width: 999px

‎Documentation/Images/dasce-1.png‎

9.79 KB
Loading

‎Resources/Private/Language/ca.locallang_be.xlf‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1363,6 +1363,22 @@
13631363
<source>First image before, second image after. Both should have the same dimensions or at least the same aspect ratio.</source>
13641364
<target>Primera imatge abans, segona imatge després. Ambues hauriedn the tenir les mateixes mides o almenys la mateixa relació d'aspecte.</target>
13651365
</trans-unit>
1366+
<trans-unit id="tt_content.maskedimage">
1367+
<source>Masked image</source>
1368+
<target>Imatge enmascarada</target>
1369+
</trans-unit>
1370+
<trans-unit id="tt_content.maskedimage.description">
1371+
<source>Masked image</source>
1372+
<target>Imatge enmascarada.</target>
1373+
</trans-unit>
1374+
<trans-unit id="tt_content.maskedimage.images">
1375+
<source>Images</source>
1376+
<target>Imatges</target>
1377+
</trans-unit>
1378+
<trans-unit id="tt_content.maskedimage.images.description">
1379+
<source>Second image a PNG to be used as a mask. It has to have a transparent or semi-transparent area. Black indicates fully transparent.</source>
1380+
<target>La segona imatge ha de ser un PNG que s'utilitzarà com a màscara. Ha de tenir una zona transparent o semitransparent. El negre indica transparència completa.</target>
1381+
</trans-unit>
13661382
<trans-unit id="tt_content.socialbuttons">
13671383
<source>Social buttons</source>
13681384
<target>Botons socials</target>

‎Resources/Private/Language/de.locallang_be.xlf‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1337,7 +1337,7 @@
13371337
</trans-unit>
13381338
<trans-unit id="tt_content.audioplayer.description">
13391339
<source>Audio player</source>
1340-
<target>Audioplayer</target>
1340+
<target>Audioplayer.</target>
13411341
</trans-unit>
13421342
<trans-unit id="tt_content.audioplayer.files">
13431343
<source>Audio files</source>
@@ -1363,6 +1363,22 @@
13631363
<source>First image before, second image after. Both should have the same dimensions or at least the same aspect ratio.</source>
13641364
<target>Erstes Bild vorher, zweites Bild nachher. Beide sollten die gleichen Abmessungen oder zumindest das gleiche Seitenverhältnis haben.</target>
13651365
</trans-unit>
1366+
<trans-unit id="tt_content.maskedimage">
1367+
<source>Masked image</source>
1368+
<target>Maskiertes Bild</target>
1369+
</trans-unit>
1370+
<trans-unit id="tt_content.maskedimage.description">
1371+
<source>Masked image</source>
1372+
<target>Maskiertes Bild.</target>
1373+
</trans-unit>
1374+
<trans-unit id="tt_content.maskedimage.images">
1375+
<source>Images</source>
1376+
<target>Bilder</target>
1377+
</trans-unit>
1378+
<trans-unit id="tt_content.maskedimage.images.description">
1379+
<source>Second image a PNG to be used as a mask. It has to have a transparent or semi-transparent area. Black indicates fully transparent.</source>
1380+
<target>Das zweite Bild ist ein PNG, das als Maske verwendet wird. Es muss einen transparenten oder halbtransparenten Bereich haben. Schwarz bedeutet vollständig transparent.</target>
1381+
</trans-unit>
13661382
<trans-unit id="tt_content.socialbuttons">
13671383
<source>Social buttons</source>
13681384
<target>Soziale Schaltflächen</target>

‎Resources/Private/Language/es.locallang_be.xlf‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1363,6 +1363,22 @@
13631363
<source>First image before, second image after. Both should have the same dimensions or at least the same aspect ratio.</source>
13641364
<target>Primera imagen antes, segunda imagen después. Ambas deberían tener las mismas medidas o al menos la misma relación de aspecto.</target>
13651365
</trans-unit>
1366+
<trans-unit id="tt_content.maskedimage">
1367+
<source>Masked image</source>
1368+
<target>Imagen enmascarada</target>
1369+
</trans-unit>
1370+
<trans-unit id="tt_content.maskedimage.description">
1371+
<source>Masked image</source>
1372+
<target>Imagen enmascarada.</target>
1373+
</trans-unit>
1374+
<trans-unit id="tt_content.maskedimage.images">
1375+
<source>Images</source>
1376+
<target>Imágenes</target>
1377+
</trans-unit>
1378+
<trans-unit id="tt_content.maskedimage.images.description">
1379+
<source>Second image a PNG to be used as a mask. It has to have a transparent or semi-transparent area. Black indicates fully transparent.</source>
1380+
<target>La segunda imagen debe ser en formato PNG que se usará como máscara. Debe tener un área transparente o semitransparente. El negro indica completamente transparente.</target>
1381+
</trans-unit>
13661382
<trans-unit id="tt_content.socialbuttons">
13671383
<source>Social buttons</source>
13681384
<target>Botones sociales</target>

‎Resources/Private/Language/locallang_be.xlf‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,6 +1023,18 @@
10231023
<trans-unit id="tt_content.beforeafterimage.images.description">
10241024
<source>First image before, second image after. Both should have the same dimensions or at least the same aspect ratio.</source>
10251025
</trans-unit>
1026+
<trans-unit id="tt_content.maskedimage">
1027+
<source>Masked image</source>
1028+
</trans-unit>
1029+
<trans-unit id="tt_content.maskedimage.description">
1030+
<source>Masked image.</source>
1031+
</trans-unit>
1032+
<trans-unit id="tt_content.maskedimage.images">
1033+
<source>Images</source>
1034+
</trans-unit>
1035+
<trans-unit id="tt_content.maskedimage.images.description">
1036+
<source>Second image a PNG to be used as a mask. It has to have a transparent or semi-transparent area. Black indicates fully transparent.</source>
1037+
</trans-unit>
10261038
<trans-unit id="tt_content.socialbuttons">
10271039
<source>Social buttons</source>
10281040
</trans-unit>

‎Resources/Private/Partials/Content/Main/MaskedImage.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<div class="tx-das-content-maskedimage tx-das-content-maskedimage-layout-{layout}" data-id="c{record.uid}">
2+
<v:page.resources.fal table="tt_content" field="images" as="images" record="{record}">
3+
<f:variable name="mask" value="{f:uri.image(src: '{images.1.uid}', treatIdAsReference: 1)}" />
4+
<f:image src="{images.0.url}" alt="{file.description}" loading="{settings.lazyLoading}" style="-webkit-mask-image: url({mask}); mask-image: url({mask});" />
5+
</v:page.resources.fal>
6+
</div>

‎Resources/Private/Templates/Content/MaskedImage.html‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
<f:layout name="Content" />
2+
3+
<f:section name="Configuration">
4+
<flux:form
5+
id="MaskedImage"
6+
label="LLL:EXT:das/Resources/Private/Language/locallang_be.xlf:tt_content.maskedimage"
7+
description="LLL:EXT:das/Resources/Private/Language/locallang_be.xlf:tt_content.maskedimage.description"
8+
>
9+
<flux:form.option.group
10+
value="dasContent"
11+
/>
12+
<flux:form.option.icon
13+
value="EXT:das/Resources/Public/Icons/Content/MaskedImage.png"
14+
/>
15+
<flux:field.select
16+
name="layout"
17+
label="LLL:EXT:das/Resources/Private/Language/locallang_be.xlf:layout"
18+
items="{
19+
0:{0: 'LLL:EXT:das/Resources/Private/Language/locallang_be.xlf:default', 1: '0'}
20+
}"
21+
requestUpdate="1"
22+
/>
23+
<flux:field.inline.fal
24+
name="images"
25+
label="LLL:EXT:das/Resources/Private/Language/locallang_be.xlf:tt_content.maskedimage.images"
26+
description="LLL:EXT:das/Resources/Private/Language/locallang_be.xlf:tt_content.maskedimage.images.description"
27+
minItems="2"
28+
maxItems="2"
29+
allowedExtensions="jpg,jpeg,png,gif,webp"
30+
/>
31+
</flux:form>
32+
</f:section>
33+
34+
<f:section name="Preview">
35+
<table class="table table-condensed table-hover">
36+
<tbody>
37+
<tr>
38+
<th>
39+
<f:translate key="LLL:EXT:das/Resources/Private/Language/locallang_be.xlf:layout" />
40+
</th>
41+
<td width="20%">
42+
<f:if condition="{layout} == 0">
43+
<f:then>
44+
<f:translate key="LLL:EXT:das/Resources/Private/Language/locallang_be.xlf:default" />
45+
</f:then>
46+
<f:else>
47+
<f:translate key="LLL:EXT:das/Resources/Private/Language/locallang_be.xlf:custom" />
48+
</f:else>
49+
</f:if>
50+
</td>
51+
</tr>
52+
<tr>
53+
<th>
54+
<f:translate key="LLL:EXT:das/Resources/Private/Language/locallang_be.xlf:tt_content.maskedimage.images" />
55+
</th>
56+
<td>
57+
<v:page.resources.fal table="tt_content" field="images" as="images" record="{record}">
58+
<img src="{f:uri.image(src: '{images.0.id}', width: 75, treatIdAsReference: 1)}" width="75" alt="" />
59+
<img src="{f:uri.image(src: '{images.1.id}', width: 75, treatIdAsReference: 1)}" width="75" alt="" />
60+
</v:page.resources.fal>
61+
</td>
62+
</tr>
63+
</tbody>
64+
</table>
65+
</f:section>
66+
67+
<f:section name="Main">
68+
<f:render partial="Content/Main/MaskedImage" arguments="{_all}" />
69+
</f:section>

‎Resources/Public/Css/css.css‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -844,6 +844,13 @@ audio {
844844
box-shadow: 1px 1px 1px hsl(0, 50%, 2%, .5);
845845
}
846846

847+
/* Masked image */
848+
849+
.tx-das-content-maskedimage img {
850+
mask-repeat: no-repeat;
851+
mask-size: cover;
852+
}
853+
847854
/* bg */
848855

849856
.bg-primary-vignete {

0 commit comments

Comments
 (0)