diff --git a/README.md b/README.md index 66371bc..2548567 100644 --- a/README.md +++ b/README.md @@ -579,6 +579,7 @@ Module declaration, on `config.json`: "post": "http://server.url/resources/", "types": "http://server.url/types/", "keywords": "http://server.url/keywords/", + "circles": "http://server.url/circles", "postTypes": "http://server.url/types/", "postKeywords": "http://server.url/keywords/", "uploads": "http://server.url/upload/" diff --git a/src/images/photos.svg b/src/images/photos.svg new file mode 100644 index 0000000..acf15ad --- /dev/null +++ b/src/images/photos.svg @@ -0,0 +1 @@ + diff --git a/src/locales/en.json b/src/locales/en.json index 676c885..1cb489d 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -197,12 +197,18 @@ }, "create": { "backlink": "Back", - "title": " Create a nouveau project", + "title": " Create a new project", "labelName": "Project name*", "labelDescription": "Project description", "descriptionHelp": "You can use markdown", "labelCustomer": "Customer name*", + "labelCustomerAddress": "Customer address", "labelCaptain": "Project captain*", + "labelBusinessprovider": "Business Input", + "labelBusinessproviderAdd": "Add a Business Provider", + "labelBusinessproviderRemove": "Remove", + "labelBusinessproviderName": "Business Provider Name", + "labelBusinessproviderFee": "Amount of contribution (%)", "buttonSubmit": "Save" }, "edit": { @@ -211,9 +217,14 @@ "title": "Edit your project", "labelName": "Project name *", "labelCustomer": "Customer name *", + "labelCustomerAddress": "Customer address", "labelCaptain": "Captain *", "labelDescription": "Project description", "descriptionHelp": "You can use markdown", + "businessProviderTitle": "Business Provider : ", + "businessTableHeader1": "Business provider name", + "businessTableHeader2": "Amount of contribution (%)", + "buttonAddBusinessProvider": "Add", "subTitle": "Team members :", "tableHeader1": "Name", "tableHeader2": "Access", @@ -252,6 +263,10 @@ "buttonJoin": "Join the project", "captain": "Captain :", "description": "Description :", + "clientInformations": "Client Informations : ", + "customerName": "Customer name : ", + "customerAddress": "Customer address : ", + "businessProvider": "Business Provider : ", "subTitle": "Team :" } }, diff --git a/src/locales/es.json b/src/locales/es.json index 8019338..4f9bb28 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -202,7 +202,13 @@ "labelDescription": "Descripción del proyecto", "descriptionHelp": "Puedes usar markdown", "labelCustomer": "Nombre del/la clientx *", + "labelCustomerAddress": "Dirección del/la clientx", "labelCaptain": "Líder del proyecto *", + "labelBusinessprovider": "Contribución empresarial", + "labelBusinessproviderAdd": "Eliminar", + "labelBusinessproviderRemove": "Añadir la entrada del negocio", + "labelBusinessproviderName": "Nombre del contribuyente empresarial", + "labelBusinessproviderFee": "Importe de la contribución (%)", "buttonSubmit": "Guardar" }, "edit": { @@ -211,9 +217,14 @@ "title": "Modificar tu proyecto", "labelName": "Nombre del proyecto *", "labelCustomer": "Nombre del/la clientx *", + "labelCustomerAddress": "Dirección del/la clientx", "labelCaptain": "Capitain *", "labelDescription": "Descripción del proyecto", "descriptionHelp": "Puedes usar markdown", + "businessProviderTitle": "Contribución empresarial : ", + "businessTableHeader1": "Nombre del contribuyente empresarial", + "businessTableHeader2": "Importe de la contribución (%)", + "buttonAddBusinessProvider": "Añadir", "subTitle": "Lista de miembrxs: ", "tableHeader1": "Nombre", "tableHeader2": "Acceso", @@ -252,6 +263,10 @@ "buttonJoin": "Unirse al proyecto", "captain": "Líder : ", "description": "Descripción :", + "clientInformations": "información al clientx : ", + "customerName": "Nombre del/la clientx : ", + "customerAddress": "Dirección del/la clientx : ", + "businessProvider": "Contribución empresarial : ", "subTitle": "Equipo : " } }, diff --git a/src/locales/fr.json b/src/locales/fr.json index ac3d9dd..425efe4 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -200,7 +200,13 @@ "labelDescription": "Description du projet", "descriptionHelp": "Vous pouvez utiliser Markdown", "labelCustomer": "Nom du client*", + "labelCustomerAddress": "Adresse du client", "labelCaptain": "Capitaine du projet*", + "labelBusinessprovider": "Apport d'affaire", + "labelBusinessproviderAdd": "Ajouter de l'apport d'affaire", + "labelBusinessproviderRemove": "Retirer", + "labelBusinessproviderName": "Nom de l'apporteur d'affaire", + "labelBusinessproviderFee": "Montant de l'apport d'affaire (%)", "buttonSubmit": "Enregistrer" }, "edit": { @@ -209,9 +215,14 @@ "title": "Modifie ton projet", "labelName": "Nom du projet *", "labelCustomer": "Nom du client *", + "labelCustomerAddress": "Adresse du client", "labelCaptain": "Capitaine *", "labelDescription": "Description du projet", "descriptionHelp": "Vous pouvez utiliser Markdown", + "businessProviderTitle": "Apport d'affaire : ", + "businessTableHeader1": "Nom de l'apporteur d'affaire", + "businessTableHeader2": "Montant de l'apport d'affaire (%)", + "buttonAddBusinessProvider": "Ajouter", "subTitle": "Liste des membres :", "tableHeader1": "Nom", "tableHeader2": "Accès", @@ -250,6 +261,10 @@ "buttonJoin": "Rejoindre le projet", "captain": "Capitaine :", "description": "Description :", + "clientInformations": "Informations sur le client : ", + "customerName": "Nom du client : ", + "customerAddress": "Adresse du client : ", + "businessProvider": "Apport d'affaire : ", "subTitle": "Equipe :" } }, diff --git a/src/styles/admin-circles/_index.scss b/src/styles/admin-circles/_index.scss index 7752f3d..d47aad1 100644 --- a/src/styles/admin-circles/_index.scss +++ b/src/styles/admin-circles/_index.scss @@ -176,6 +176,10 @@ background-size: cover; } } + + .picture-empty { + display: none; + } } .communities-map { @@ -343,8 +347,40 @@ } } } - - .flex { - display: flex; + + @media (min-width: 768.01px) { + + .communities-profile-picture { + + .picture-empty { + display: flex; + justify-content: center; + align-items: center; + + object { + height: 100px; + width: 100px; + object-fit: cover; + object-position: center; + } + } + + &:nth-child(2)>.picture-empty { + background: #E4E9F1; + + svg { + fill: #D0D4DA; + } + } + + &:nth-child(1)>.picture-empty, + &:nth-child(3)>.picture-empty { + background: #E9F2FF; + + svg { + fill: #D7E2F3; + } + } + } } } \ No newline at end of file diff --git a/src/styles/index.scss b/src/styles/index.scss index 8ae3a07..98c9fd3 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -42,6 +42,7 @@ solid-display>div { @import 'chat'; @import 'forms'; @import 'communities'; +@import 'projects'; @import 'admin-circles'; nav#main__menu { diff --git a/src/styles/left-nav/_index.scss b/src/styles/left-nav/_index.scss index 8b1e70a..8eec398 100644 --- a/src/styles/left-nav/_index.scss +++ b/src/styles/left-nav/_index.scss @@ -166,6 +166,7 @@ nav#main__menu { margin-right: 15px; margin-left: 3px; vertical-align: middle; + width: calc(75% - 15px); } } diff --git a/src/styles/projects/_index.scss b/src/styles/projects/_index.scss new file mode 100644 index 0000000..04bc481 --- /dev/null +++ b/src/styles/projects/_index.scss @@ -0,0 +1,52 @@ +#admin-projects-create .form solid-multiple-form { + height: 100%; + button { + border: 1px solid var(--color-secondary); + text-transform: uppercase; + color: var(--color-secondary); + background-color: white; + font-weight: 700; + padding: 9px 20px; + font-size: 12px; + line-height: 14px; + border-radius: 16.5px; + } + button:hover { + background-color: var(--color-secondary); + color: white; + } +} +#projects-edit .edit-businessprovider form { + display: table-row; + border-bottom: 1px solid #C9C8C8; + border-right: 1px solid #C9C8C8; + .segment.table-cell { + border-bottom: 1px solid #C9C8C8; + border-right: 1px solid #C9C8C8; + height: 60px; + padding: 10px; + } + [type="submit"] { + float: none; + display: flex; + margin: 19px auto; + color: var(--color-secondary); + background-color: white; + } + [type="submit"]:hover { + background-color: var(--color-secondary); + color: white; + } +} +#projects-information .display-businessprovider { + [name="name"]::after { + content: " - "; + margin-left: 5px; + } + [name="fee"]:after { + content: " %"; + } + > div > solid-display:not(:first-child) [name="titlebusinessprovider"] { + display: none; + } +} diff --git a/src/views/page-circle.pug b/src/views/page-circle.pug index d06725c..8e962b9 100644 --- a/src/views/page-circle.pug +++ b/src/views/page-circle.pug @@ -16,7 +16,7 @@ include partials/circle/page-circle-profile.pug if component.extensions for extension of component.extensions - if extension.type == 'events' + if extension.type == 'events' && extension.route div( id=`${extension.route}-events` hidden @@ -24,7 +24,7 @@ no-render ) include partials/circle/page-circle-events.pug - if extension.type == 'resources' + if extension.type == 'resources' && extension.route div( id=`${extension.route}-resources` hidden @@ -32,7 +32,7 @@ no-render ) include partials/circle/page-circle-resources.pug - if extension.type == 'polls' + if extension.type == 'polls' && extension.route div( id=`${extension.route}-polls` hidden @@ -59,17 +59,17 @@ nav.jsRightMenu.segment.sm-hidden.text-disable-selection.sidebar.whitespace-norm a(data-trans='circle.menuRight.information') if component.extensions for extension of component.extensions - if extension.type == 'resources' + if extension.type == 'resources' && extension.route solid-route.segment.full(name=`${extension.route}-resources` use-id) li.segment.full.padding-medium span.icon.ci-file.icon-xlarge.margin-right-medium a(data-trans='circle.menuRight.resources') - if extension.type == 'events' + if extension.type == 'events' && extension.route solid-route.segment.full(name=`${extension.route}-events` use-id) li.segment.full.padding-medium span.icon.ci-appointment.icon-xlarge.margin-right-medium a(data-trans='circle.menuRight.events') - if extension.type == 'polls' + if extension.type == 'polls' && extension.route solid-route.segment.full(name=`${extension.route}-polls` use-id) li.segment.full.padding-medium span.icon.ci-list.icon-xlarge.margin-right-medium diff --git a/src/views/page-project.pug b/src/views/page-project.pug index 3463989..773ac41 100644 --- a/src/views/page-project.pug +++ b/src/views/page-project.pug @@ -23,7 +23,7 @@ include partials/project/page-project-picture.pug if component.extensions for extension of component.extensions - if extension.type == 'invoices' + if extension.type == 'invoices' && extension.route div( id=`${extension.route}-invoices` hidden @@ -51,7 +51,7 @@ nav.jsRightMenu.segment.sm-hidden.text-disable-selection.sidebar.whitespace-norm solid-route(name=`${component.route}-picture` use-id) if component.extensions for extension of component.extensions - if extension.type == 'invoices' + if extension.type == 'invoices' && extension.route solid-route.segment.full(name=`${extension.route}-invoices` use-id) li.segment.full.padding-medium span.icon.ci-receipt.icon-xlarge.margin-right-medium diff --git a/src/views/page-resources.pug b/src/views/page-resources.pug index f90d0f2..c29dac9 100644 --- a/src/views/page-resources.pug +++ b/src/views/page-resources.pug @@ -5,12 +5,10 @@ div.whitespace-normal post-data-type-src=`${component.endpoints.postTypes}` range-resource-keyword=`${component.endpoints.keywords}` post-data-keyword-src=`${component.endpoints.postKeywords}` - range-resource-circle=`${getComponent('circles').endpoints.get}/` + circles=`${component.endpoints.circles}/` associated-circle-label="" data-trans=`associated-circle-label=${component.parameters && component.parameters.associatedName ? component.parameters.associatedName : 'circle.extensions.associated'}` upload-dir=`${component.endpoints.uploads}` id-prefix='default' uniq=component.uniq ) - - diff --git a/src/views/partials/admin/page-admin-projects-create.pug b/src/views/partials/admin/page-admin-projects-create.pug index 467b7ae..7eb6106 100644 --- a/src/views/partials/admin/page-admin-projects-create.pug +++ b/src/views/partials/admin/page-admin-projects-create.pug @@ -16,7 +16,6 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac solid-form.form( data-src=`${getComponent('projects').endpoints.post}` - fields='status, customer.name, name, description, help, captain, linebreak' range-captain=`${getComponent('projects').endpoints.captains}` required-status @@ -27,17 +26,24 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac label-status='' label-customer.name='' + label-customer.address='' label-name='' label-description='' label-help='' label-captain='' - + label-businessprovider='' + class-customer.name='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' - class-name='segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' + class-customer.address='segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' class-description='segment margin-bottom-xxsmall full text-small text-semibold text-uppercase text-color-heading' class-help='segment full text-small margin-bottom-medium padding-left-small' - class-captain='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal' class-linebreak='segment full sm-hidden' + class-businessprovider="segment full margin-bottom-medium" + + multiple-businessprovider + widget-businessprovider="hubl-project-businessprovider" + multiple-businessprovider-add-label='' + multiple-businessprovider-remove-label='' widget-status='solid-form-hidden' value-status='Private' @@ -50,5 +56,10 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac submit-widget="button" next=getRoute('projects', true) - data-trans='label-status=project.create.labelStatus;label-customer.name=project.create.labelCustomer;label-name=project.create.labelName;label-description=project.create.labelDescription;label-captain=project.create.labelCaptain;label-help=project.create.descriptionHelp;submit-button=project.create.buttonSubmit' - ) + data-trans='label-status=project.create.labelStatus;label-customer.name=project.create.labelCustomer;label-customer.address=project.create.labelCustomerAddress;label-businessprovider=project.create.labelBusinessprovider;multiple-businessprovider-add-label=project.create.labelBusinessproviderAdd;multiple-businessprovider-remove-label=project.create.labelBusinessproviderRemove;label-name=project.create.labelName;label-description=project.create.labelDescription;label-captain=project.create.labelCaptain;label-help=project.create.descriptionHelp;submit-button=project.create.buttonSubmit' + )&attributes({ + "fields": componentSet.has('invoices') ? "status, customer.name, customer.address, name, captain, businessprovider, description, help, linebreak" : "status, customer.name, name, description, help, captain, linebreak", + "class-captain": componentSet.has('invoices') ? 'segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal' : 'segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal', + "class-name": componentSet.has('invoices') ? 'segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' : 'segment margin-bottom-medium half sm-full sm-padding-none text-small text-semibold text-uppercase text-color-heading' + }) + diff --git a/src/views/partials/circle/page-circle-resources.pug b/src/views/partials/circle/page-circle-resources.pug index cd46f6b..04ed838 100644 --- a/src/views/partials/circle/page-circle-resources.pug +++ b/src/views/partials/circle/page-circle-resources.pug @@ -6,7 +6,7 @@ solid-resource( post-data-type-src=`${extension.endpoints.postTypes}` range-resource-keyword=`${extension.endpoints.keywords}` post-data-keyword-src=`${extension.endpoints.postKeywords}` - range-resource-circle=`${getComponent('circles').endpoints.get}/` + circles=`${extension.endpoints.circles}/` associated-circle-label="" data-trans=`associated-circle-label=${extension.parameters && extension.parameters.associatedName ? extension.parameters.associatedName : 'circle.extensions.associated'}` upload-dir=`${extension.endpoints.uploads}` diff --git a/src/views/partials/communities/page-community-profile.pug b/src/views/partials/communities/page-community-profile.pug index 029020b..cb76b1b 100644 --- a/src/views/partials/communities/page-community-profile.pug +++ b/src/views/partials/communities/page-community-profile.pug @@ -41,10 +41,10 @@ div.community-profile.padding-medium.sm-padding-none class-segment10="segment full text-right" - class-segment11="segment full whitespace-normal flex" - class-profile.picture1="communities-profile-picture segment third sm-full" - class-profile.picture2="communities-profile-picture segment third sm-full" - class-profile.picture3="communities-profile-picture segment third sm-full" + class-segment11="segment full whitespace-normal" + class-profile.picture1="communities-profile-picture segment third sm-full text-top" + class-profile.picture2="communities-profile-picture segment third sm-full text-top" + class-profile.picture3="communities-profile-picture segment third sm-full text-top" widget-logo="hubl-communities-profile-logo" widget-profile.description="solid-display-value-markdown" diff --git a/src/views/partials/menu-left.pug b/src/views/partials/menu-left.pug index 1464866..3827c53 100644 --- a/src/views/partials/menu-left.pug +++ b/src/views/partials/menu-left.pug @@ -80,7 +80,7 @@ solid-router#navbar-router(default-route=defaultRoute) solid-link.segment.block.menu-icon.icon.icon-small.icon-user-follow(next=getRoute('profileDirectory', true)) solid-badge.badge(data-type="Message") solid-route(name=`admin-${component.route}`, hidden) - solid-route(name=`admin-${component.route}-create` hidden) + solid-route(name=`admin-${component.route}-create` use-id='' hidden) solid-route(name=component.route, rdf-type='foaf:user', use-id='', hidden) div.sub-menu.menu-notification.padding-bottom-xxsmall.jsMenuSub div.loader.loader-menu(id=`loader-${component.route}`) diff --git a/src/views/partials/project/page-project-edit.pug b/src/views/partials/project/page-project-edit.pug index 08ff1a7..6a679ca 100644 --- a/src/views/partials/project/page-project-edit.pug +++ b/src/views/partials/project/page-project-edit.pug @@ -32,7 +32,6 @@ div.segment.full.padding-large.whitespace-normal solid-form.form( bind-resources - fields='customer.name, name, description, help, captain, linebreak' required-customer.name required-name required-captain @@ -40,14 +39,14 @@ div.segment.full.padding-large.whitespace-normal label-name='' label-customer.name='' + label-customer.address='' label-description='' label-captain='' label-help='' class-customer.name='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' - class-name='segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' + class-customer.address='segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' class-description='segment margin-bottom-xxsmall full text-small text-semibold text-uppercase text-color-heading' - class-captain='segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal' class-linebreak='segment full' class-help='segment full sm-full text-small margin-bottom-medium padding-left-small' @@ -62,8 +61,66 @@ div.segment.full.padding-large.whitespace-normal submit-widget="button" next=`${component.route}-information` - data-trans='label-name=project.edit.labelName;label-captain=project.edit.labelCaptain;label-customer.name=project.edit.labelCustomer;label-description=project.edit.labelDescription;label-help=project.edit.descriptionHelp;submit-button=project.edit.buttonSubmit' - ) + data-trans='label-name=project.edit.labelName;label-captain=project.edit.labelCaptain;label-customer.name=project.edit.labelCustomer;label-customer.address=project.edit.labelCustomerAddress;label-description=project.edit.labelDescription;label-help=project.edit.descriptionHelp;submit-button=project.edit.buttonSubmit' + )&attributes({ + "fields": componentSet.has('invoices') ? "customer.name, customer.address, name, captain, description, help, linebreak" : "customer.name, name, description, help, captain, linebreak", + "class-captain": componentSet.has('invoices') ? 'segment margin-bottom-medium half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal' : 'segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal', + "class-name": componentSet.has('invoices') ? 'segment margin-bottom-medium half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading' : 'segment margin-bottom-medium half sm-full sm-padding-none text-small text-semibold text-uppercase text-color-heading' + }) + if componentSet.has("invoices") + h3.segment.full.padding-bottom-small.border-bottom.border-color-grey.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.edit.businessProviderTitle') + + .segment.table-wrapper.margin-top-medium + .table + div.table-header.bg-color-third.text-color-heading + div.segment.table-cell.third(data-trans='project.edit.businessTableHeader1') + div.segment.table-cell.third(data-trans='project.edit.businessTableHeader2') + div.segment.table-cell.third + + solid-display( + bind-resources + class='table-body' + nested-field='businessprovider' + fields='segment1(name), segment2(fee), remove' + + class-segment1='segment table-cell third text-center' + class-segment2='segment table-cell third text-center' + class-remove='segment table-cell third text-center' + + class-name='text-small text-semibold' + class-fee='text-small text-semibold' + + multiple-businessprovider + multiple-businessprovider-fields="name, fee" + + action-remove='remove' + widget-remove='hubl-circle-edit-members-delete' + ) + + solid-form.form.table-body.edit-businessprovider( + bind-resources + class='table-body' + nested-field='businessprovider' + fields='segment1(name), segment2(fee)' + + placeholder-name="" + placeholder-fee="" + + class-segment1='segment table-cell third text-center' + class-segment2='segment table-cell third text-center' + + class-name="segment full text-small" + class-fee="segment full text-small" + + widget-name="solid-form-placeholder-text" + widget-fee="solid-form-placeholder-text" + + submit-button='' + submit-widget="button" + + data-trans='submit-button=project.edit.buttonAddBusinessProvider;placeholder-name=project.edit.businessTableHeader1;placeholder-fee=project.edit.businessTableHeader2' + ) + h3.segment.full.padding-bottom-small.border-bottom.border-color-grey.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.edit.subTitle') diff --git a/src/views/partials/project/page-project-profile.pug b/src/views/partials/project/page-project-profile.pug index ca86e47..5e33c8e 100644 --- a/src/views/partials/project/page-project-profile.pug +++ b/src/views/partials/project/page-project-profile.pug @@ -102,6 +102,37 @@ div( class-description='segment margin-bottom-large whitespace-normal' widget-description='solid-display-value-markdown' ) + + if componentSet.has("invoices") + h3.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.profile.clientInformations') + + solid-display.segment.full.labelled-avatar.two-lines.whitespace-normal.children.children-full.sm-children-full.margin-bottom-medium( + bind-resources + fields='customerName(titlecustomername, customer.name), customerAddress(titlecustomeraddress, customer.address)' + + value-titlecustomername='' + value-titlecustomeraddress='' + + class-customerName="segment block" + class-customerAddress="segment block margin-top-small margin-bottom-medium whitespace-normal" + class-titlecustomername="text-semibold text-color-heading margin-right-xxsmall" + class-titlecustomeraddress="text-semibold text-color-heading margin-right-xxsmall" + + 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.margin-bottom-medium.display-businessprovider( + bind-resources + nested-field='businessprovider' + fields='titlebusinessprovider, businessProvider(name, fee)' + + value-titlebusinessprovider='' + + 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' + ) h3.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.profile.subTitle') diff --git a/src/views/partials/widgets.pug b/src/views/partials/widgets.pug index ee38e84..085d687 100644 --- a/src/views/partials/widgets.pug +++ b/src/views/partials/widgets.pug @@ -48,6 +48,7 @@ include widgets/hubl-menu-jabberid.pug include widgets/hubl-menu-publicprivate.pug include widgets/hubl-project-admins.pug include widgets/hubl-project-captain.pug +include widgets/hubl-project-businessprovider.pug include widgets/hubl-project-edit-admin.pug include widgets/hubl-project-edit-members-delete.pug include widgets/hubl-project-team-contact.pug diff --git a/src/views/partials/widgets/hubl-communities-profile-picture.pug b/src/views/partials/widgets/hubl-communities-profile-picture.pug index c470f50..06c73d4 100644 --- a/src/views/partials/widgets/hubl-communities-profile-picture.pug +++ b/src/views/partials/widgets/hubl-communities-profile-picture.pug @@ -1,3 +1,3 @@ if componentSet.has('communities') && getRoute('communities') solid-widget(name='hubl-communities-profile-picture') - template ${value != "" ? `
` : `
`} + template ${value != "" ? `
` : `
`} diff --git a/src/views/partials/widgets/hubl-project-businessprovider.pug b/src/views/partials/widgets/hubl-project-businessprovider.pug new file mode 100644 index 0000000..cc0c980 --- /dev/null +++ b/src/views/partials/widgets/hubl-project-businessprovider.pug @@ -0,0 +1,17 @@ +if componentSet.has('invoice') && componentSet.has('projects') + solid-widget(name="hubl-project-businessprovider") + template + solid-form.segment.three-quarter.sm-full.margin-right-medium.margin-bottom-small( + data-src="\${value}" + data-holder + naked + fields="name, fee" + + label-name='' + label-fee='' + + class-name="segment two-third padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading" + class-fee="segment third padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading" + + data-trans='label-name=project.create.labelBusinessproviderName;label-fee=project.create.labelBusinessproviderFee' + )