Skip to content

Commit b069934

Browse files
jonnittojonnitto
committed
Breaking: Make defaults values editable on page
Closes #2
1 parent cc0aa98 commit b069934

File tree

7 files changed

+104
-14
lines changed

7 files changed

+104
-14
lines changed

‎Configuration/NodeTypes.Mixin.yaml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
'Garagist.ImageDirectory:Mixin.Defaults':
2+
abstract: true
3+
ui:
4+
inspector:
5+
groups:
6+
imageDirectory:
7+
label: i18n
8+
icon: gavel
9+
position: end
10+
properties:
11+
imageDirectoryPrefixCopyright:
12+
type: string
13+
defaultValue: ©
14+
ui:
15+
label: i18n
16+
reloadPageIfChanged: true
17+
inspector:
18+
group: imageDirectory
19+
position: 10
20+
imageDirectoryDefaultCopyright:
21+
type: string
22+
ui:
23+
label: i18n
24+
reloadPageIfChanged: true
25+
inspector:
26+
group: imageDirectory
27+
position: 20
28+
imageDirectoryImageWidth:
29+
type: integer
30+
defaultValue: 200
31+
ui:
32+
label: i18n
33+
reloadPageIfChanged: true
34+
inspector:
35+
group: imageDirectory
36+
position: 30
37+
editor: 'Neos.Neos/Inspector/Editors/RangeEditor'
38+
editorOptions:
39+
min: 100
40+
max: 600
41+
step: 10
42+
unit: px

‎Configuration/Settings.yaml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ Neos:
33
fusion:
44
autoInclude:
55
Garagist.ImageDirectory: true
6-
7-
Garagist:
8-
ImageDirectory:
9-
prefixCopyright: "© "
10-
defaultCopyright: null
11-
imageWidth: 200
6+
userInterface:
7+
translation:
8+
autoInclude:
9+
Garagist.ImageDirectory:
10+
- 'NodeTypes/*'

‎Resources/Private/Fusion/Component/ByAsset.fusion‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,19 @@ prototype(Garagist.ImageDirectory:ByAsset) < prototype(Neos.Fusion:Component) {
99
sortBy = 'asset'
1010
}
1111

12-
prefixCopyright = ${Configuration.setting('Garagist.ImageDirectory.prefixCopyright')}
13-
defaultCopyright = ${Configuration.setting('Garagist.ImageDirectory.defaultCopyright')}
14-
imageWidth = ${Configuration.setting('Garagist.ImageDirectory.imageWidth')}
12+
node = ${node}
13+
14+
prefixCopyright = ${q(this.node).property('imageDirectoryPrefixCopyright')}
15+
defaultCopyright = ${q(this.node).property('imageDirectoryDefaultCopyright')}
16+
imageWidth = ${q(this.node).property('imageDirectoryImageWidth')}
1517

1618
renderer = Neos.Fusion:Map {
1719
@process.filter = ${Array.filter(value)}
1820
items = ${props.rawList}
1921
itemRenderer = Garagist.ImageDirectory:Helper.AssetDataStructure {
2022
asset = ${item.asset}
21-
defaultCopyright = ${props.defaultCopyright}
2223
prefixCopyright = ${props.prefixCopyright}
24+
defaultCopyright = ${props.defaultCopyright}
2325
imageWidth = ${props.imageWidth}
2426
documents = Neos.Fusion:Map {
2527
@process.filter = ${Array.filter(value)}

‎Resources/Private/Fusion/Component/ByDocument.fusion‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ prototype(Garagist.ImageDirectory:ByDocument) < prototype(Neos.Fusion:Component)
99
sortBy = 'document'
1010
}
1111

12-
prefixCopyright = ${Configuration.setting('Garagist.ImageDirectory.prefixCopyright')}
13-
defaultCopyright = ${Configuration.setting('Garagist.ImageDirectory.defaultCopyright')}
14-
imageWidth = ${Configuration.setting('Garagist.ImageDirectory.imageWidth')}
12+
node = ${node}
13+
14+
prefixCopyright = ${q(this.node).property('imageDirectoryPrefixCopyright')}
15+
defaultCopyright = ${q(this.node).property('imageDirectoryDefaultCopyright')}
16+
imageWidth = ${q(this.node).property('imageDirectoryImageWidth')}
1517

1618
renderer = Neos.Fusion:Map {
1719
@process.filter = ${Array.filter(value)}
@@ -23,8 +25,8 @@ prototype(Garagist.ImageDirectory:ByDocument) < prototype(Neos.Fusion:Component)
2325
items = ${item.assets}
2426
itemRenderer = Garagist.ImageDirectory:Helper.AssetDataStructure {
2527
asset = ${item}
26-
defaultCopyright = ${props.defaultCopyright}
2728
prefixCopyright = ${props.prefixCopyright}
29+
defaultCopyright = ${props.defaultCopyright}
2830
imageWidth = ${props.imageWidth}
2931
}
3032
}

‎Resources/Private/Translations/de/NodeTypes/Mixin/Defaults.xlf‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<xliff version="1.2"
3+
xmlns="urn:oasis:names:tc:xliff:document:1.2">
4+
<file original="" product-name="Garagist.ImageDirectory" source-language="en" target-language="de" datatype="plaintext">
5+
<body>
6+
<trans-unit id="groups.imageDirectory" xml:space="preserve">
7+
<source>Settings image directory</source>
8+
<target>Einstellungen Bilderverzeichnis</target>
9+
</trans-unit>
10+
<trans-unit id="properties.imageDirectoryPrefixCopyright" xml:space="preserve">
11+
<source>Prefix copyright</source>
12+
<target>Prefix beim Copyright</target>
13+
</trans-unit>
14+
<trans-unit id="properties.imageDirectoryDefaultCopyright" xml:space="preserve">
15+
<source>Default copyright</source>
16+
<target>Standartcopyright</target>
17+
</trans-unit>
18+
<trans-unit id="properties.imageDirectoryImageWidth" xml:space="preserve">
19+
<source>Image width</source>
20+
<target>Bilderbreite</target>
21+
</trans-unit>
22+
</body>
23+
</file>
24+
</xliff>

‎Resources/Private/Translations/en/NodeTypes/Mixin/Defaults.xlf‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<xliff version="1.2"
3+
xmlns="urn:oasis:names:tc:xliff:document:1.2">
4+
<file original="" product-name="Garagist.ImageDirectory" source-language="en" datatype="plaintext">
5+
<body>
6+
<trans-unit id="groups.imageDirectory" xml:space="preserve">
7+
<source>Settings image directory</source>
8+
</trans-unit>
9+
<trans-unit id="properties.imageDirectoryPrefixCopyright" xml:space="preserve">
10+
<source>Prefix copyright</source>
11+
</trans-unit>
12+
<trans-unit id="properties.imageDirectoryDefaultCopyright" xml:space="preserve">
13+
<source>Default copyright</source>
14+
</trans-unit>
15+
<trans-unit id="properties.imageDirectoryImageWidth" xml:space="preserve">
16+
<source>Image width</source>
17+
</trans-unit>
18+
</body>
19+
</file>
20+
</xliff>

‎composer.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"license": "GPL-3.0-or-later",
66
"require": {
77
"php": "^8.0",
8+
"neos/neos": "^7.3 || ^8.0",
89
"flowpack/neos-asset-usage": "^0.2"
910
},
1011
"autoload": {

0 commit comments

Comments
 (0)