Codeing variety fixed, Layout Lists fixed

conpassione · Dec 21, 2024 · dd14549 · dd14549
1 parent 77c2b12
commit dd14549
Show file tree

Hide file tree

Showing 10 changed files with 80 additions and 30 deletions.
diff --git 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
@@ -17,33 +17,41 @@
             <f:then>
                 <f:for as="kennel" each="{kennels}" iteration="ikennels">
                     <div class="kennelcard" id="kennel{kennel.data.uid}" aria-label="Kennels">
-                        <h3 class="kennelcard--header h3-font">{kennel.data.k_name}</h3>
-                        <div class="kennelcard--breeder">
-                            {kennel.data.k_name}<br>
-                            {kennel.data.k_first_name} {kennel.data.k_last_name}<br>
-                            {kennel.data.k_address -> f:format.nl2br()}
-                        </div>
-                        <div class="kennelcard--communication">
-                            <div class="kennelcard--variety">
+                        <h3 class="kennelcard--header h3-font"><span>{kennel.data.k_name}</span>
+                            <span>
                                 <f:switch expression="{kennel.data.k_variety}">
                                     <f:case value="2">museau normal</f:case>
                                     <f:case value="3">museau normal</f:case>
                                     <f:case value="4">face rase</f:case>
                                     <f:case value="5">face rase</f:case>
-                                    <f:case value="6">museau normal und face rase</f:case>
-                                    <f:case value="7">museau normal und face rase</f:case>
+                                    <f:case value="6">museau normal / face rase</f:case>
+                                    <f:case value="7">museau normal / face rase</f:case>
                                     <f:defaultCase>not defined</f:defaultCase>
                                 </f:switch>
-                            </div>
-                            <f:link.external uri="tel:{kennel.data.k_mobile}" class="phone-link--icon">{kennel.data.k_mobile}</f:link.external><br>
-                            <f:link.email email="{kennel.data.k_email}" class="mail-link--icon">{kennel.data.k_email}</f:link.email><br>
-                            <f:link.external uri="{kennel.data.k_web}" target="_blank" class="url-link--icon">{kennel.data.k_web}</f:link.external>
+                            </span>
+                        </h3>
+                        <div class="kennelcard--breeder">
+                            <h4><f:translate key="LLL:EXT:cpkm/Resources/Private/Language/locallang.xlf:kennel.breeder"/></h4>
+                            {kennel.data.k_first_name} {kennel.data.k_last_name}<br>
+                            {kennel.data.k_address -> f:format.nl2br()}
+                        </div>
+                        <div class="kennelcard--communication">
+                            <h4><f:translate key="LLL:EXT:cpkm/Resources/Private/Language/locallang.xlf:kennel.contact"/></h4>
+                            <f:if condition="{kennel.data.k_mobile}">
+                                <f:link.external uri="tel:{kennel.data.k_mobile}" class="phone-link--icon">{kennel.data.k_mobile}</f:link.external><br>
+                            </f:if>
+                            <f:if condition="{kennel.data.k_email}">
+                                <f:link.email email="{kennel.data.k_email}" class="mail-link--icon">{kennel.data.k_email}</f:link.email><br>
+                            </f:if>
+                            <f:if condition="{kennel.data.k_web}">
+                                <f:link.external uri="{kennel.data.k_web}" target="_blank" class="url-link--icon">{kennel.data.k_web}</f:link.external>
+                            </f:if>
                         </div>
                     </div>
                 </f:for>
             </f:then>
             <f:else>
-                <p><f:translate key="LLL:EXT:cpkm/Resources/Private/Language/locallang.xlf:kennels.no-kennel"/></p>
+                <p><f:translate key="LLL:EXT:cpkm/Resources/Private/Language/locallang.xlf:kennel.no-kennel"/></p>
             </f:else>
         </f:if>
     </div>

diff --git a/ContentBlocks/ContentElements/Litterlist/templates/frontend.html b/ContentBlocks/ContentElements/Litterlist/templates/frontend.html
@@ -18,7 +18,8 @@
                 <f:for as="litter" each="{litters}" iteration="ilitter">
                     <div class="littercard" id="litter{litter.data.uid}" aria-label="Litters">
                         <div class="littercard--header">
-                            <div>{litter.kennels.0.data.k_name}</div>
+                            <div>{litter.kennels.0.data.k_name}
+                            </div>
                             <f:if condition="{data.l_type} == 2">
                                 <f:then>
                                     <div><f:translate key="{cb:languagePath(name: 'conpassione/litterlist')}:litter.litter"/> {litter.data.l_name} <f:translate
@@ -61,6 +62,17 @@ <h4><f:translate key="{cb:languagePath(name: 'conpassione/litterlist')}:litter.m
                         <f:if condition="{data.l_type} == 2">
                             <div class="littercard--litter">
                                 <h4><f:translate key="{cb:languagePath(name: 'conpassione/litterlist')}:litter.litter"/></h4>
+                                <div>
+                                    <f:switch expression="{litter.data.l_variety}">
+                                        <f:case value="2">museau normal</f:case>
+                                        <f:case value="3">museau normal</f:case>
+                                        <f:case value="4">face rase</f:case>
+                                        <f:case value="5">face rase</f:case>
+                                        <f:case value="6">museau normal / face rase</f:case>
+                                        <f:case value="7">museau normal / face rase</f:case>
+                                        <f:defaultCase>not defined</f:defaultCase>
+                                    </f:switch>
+                                </div>
                                 <div>{litter.data.l_males} m / {litter.data.l_females} f</div>
                                 <f:format.html>{litter.data.l_comment}</f:format.html>
                             </div>

diff --git 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
@@ -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
@@ -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
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-	<file source-language="en" target-language="de" original="locallang.xlf" datatype="plaintext" product-name="conpassione/cpkm" date="2024-12-15T23:10:24+01:00">
+	<file source-language="en" target-language="de" original="locallang.xlf" datatype="plaintext" product-name="conpassione/cpkm" date="2024-12-21T21:05:38+01:00">
 		<body>
+			<trans-unit id="kennel.breeder" resname="kennel.breeder">
+				<source>Breeder</source>
+				<target>Züchter</target>
+			</trans-unit>
+			<trans-unit id="kennel.contact" resname="kennel.contact">
+				<source>Contact</source>
+				<target>Kontakt</target>
+			</trans-unit>
 			<trans-unit id="kennel.no-kennel" resname="kennel.no-kennel">
 				<source>No active kennels found</source>
 				<target>Zurzeit keine aktiven Züchter vorhanden</target>

diff --git a/Resources/Private/Language/fr.locallang.xlf b/Resources/Private/Language/fr.locallang.xlf
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-	<file source-language="en" target-language="fr" original="locallang.xlf" datatype="plaintext" product-name="conpassione/cpkm" date="2024-12-15T23:10:24+01:00">
+	<file source-language="en" target-language="fr" original="locallang.xlf" datatype="plaintext" product-name="conpassione/cpkm" date="2024-12-21T21:05:38+01:00">
 		<header></header>
 		<body>
+			<trans-unit id="kennel.breeder" resname="kennel.breeder">
+				<source>Breeder</source>
+				<target>Éleveur</target>
+			</trans-unit>
+			<trans-unit id="kennel.contact" resname="kennel.contact">
+				<source>Contact</source>
+				<target>Contact</target>
+			</trans-unit>
 			<trans-unit id="kennel.no-kennel" resname="kennel.no-kennel">
 				<source>No active kennels found</source>
 				<target>Aucun éleveur actif pour le moment</target>

diff --git a/Resources/Private/Language/it.locallang.xlf b/Resources/Private/Language/it.locallang.xlf
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-	<file source-language="en" target-language="it" original="locallang.xlf" datatype="plaintext" product-name="conpassione/cpkm" date="2024-12-15T23:10:24+01:00">
+	<file source-language="en" target-language="it" original="locallang.xlf" datatype="plaintext" product-name="conpassione/cpkm" date="2024-12-21T21:05:38+01:00">
 		<body>
+			<trans-unit id="kennel.breeder" resname="kennel.breeder">
+				<source>Breeder</source>
+				<target>Allevatore</target>
+			</trans-unit>
+			<trans-unit id="kennel.contact" resname="kennel.contact">
+				<source>Contact</source>
+				<target>Contatto</target>
+			</trans-unit>
 			<trans-unit id="kennel.no-kennel" resname="kennel.no-kennel">
 				<source>No active kennels found</source>
 				<target>Attualmente non sono disponibili allevatori attivi</target>

diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-	<file source-language="en" original="locallang.xlf" datatype="plaintext" product-name="conpassione/cpkm" date="2024-12-15T23:10:24+01:00">
+	<file source-language="en" original="locallang.xlf" datatype="plaintext" product-name="conpassione/cpkm" date="2024-12-21T21:05:38+01:00">
 		<header></header>
 		<body>
+			<trans-unit id="kennel.breeder" resname="kennel.breeder">
+				<source>Breeder</source>
+			</trans-unit>
+			<trans-unit id="kennel.contact" resname="kennel.contact">
+				<source>Contact</source>
+			</trans-unit>
 			<trans-unit id="kennel.no-kennel" resname="kennel.no-kennel">
 				<source>No active kennels found</source>
 			</trans-unit>