Skip to content

Bugfixes #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PRGfx wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Bugfixes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9c9a1e7
BUGFIX: policy-link already is a link
PRGfx Mar 4, 2019
12708ff
TASK: remove undocumented layout option
PRGfx Mar 4, 2019
7c9688a
TASK: enable unsetting element theme
PRGfx Mar 4, 2019
634693c
TASK: add missing translations
PRGfx Mar 4, 2019
2cc1dcd
TASK: use colors configured for element
PRGfx Mar 4, 2019
35f1fc5
TASK: highlight and button have `border` instead of `link`
PRGfx Mar 4, 2019
bd75096
TASK: add german translation
PRGfx Mar 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions Configuration/NodeTypes.Consent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,6 @@
label: 'i18n'
edgeless:
label: 'i18n'
wire:
label: 'i18n'
validation:
Neos.Neos/Validation/NotEmptyValidator: []
Neos.Neos/Validation/StringValidator: []
Expand All @@ -194,6 +192,7 @@
editor: 'Neos.Neos/Inspector/Editors/SelectBoxEditor'
editorOptions:
dataSourceIdentifier: 'soee-cookieconsent-palettes'
allowEmpty: true
popupBackgroundColor:
type: string
defaultValue: null
Expand Down Expand Up @@ -254,7 +253,7 @@
editor: 'Soee.InspectorEditors/ColorPickerEditor'
validation:
Soee.Validators/Validation/ColorValidator: []
buttonLinkColor:
buttonBorderColor:
type: string
defaultValue: null
ui:
Expand Down Expand Up @@ -290,7 +289,7 @@
editor: 'Soee.InspectorEditors/ColorPickerEditor'
validation:
Soee.Validators/Validation/ColorValidator: []
highlightLinkColor:
highlightBorderColor:
type: string
defaultValue: null
ui:
Expand Down
26 changes: 15 additions & 11 deletions Resources/Private/Fusion/Prototypes/CookieConsent.fusion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ prototype(Soee.CookieConsent:Consent) < prototype(Neos.Fusion:Tag) {
tagName = 'script'

@context.settings = Neos.Fusion:RawArray {
@context.selectedPalette = ${q(node).property('palette') ? Configuration.setting('Soee.CookieConsent.palettes.' + q(node).property('palette') + '.colors') : null}
type = ${q(node).property('type') ? q(node).property('type'):'info'}
theme = ${q(node).property('layout') ? q(node).property('layout'):'block'}
position = ${q(node).property('position') ? q(node).property('position'):'bottom'}
Expand All @@ -12,22 +13,25 @@ prototype(Soee.CookieConsent:Consent) < prototype(Neos.Fusion:Tag) {
allow = ${q(node).property('allowButtonText')}
deny = ${q(node).property('denyButtonText')}
link = ${q(node).property('policyLinkText')}
href = Neos.Neos:NodeUri {
node = ${q(node).property('policyLink')}
absolute = true

@if.linkIsSet = ${q(node).property('policyLink')}
}
href = ${q(node).property('policyLink')}
href.@process.convertUris = Neos.Neos:ConvertUris
href.@if.linkIsSet = ${q(node).property('policyLink')}
}
palette = Neos.Fusion:RawArray {
popup = Neos.Fusion:RawArray {
background = '#000'
text = '#0f0'
background = ${selectedPalette.popup.background || q(node).property('popupBackgroundColor') || '#000'}
text = ${selectedPalette.popup.text || q(node).property('popupTextColor') || '#0f0'}
link = ${selectedPalette.popup.link || q(node).property('popupLinkColor') || '#0f0'}
}
button = Neos.Fusion:RawArray {
background = 'transparent'
text = '#0f0'
border = '#0f0'
background = ${selectedPalette.button.background || q(node).property('buttonBackgroundColor') || 'transparent'}
text = ${selectedPalette.button.text || q(node).property('buttonTextColor') || '#0f0'}
border = ${selectedPalette.button.border || q(node).property('buttonBorderColor') || '#0f0'}
}
highlight = Neos.Fusion:RawArray {
background = ${selectedPalette.highlight.background || q(node).property('highlightBackgroundColor') || 'transparent'}
text = ${selectedPalette.highlight.text || q(node).property('highlightTextColor') || '#0f0'}
border = ${selectedPalette.highlight.border || q(node).property('highlightBorderColor') || '#0f0'}
}
}
}
Expand Down
161 changes: 161 additions & 0 deletions Resources/Private/Translations/de/NodeTypes/Consent.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
<?xml version="1.0" encoding="UTF-8"?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file original="" product-name="Soee.CookieConsent" source-language="en" target-language="de" datatype="plaintext">
<body>

<trans-unit id="ui.label" xml:space="preserve">
<source>Cookie Consent</source>
<target state="translated">Cookie-Hinweis</target>
</trans-unit>

<trans-unit id="tabs.palette" xml:space="preserve">
<source>Color palette</source>
<target state="translated">Farbpalette</target>
</trans-unit>

<trans-unit id="groups.consent" xml:space="preserve">
<source>Cookie consent</source>
<target state="translated">Cookie-Hinweis</target>
</trans-unit>
<trans-unit id="groups.palette" xml:space="preserve">
<source>Palette</source>
<target state="translated">Palette</target>
</trans-unit>
<trans-unit id="groups.popup" xml:space="preserve">
<source>Popup</source>
<target state="translated">Popup</target>
</trans-unit>
<trans-unit id="groups.button" xml:space="preserve">
<source>Button</source>
<target state="translated">Button</target>
</trans-unit>
<trans-unit id="groups.highlight" xml:space="preserve">
<source>Highlight</source>
<target state="translated">Highlight</target>
</trans-unit>

<trans-unit id="properties.message" xml:space="preserve">
<source>Message</source>
<target state="translated">Text</target>
</trans-unit>
<trans-unit id="properties.dismissButtonText" xml:space="preserve">
<source>Button text</source>
<target state="translated">Buttonbeschriftung</target>
</trans-unit>
<trans-unit id="properties.allowButtonText" xml:space="preserve">
<source>Allow button text</source>
<target state="translated">Buttonbeschriftung anzeigen</target>
</trans-unit>
<trans-unit id="properties.denyButtonText" xml:space="preserve">
<source>Deny button text</source>
<target state="translated">"Ablehnen" Buttonbeschriftung</target>
</trans-unit>
<trans-unit id="properties.policyLinkText" xml:space="preserve">
<source>Policy link text</source>
<target state="translated">Datenschutzlink-Text</target>
</trans-unit>
<trans-unit id="properties.policyLink" xml:space="preserve">
<source>Policy page link</source>
<target state="translated">Datenschutzlink-Seite</target>
</trans-unit>
<trans-unit id="properties.type" xml:space="preserve">
<source>Type</source>
<target state="translated">Typ</target>
</trans-unit>
<trans-unit id="properties.type.selectBoxEditor.values.info" xml:space="preserve">
<source>info</source>
<target state="translated">info</target>
</trans-unit>
<trans-unit id="properties.type.selectBoxEditor.values.opt-in" xml:space="preserve">
<source>opt-in</source>
<target state="translated">opt-in</target>
</trans-unit>
<trans-unit id="properties.type.selectBoxEditor.values.opt-out" xml:space="preserve">
<source>opt-out</source>
<target state="translated">opt-out</target>
</trans-unit>
<trans-unit id="properties.position" xml:space="preserve">
<source>Position</source>
<target state="translated">Position</target>
</trans-unit>
<trans-unit id="properties.position.selectBoxEditor.values.top" xml:space="preserve">
<source>top</source>
<target state="translated">oben</target>
</trans-unit>
<trans-unit id="properties.position.selectBoxEditor.values.bottom" xml:space="preserve">
<source>bottom</source>
<target state="translated">unten</target>
</trans-unit>
<trans-unit id="properties.position.selectBoxEditor.values.bottom-left" xml:space="preserve">
<source>bottom left</source>
<target state="translated">unten links</target>
</trans-unit>
<trans-unit id="properties.position.selectBoxEditor.values.bottom-right" xml:space="preserve">
<source>bottom right</source>
<target state="translated">unten rechts</target>
</trans-unit>
<trans-unit id="properties.static" xml:space="preserve">
<source>Static</source>
<target state="translated">Statisch</target>
</trans-unit>
<trans-unit id="properties.layout" xml:space="preserve">
<source>Layout</source>
<target state="translated">Darstellung</target>
</trans-unit>
<trans-unit id="properties.layout.selectBoxEditor.values.block">
<source>Block</source>
<target>Block</target>
</trans-unit>
<trans-unit id="properties.layout.selectBoxEditor.values.classic">
<source>Classic</source>
<target>abgerundeter Button</target>
</trans-unit>
<trans-unit id="properties.layout.selectBoxEditor.values.edgeless">
<source>Without edges</source>
<target>Kantenlos</target>
</trans-unit>

<trans-unit id="properties.palette" xml:space="preserve">
<source>Color palette</source>
<target state="translated">Farbpalette</target>
</trans-unit>
<trans-unit id="properties.popupBackgroundColor" xml:space="preserve">
<source>Background color</source>
<target state="translated">Hintergrundfarbe</target>
</trans-unit>
<trans-unit id="properties.popupTextColor" xml:space="preserve">
<source>Text color</source>
<target state="translated">Textfarbe</target>
</trans-unit>
<trans-unit id="properties.popupLinkColor" xml:space="preserve">
<source>Link color</source>
<target state="translated">Linkfarbe</target>
</trans-unit>
<trans-unit id="properties.buttonBackgroundColor" xml:space="preserve">
<source>Background color</source>
<target state="translated">Hintergrundfarbe</target>
</trans-unit>
<trans-unit id="properties.buttonTextColor" xml:space="preserve">
<source>Text color</source>
<target state="translated">Textfarbe</target>
</trans-unit>
<trans-unit id="properties.buttonLinkColor" xml:space="preserve">
<source>Border color</source>
<target state="translated">Rahmenfarbe</target>
</trans-unit>
<trans-unit id="properties.highlightBackgroundColor" xml:space="preserve">
<source>Background color</source>
<target state="translated">Hintergrundfarbe</target>
</trans-unit>
<trans-unit id="properties.highlightTextColor" xml:space="preserve">
<source>Text color</source>
<target state="translated">Textfarbe</target>
</trans-unit>
<trans-unit id="properties.highlightLinkColor" xml:space="preserve">
<source>Border color</source>
<target state="translated">Rahmenfarbe</target>
</trans-unit>

</body>
</file>
</xliff>
41 changes: 41 additions & 0 deletions Resources/Private/Translations/de/Settings.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
<file original="" product-name="Soee.CookieConsent" source-language="en" target-language="de" datatype="plaintext">
<body>

<trans-unit id="palettes.black-yellow" xml:space="preserve">
<source>black - yellow</source>
<target>Schwarz / Gelb</target>
</trans-unit>
<trans-unit id="palettes.aquamarine-blue" xml:space="preserve">
<source>aquamarine - blue</source>
<target>Aquamarin / Blau</target>
</trans-unit>
<trans-unit id="palettes.prussian-blue" xml:space="preserve">
<source>prussian blue - blue</source>
<target>Preußisch-Blau / Blau</target>
</trans-unit>
<trans-unit id="palettes.black-green">
<source>black - green</source>
<target>Schwarz / Grün</target>
</trans-unit>
<trans-unit id="palettes.blue-purple">
<source>blue - purple</source>
<target>Blau / Lila</target>
</trans-unit>
<trans-unit id="palettes.cyclamen-violet">
<source>cyclam - violet</source>
<target>Cyclam / Violet</target>
</trans-unit>
<trans-unit id="palettes.blue-white">
<source>blue - white</source>
<target>Blau / Weiß</target>
</trans-unit>
<trans-unit id="palettes.sanguine-red">
<source>sanguine-red</source>
<target>Blutrot</target>
</trans-unit>

</body>
</file>
</xliff>
Loading