diff --git a/src/locales/en.json b/src/locales/en.json index 05e5746..56673ca 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -144,6 +144,8 @@ "title": "Edit your project", "labelName": "Project name *", "labelCustomer": "Customer name *", + "labelDescription": "Project description", + "descriptionHelp": "You can use markdown", "subTitle": "Team members :", "tableHeader1": "Name", "tableHeader2": "Access", @@ -180,6 +182,7 @@ "buttonQuit": "Leave the project", "buttonJoin": "Join the project", "captain": "Captain :", + "description": "Description :", "subTitle": "Team :" } }, @@ -210,4 +213,4 @@ "private": "Private", "public": "Public" } -} \ No newline at end of file +} diff --git a/src/locales/fr.json b/src/locales/fr.json index 3f5f2a1..4a94c8d 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -144,6 +144,8 @@ "title": "Modifie ton projet", "labelName": "Nom du projet *", "labelCustomer": "Nom du client *", + "labelDescription": "Description du projet", + "descriptionHelp": "Vous pouvez utiliser Markdown", "subTitle": "Liste des membres :", "tableHeader1": "Nom", "tableHeader2": "Accès", @@ -180,6 +182,7 @@ "buttonQuit": "Quitter le projet", "buttonJoin": "Rejoindre le projet", "captain": "Capitaine :", + "description": "Description :", "subTitle": "Equipe :" } }, @@ -210,4 +213,4 @@ "private": "Privé", "public": "Public" } -} \ No newline at end of file +} diff --git a/src/styles/base/form.scss b/src/styles/base/form.scss index 6e4509f..9b825a8 100644 --- a/src/styles/base/form.scss +++ b/src/styles/base/form.scss @@ -60,6 +60,10 @@ solid-form { } } +.is-small { + font-size: 80%; +} + [name^='line-'] { @include breakpoint(lg) { diff --git a/src/views/partials/project/page-project-edit.pug b/src/views/partials/project/page-project-edit.pug index 0fbe071..25c6eb3 100644 --- a/src/views/partials/project/page-project-edit.pug +++ b/src/views/partials/project/page-project-edit.pug @@ -2,14 +2,14 @@ div.content-box__info solid-widget(name="project-edit-members-delete") template - solid-ac-checker(permission="acl:Delete" data-src="${src}") + solid-ac-checker(permission="acl:Delete", data-src="${src}") solid-delete( class='button text-bold text-uppercase reversed button-secondary bordered with-icon icon-close' data-src="${src}" data-label='' data-trans='data-label=project.edit.buttonDelete' ) - + solid-link(class='backlink right', bind-resources, next='project-profile' data-trans='project.edit.backlink') solid-ac-checker(permission='acl:Write', bind-resources) @@ -24,7 +24,7 @@ div.content-box__info solid-form.form.button-register( bind-resources - fields='line-1(customer.name, name)' + fields='line-1(customer.name, name), description, help' required-customer.name required-name @@ -34,12 +34,19 @@ div.content-box__info label-customer.name='' class-customer.name='form-label is-light is-half-width input-text-like' + label-description='', + widget-description='solid-form-textarea-label' + class-description='form-label is-light input-text-like' + value-help='' + widget-help='solid-display-value' + class-help='is-small' + partial="" submit-button='Enregistrer' next='project-information' - - data-trans='label-name=project.edit.labelName;label-customer.name=project.edit.labelCustomer;submit-button=project.edit.buttonSubmit' + + data-trans='label-name=project.edit.labelName;label-customer.name=project.edit.labelCustomer;submit-button=project.edit.buttonSubmit;label-description=project.edit.labelDescription;value-help=project.edit.descriptionHelp' ) h2(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 7b967b2..05f7caa 100644 --- a/src/views/partials/project/page-project-profile.pug +++ b/src/views/partials/project/page-project-profile.pug @@ -34,7 +34,7 @@ solid-router(default-route='project-profile', hidden) solid-link(class='button mobile-full-width text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='project-edit' bind-resources data-trans='project.profile.buttonModify') solid-ac-checker(no-permission='acl:Delete', bind-resources) solid-link(class='button mobile-full-width text-bold text-uppercase reversed button-primary bordered with-icon icon-pencil' next='project-edit' bind-resources data-trans='project.profile.buttonAdd') - + div.flex.desktop-button__end solid-ac-checker(permission='acl:Delete', bind-resources) solid-delete( @@ -71,6 +71,17 @@ solid-router(default-route='project-profile', hidden) hubl-inherit-user-id="search-value-user" ) + solid-display.mobile-margin__bottom( + bind-resources + fields='label-description, description' + + value-label-description='' + data-trans='value-label-description=project.profile.description', + class-label-description='h2-like' + + widget-description='solid-display-value-markdown' + ) + .flex.space-between solid-display( bind-resources