4 years ago · 5e7c24bb98
--- a/ot_core/Classes/Domain/Model/Organization.php
+++ b/ot_core/Classes/Domain/Model/Organization.php
@@ -344,7 +344,7 @@ class Organization extends AbstractEntity
 
				     }
			
 
				 
			
 
				     /**
			
 
				-     * Returns the streetAdress
			
 
				+     * Returns the streetAddress
			
 
				      *
			
 
				      * @return string $streetAddress
			
 
				      */
			
--- a/ot_templating/Resources/Private/Forms/Contact.form.yaml
+++ b/ot_templating/Resources/Private/Forms/Contact.form.yaml
@@ -47,7 +47,7 @@ finishers:
 
				 renderables:
			
 
				   -
			
 
				     identifier: page
			
 
				-    label: 'Mail Us'
			
 
				+    label: ''
			
 
				     type: Page
			
 
				 
			
 
				     renderingOptions:
			
--- a/ot_templating/Resources/Private/Language/Form/locallang.xlf
+++ b/ot_templating/Resources/Private/Language/Form/locallang.xlf
@@ -4,7 +4,7 @@
 
				 		<header/>
			
 
				 		<body>
			
 
				 			<trans-unit id="ContactForm.element.page.properties.label">
			
 
				-				<source>Écrivez-nous:</source>
			
 
				+				<source>Écrivez-nous :</source>
			
 
				 			</trans-unit>
			
 
				 			<trans-unit id="element.mandatory-fields-notice.properties.text">
			
 
				 				<source>Note: Les champs marqués d'une astérisque (*) sont obligatoires</source>
			
--- a/ot_templating/Resources/Private/Language/locallang.xlf
+++ b/ot_templating/Resources/Private/Language/locallang.xlf
@@ -84,6 +84,12 @@
 
				 			<trans-unit id="capitalized-llc">
			
 
				 				<source>SARL au capital de</source>
			
 
				 			</trans-unit>
			
 
				+			<trans-unit id="contact-us">
			
 
				+				<source>Contactez-nous</source>
			
 
				+			</trans-unit>
			
 
				+			<trans-unit id="by-email">
			
 
				+				<source>Par e-mail</source>
			
 
				+			</trans-unit>
			
 
				 			<trans-unit id="or-by-mail">
			
 
				 				<source>Ou par courrier</source>
			
 
				 			</trans-unit>
			
--- a/ot_templating/Resources/Private/Layouts/Classic/Contact.html
+++ b/ot_templating/Resources/Private/Layouts/Classic/Contact.html
@@ -13,8 +13,11 @@
 
				     <f:comment><!-- Central column --></f:comment>
			
 
				     <div class="content">
			
 
				         <f:comment><!-- Contact form --></f:comment>
			
 
				+        <h1><f:translate key="contact-us"/></h1>
			
 
				 
			
 
				         <div class="contact-form">
			
 
				+            <h2><i class="fa fa-at" style="margin-right: 12px;"></i><f:translate key="by-email"/> :</h2>
			
 
				+
			
 
				             <f:cObject typoscriptObjectPath="lib.tx_ottemplating.widgets.contact"/>
			
 
				         </div>
			
 
				 
			
@@ -24,8 +27,9 @@
 
				             <ot:organizations.getById as="organization" organizationId="{settings.organizationId}">
			
 
				                 <p>
			
 
				                     {organization.name}<br/>
			
 
				-                    {organization.streetAdress}<br/>
			
 
				-                    {organization.postalCode} {organization.addressCity}
			
 
				+                    {organization.streetAddress}<br/>
			
 
				+                    {organization.postalCode} {organization.addressCity}<br/>
			
 
				+                    {organization.country}
			
 
				                 </p>
			
 
				             </ot:organizations.getById>
			
 
				         </div>
			
--- a/ot_templating/Resources/Private/Layouts/Modern/Contact.html
+++ b/ot_templating/Resources/Private/Layouts/Modern/Contact.html
@@ -15,7 +15,11 @@
 
				             <div class="container">
			
 
				                 <div class="row">
			
 
				                     <div class="col-sm-12 mt-30">
			
 
				+                        <h1><f:translate key="contact-us"/></h1>
			
 
				+
			
 
				                         <div class="contact-form">
			
 
				+                            <h2><i class="fa fa-at" style="margin-right: 12px;"></i><f:translate key="by-email"/> :</h2>
			
 
				+
			
 
				                             <f:cObject typoscriptObjectPath="lib.tx_ottemplating.widgets.contact"/>
			
 
				                         </div>
			
 
				 
			
@@ -24,8 +28,8 @@
 
				                             <ot:organizations.getById as="organization" organizationId="{settings.organizationId}">
			
 
				                                 <p>
			
 
				                                     {organization.name}<br/>
			
 
				-                                    {organization.streetAdress}<br/>
			
 
				-                                    {organization.postalCode} {organization.addressCity}
			
 
				+                                    {organization.streetAddress}<br/>
			
 
				+                                    {organization.postalCode} {organization.addressCity}<br/>
			
 
				                                     {organization.country}
			
 
				                                 </p>
			
 
				                             </ot:organizations.getById>
			
--- a/ot_templating/Resources/Public/assets/Modern/style/custom.css
+++ b/ot_templating/Resources/Public/assets/Modern/style/custom.css
@@ -488,10 +488,18 @@
 
				         Contact
			
 
				     ------------------------*/
			
 
				 
			
 
				+    .contact-form {
			
 
				+        margin-top: 24px;
			
 
				+    }
			
 
				+
			
 
				     .contact-form .section-field {
			
 
				         width: 100%;
			
 
				     }
			
 
				 
			
 
				+    .contact-form h2 {
			
 
				+        margin-bottom: 12px;
			
 
				+    }
			
 
				+
			
 
				     .postal-adress {
			
 
				         width: 100%;
			
 
				         margin: 45px auto auto;