From e335cf5b1f253f8a9fa96989dba9c8f12b6e6c7d Mon Sep 17 00:00:00 2001
From: Marjolaine Le Bon <marjolaine@happy-dev.fr>
Date: Thu, 6 May 2021 15:35:47 +0200
Subject: [PATCH] update: simplify display business provider on profile project
---
src/locales/en.json | 6 ++----
src/locales/es.json | 4 +---
src/locales/fr.json | 4 +---
src/styles/projects/_index.scss | 4 ++++
.../partials/project/page-project-profile.pug | 16 ++++++----------
5 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/src/locales/en.json b/src/locales/en.json
index f298595a..1cb489dd 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 2fb08348..4f9bb28a 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 4b82e196..425efe4e 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 5b7cdde0..04bc4810 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 b7850c8c..5e33c8ef 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')
--
GitLab