From dd14549dc94090ff6c736221ff5b7a92e287f2f7 Mon Sep 17 00:00:00 2001 From: Renzo Bauen Date: Sat, 21 Dec 2024 21:24:53 +0100 Subject: [PATCH] Codeing variety fixed, Layout Lists fixed --- .../Kennellist/assets/frontend.css | 3 ++ .../Kennellist/templates/frontend.html | 38 +++++++++++-------- .../Litterlist/templates/frontend.html | 14 ++++++- ContentBlocks/RecordTypes/Kennel/config.yaml | 6 +-- ContentBlocks/RecordTypes/Litter/config.yaml | 6 +-- .../RecordTypes/Pedigree/config.yaml | 5 +-- Resources/Private/Language/de.locallang.xlf | 10 ++++- Resources/Private/Language/fr.locallang.xlf | 10 ++++- Resources/Private/Language/it.locallang.xlf | 10 ++++- Resources/Private/Language/locallang.xlf | 8 +++- 10 files changed, 80 insertions(+), 30 deletions(-) diff --git a/ContentBlocks/ContentElements/Kennellist/assets/frontend.css b/ContentBlocks/ContentElements/Kennellist/assets/frontend.css index 7603068..fa87d68 100644 --- a/ContentBlocks/ContentElements/Kennellist/assets/frontend.css +++ b/ContentBlocks/ContentElements/Kennellist/assets/frontend.css @@ -33,6 +33,9 @@ color: var(--_clr-header); background-color: var(--_clr-headerbg); border-block-end: 1px solid var(--_clr-accent); + display: flex; + flex-wrap: nowrap; + justify-content: space-between; } } diff --git a/ContentBlocks/ContentElements/Kennellist/templates/frontend.html b/ContentBlocks/ContentElements/Kennellist/templates/frontend.html index 2a5baf1..146dcdf 100644 --- a/ContentBlocks/ContentElements/Kennellist/templates/frontend.html +++ b/ContentBlocks/ContentElements/Kennellist/templates/frontend.html @@ -17,33 +17,41 @@
-

{kennel.data.k_name}

-
- {kennel.data.k_name}
- {kennel.data.k_first_name} {kennel.data.k_last_name}
- {kennel.data.k_address -> f:format.nl2br()} -
-
-
+

{kennel.data.k_name} + museau normal museau normal face rase face rase - museau normal und face rase - museau normal und face rase + museau normal / face rase + museau normal / face rase not defined -

- {kennel.data.k_mobile}
- {kennel.data.k_email}
- {kennel.data.k_web} + + +
+

+ {kennel.data.k_first_name} {kennel.data.k_last_name}
+ {kennel.data.k_address -> f:format.nl2br()} +
+
+

+ + {kennel.data.k_mobile}
+ + + {kennel.data.k_email}
+ + + {kennel.data.k_web} +
-

+

diff --git a/ContentBlocks/ContentElements/Litterlist/templates/frontend.html b/ContentBlocks/ContentElements/Litterlist/templates/frontend.html index 9ef691c..e0ea1d8 100644 --- a/ContentBlocks/ContentElements/Litterlist/templates/frontend.html +++ b/ContentBlocks/ContentElements/Litterlist/templates/frontend.html @@ -18,7 +18,8 @@
-
{litter.kennels.0.data.k_name}
+
{litter.kennels.0.data.k_name} +
{litter.data.l_name}

+
+ + museau normal + museau normal + face rase + face rase + museau normal / face rase + museau normal / face rase + not defined + +
{litter.data.l_males} m / {litter.data.l_females} f
{litter.data.l_comment}
diff --git a/ContentBlocks/RecordTypes/Kennel/config.yaml b/ContentBlocks/RecordTypes/Kennel/config.yaml index 6e19847..ef06c76 100644 --- a/ContentBlocks/RecordTypes/Kennel/config.yaml +++ b/ContentBlocks/RecordTypes/Kennel/config.yaml @@ -40,11 +40,11 @@ fields: default: 0 items: - label: '---' - value: 0 - - label: 'Museau Normal' value: 1 - - label: 'Face Rase' + - label: 'Museau Normal' value: 2 + - label: 'Face Rase' + value: 4 - identifier: p_breeder type: Palette description: Adresse der Zuchtstätte diff --git a/ContentBlocks/RecordTypes/Litter/config.yaml b/ContentBlocks/RecordTypes/Litter/config.yaml index 0ab3ac7..4738ff5 100644 --- a/ContentBlocks/RecordTypes/Litter/config.yaml +++ b/ContentBlocks/RecordTypes/Litter/config.yaml @@ -35,12 +35,12 @@ fields: size: 30 - identifier: l_variety type: Radio - default: 1 + default: 0 items: - label: 'Museau normal' - value: 1 - - label: 'Face rase' value: 2 + - label: 'Face rase' + value: 4 - identifier: l_date type: DateTime format: date diff --git a/ContentBlocks/RecordTypes/Pedigree/config.yaml b/ContentBlocks/RecordTypes/Pedigree/config.yaml index c1e74df..b6a4346 100644 --- a/ContentBlocks/RecordTypes/Pedigree/config.yaml +++ b/ContentBlocks/RecordTypes/Pedigree/config.yaml @@ -50,12 +50,9 @@ fields: minitems: 0 maxitems: 1 - identifier: p_variety - type: Select - renderType: selectSingle + type: Radio default: 0 items: - - label: '---' - value: 0 - label: 'Museau Normal' value: 2 - label: 'Face Rase' diff --git a/Resources/Private/Language/de.locallang.xlf b/Resources/Private/Language/de.locallang.xlf index e6e7bd8..5825cc8 100644 --- a/Resources/Private/Language/de.locallang.xlf +++ b/Resources/Private/Language/de.locallang.xlf @@ -1,7 +1,15 @@ - + + + Breeder + Züchter + + + Contact + Kontakt + No active kennels found Zurzeit keine aktiven Züchter vorhanden diff --git a/Resources/Private/Language/fr.locallang.xlf b/Resources/Private/Language/fr.locallang.xlf index c3b397b..a217c74 100644 --- a/Resources/Private/Language/fr.locallang.xlf +++ b/Resources/Private/Language/fr.locallang.xlf @@ -1,8 +1,16 @@ - +
+ + Breeder + Éleveur + + + Contact + Contact + No active kennels found Aucun éleveur actif pour le moment diff --git a/Resources/Private/Language/it.locallang.xlf b/Resources/Private/Language/it.locallang.xlf index 1fe12e8..b99c78c 100644 --- a/Resources/Private/Language/it.locallang.xlf +++ b/Resources/Private/Language/it.locallang.xlf @@ -1,7 +1,15 @@ - + + + Breeder + Allevatore + + + Contact + Contatto + No active kennels found Attualmente non sono disponibili allevatori attivi diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf index 1e74408..2c17cd1 100644 --- a/Resources/Private/Language/locallang.xlf +++ b/Resources/Private/Language/locallang.xlf @@ -1,8 +1,14 @@ - +
+ + Breeder + + + Contact + No active kennels found