diff --git a/src/locales/en.json b/src/locales/en.json index f298595a6ba6adbd5853f017d29a53c8979d1b33..1cb489dd534e6ad48e54e4ee2cd4768f915b9a0e 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -221,7 +221,7 @@ "labelCaptain": "Captain *", "labelDescription": "Project description", "descriptionHelp": "You can use markdown", - "businessProviderTitle": "Business Provider", + "businessProviderTitle": "Business Provider : ", "businessTableHeader1": "Business provider name", "businessTableHeader2": "Amount of contribution (%)", "buttonAddBusinessProvider": "Add", @@ -265,10 +265,8 @@ "description": "Description :", "clientInformations": "Client Informations : ", "customerName": "Customer name : ", - "customerAddress": "Customer address : ", + "customerAddress": "Customer address : ", "businessProvider": "Business Provider : ", - "businessProviderName": "Business provider name : ", - "businessProviderFee": "Amount of contribution : ", "subTitle": "Team :" } }, diff --git a/src/locales/es.json b/src/locales/es.json index 2fb0834885a3ebd48db2b2c5bd4419077b308608..4f9bb28ad833f2bbb677f8fb4b8d298b528c5a24 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -221,7 +221,7 @@ "labelCaptain": "Capitain *", "labelDescription": "Descripción del proyecto", "descriptionHelp": "Puedes usar markdown", - "businessProviderTitle": "Contribución empresarial", + "businessProviderTitle": "Contribución empresarial : ", "businessTableHeader1": "Nombre del contribuyente empresarial", "businessTableHeader2": "Importe de la contribución (%)", "buttonAddBusinessProvider": "Añadir", @@ -267,8 +267,6 @@ "customerName": "Nombre del/la clientx : ", "customerAddress": "Dirección del/la clientx : ", "businessProvider": "Contribución empresarial : ", - "businessProviderName": "Nombre del contribuyente empresarial : ", - "businessProviderFee": "Importe de la contribución : ", "subTitle": "Equipo : " } }, diff --git a/src/locales/fr.json b/src/locales/fr.json index 4b82e196f86a6f9135b4fd38c48e04d057944cba..425efe4e8b80c18e21b454fc5d0549f6f5e59a01 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -219,7 +219,7 @@ "labelCaptain": "Capitaine *", "labelDescription": "Description du projet", "descriptionHelp": "Vous pouvez utiliser Markdown", - "businessProviderTitle": "Apport d'affaire", + "businessProviderTitle": "Apport d'affaire : ", "businessTableHeader1": "Nom de l'apporteur d'affaire", "businessTableHeader2": "Montant de l'apport d'affaire (%)", "buttonAddBusinessProvider": "Ajouter", @@ -265,8 +265,6 @@ "customerName": "Nom du client : ", "customerAddress": "Adresse du client : ", "businessProvider": "Apport d'affaire : ", - "businessProviderName": "Nom de l'apporteur d'affaire : ", - "businessProviderFee": "Montant de l'apport d'affaire : ", "subTitle": "Equipe :" } }, diff --git a/src/styles/projects/_index.scss b/src/styles/projects/_index.scss index 5b7cdde05e28d49ba7073580edfc90c4b45ffb36..04bc48100321ac88f4046229d23d121aad40d11d 100644 --- a/src/styles/projects/_index.scss +++ b/src/styles/projects/_index.scss @@ -39,6 +39,10 @@ } } #projects-information .display-businessprovider { + [name="name"]::after { + content: " - "; + margin-left: 5px; + } [name="fee"]:after { content: " %"; } diff --git a/src/views/partials/project/page-project-profile.pug b/src/views/partials/project/page-project-profile.pug index b7850c8cb37eddf50376fe775b6d271d75bfc1be..5e33c8eff9cccfd254faf9f7e80279d72771eee4 100644 --- a/src/views/partials/project/page-project-profile.pug +++ b/src/views/partials/project/page-project-profile.pug @@ -120,22 +120,18 @@ div( data-trans='value-titlecustomername=project.profile.customerName;value-titlecustomeraddress=project.profile.customerAddress' ) - solid-display.segment.block.full.labelled-avatar.two-lines.whitespace-normal.children.children-full.sm-children-full.children-margin-bottom-medium.display-businessprovider( + solid-display.segment.block.full.labelled-avatar.two-lines.whitespace-normal.children.children-full.sm-children-full.margin-bottom-medium.display-businessprovider( bind-resources nested-field='businessprovider' - fields='titlebusinessprovider, businessProvider(businessProviderName(titlebusinessprovidername, name), businessProviderFee(titlebusinessproviderfee, fee))' + fields='titlebusinessprovider, businessProvider(name, fee)' value-titlebusinessprovider='' - value-titlebusinessprovidername='' - value-titlebusinessproviderfee='' - class-businessProviderName="segment block margin-bottom-xxsmall" - class-businessProviderFee="segment block margin-bottom-small" - class-titlebusinessprovider="segment block text-color-heading text-bold text-letter-spacing-large text-xlarge margin-top-medium margin-bottom-small" - class-titlebusinessprovidername="text-semibold text-color-heading margin-right-xxsmall" - class-titlebusinessproviderfee="text-semibold text-color-heading margin-right-xxsmall" + class-titlebusinessprovider="segment block text-color-heading text-bold text-letter-spacing-large text-xlarge margin-bottom-small" + class-businessProvider="segment block margin-bottom-xsmall" + class-fee="margin-left-xxsmall" - data-trans='value-titlebusinessprovider=project.profile.businessProvider;value-titlebusinessprovidername=project.profile.businessProviderName;value-titlebusinessproviderfee=project.profile.businessProviderFee' + data-trans='value-titlebusinessprovider=project.profile.businessProvider' ) h3.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.profile.subTitle')