update: merge conflict resolved + fixes
This commit is contained in:
gaelle morin
@ -1,6 +1,6 @@
|
||||
solid-ac-checker(permission='acl:Read', bind-resources)
|
||||
div.segment.lg-full.padding-large.border-bottom.border-color-grey
|
||||
div.segment.lg-half
|
||||
div.segment.lg-full.sm-full.padding-large.border-bottom.border-color-grey
|
||||
div.segment.lg-half.sm-full
|
||||
solid-display.text-xxlarge.text-letter-spacing-large(
|
||||
bind-resources
|
||||
fields='const-title1, number, customer.name, dash, name'
|
||||
@ -14,14 +14,14 @@ solid-ac-checker(permission='acl:Read', bind-resources)
|
||||
value-const-title1='N°'
|
||||
value-dash=' - '
|
||||
)
|
||||
div.segment.lg-half.text-right
|
||||
div.segment.lg-half.sm-hidden.text-right
|
||||
solid-link(class='backlink', bind-resources, next='project-profile' data-trans='project.edit.backlink')
|
||||
|
||||
div.segment.lg-full.padding-large.whitespace-normal
|
||||
div.segment.lg-full.sm-full.padding-large.whitespace-normal
|
||||
|
||||
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-xsmall text-bold text-uppercase color-secondary bordered'
|
||||
data-src="${src}"
|
||||
@ -43,7 +43,7 @@ div.segment.lg-full.padding-large.whitespace-normal
|
||||
solid-form.form(
|
||||
bind-resources
|
||||
|
||||
fields='customer.name, name, description, captain, linebreak'
|
||||
fields='customer.name, name, description, help, captain, linebreak'
|
||||
required-customer.name
|
||||
required-name
|
||||
required-captain
|
||||
@ -53,26 +53,29 @@ div.segment.lg-full.padding-large.whitespace-normal
|
||||
label-customer.name=''
|
||||
label-description=''
|
||||
label-captain=''
|
||||
label-help=''
|
||||
|
||||
class-customer.name='segment margin-bottom-medium lg-half padding-right-small text-small text-semibold text-uppercase text-color-heading'
|
||||
class-name='segment margin-bottom-medium lg-half padding-left-small text-small text-semibold text-uppercase text-color-heading'
|
||||
class-description='segment margin-bottom-medium lg-full text-small text-semibold text-uppercase text-color-heading'
|
||||
class-captain='segment margin-bottom-medium lg-half padding-right-small text-small text-semibold text-uppercase text-color-heading whitespace-normal'
|
||||
class-customer.name='segment margin-bottom-medium lg-half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading'
|
||||
class-name='segment margin-bottom-medium lg-half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading'
|
||||
class-description='segment margin-bottom-xxsmall lg-full sm-full text-small text-semibold text-uppercase text-color-heading'
|
||||
class-captain='segment margin-bottom-medium lg-half sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal'
|
||||
class-linebreak='segment lg-full'
|
||||
class-help='segment lg-full sm-full text-small margin-bottom-medium padding-left-small'
|
||||
|
||||
widget-description='solid-form-textarea-label'
|
||||
widget-description='solid-form-richtext-label'
|
||||
widget-captain='solid-form-dropdown-autocompletion-label'
|
||||
widget-linebreak='solid-form-hidden'
|
||||
widget-help='solid-form-hidden-label'
|
||||
|
||||
partial=""
|
||||
|
||||
submit-button='Enregistrer'
|
||||
next='project-information'
|
||||
|
||||
data-trans='label-name=project.edit.labelName;label-captain=project.edit.labelCaptain;label-customer.name=project.edit.labelCustomer;label-description=project.edit.labelDescription;submit-button=project.edit.buttonSubmit'
|
||||
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'
|
||||
)
|
||||
|
||||
h3.segment.lg-full.padding-bottom-small.border-bottom.border-color-grey.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.edit.subTitle')
|
||||
h3.segment.lg-full.sm-full.padding-bottom-small.border-bottom.border-color-grey.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.edit.subTitle')
|
||||
|
||||
solid-ac-checker(permission='acl:Append', bind-resources, nested-field='members')
|
||||
solid-form.block.segment.margin-bottom-xlarge.form(
|
||||
@ -81,7 +84,7 @@ div.segment.lg-full.padding-large.whitespace-normal
|
||||
fields='user'
|
||||
range-user=`${endpoints.users || endpoints.get.users}`
|
||||
|
||||
class-user='add-member'
|
||||
class-user='add-member whitespace-normal'
|
||||
label-user=''
|
||||
widget-user='solid-form-dropdown-autocompletion'
|
||||
|
||||
@ -92,8 +95,8 @@ div.segment.lg-full.padding-large.whitespace-normal
|
||||
.segment.table-wrapper
|
||||
.table
|
||||
div.table-header.bg-color-third.text-color-heading
|
||||
div.segment.table-cell.lg-two-third(data-trans='project.edit.tableHeader1')
|
||||
div.segment.table-cell.lg-third(data-trans='project.edit.tableHeader2')
|
||||
div.segment.table-cell.lg-half(data-trans='project.edit.tableHeader1')
|
||||
div.segment.table-cell.lg-half(data-trans='project.edit.tableHeader2')
|
||||
|
||||
//-class='table-body'
|
||||
solid-display(
|
||||
@ -103,8 +106,8 @@ div.segment.lg-full.padding-large.whitespace-normal
|
||||
fields='cell(segment1(user.account.picture), segment2(line1(user.name, is_admin), line2(atom, user.communities))), self'
|
||||
loader-id='loader-project-edit'
|
||||
|
||||
class-cell='segment table-cell lg-two-third labelled-avatar two-lines text-left'
|
||||
class-self='segment table-cell lg-third text-center'
|
||||
class-cell='segment table-cell lg-half labelled-avatar two-lines text-left'
|
||||
class-self='segment table-cell lg-half text-center'
|
||||
|
||||
class-segment1='segment'
|
||||
class-user.account.picture='avatar'
|
||||
|
||||
@ -93,6 +93,15 @@ solid-router(default-route='project-profile', hidden)
|
||||
widget-captain='hubl-captain'
|
||||
)
|
||||
|
||||
h3.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.profile.description')
|
||||
|
||||
solid-display.segment.block.sm-hidden.whitespace-normal(
|
||||
bind-resources
|
||||
fields='description'
|
||||
class-description='segment margin-bottom-large whitespace-normal'
|
||||
widget-description='solid-display-value-markdown'
|
||||
)
|
||||
|
||||
h3.text-color-heading.text-bold.text-letter-spacing-large(data-trans='project.profile.subTitle')
|
||||
|
||||
solid-display.segment.lg-full.sm-full.labelled-avatar.two-lines.whitespace-normal.children.lg-children-full.sm-children-full.children-margin-bottom-medium(
|
||||
|
||||
Reference in New Issue
Block a user