update: merge conflict resolved + fixes
This commit is contained in:
gaelle morin
@ -3,10 +3,10 @@ div.segment.padding-top-small.padding-right-large.padding-bottom-small.padding-l
|
||||
|
||||
div.segment.lg-two-third.sm-full.margin-top-small.sm-margin-top-xxsmall.padding-right-xlarge.sm-padding-none
|
||||
div.segment.whitespace-normal.shadow.padding-top-xlarge.padding-right-xxlarge.padding-bottom-xxlarge.padding-left-xxlarge.sm-padding-medium.sm-padding-top-xxsmall.sm-padding-bottom-xlarge.text-center
|
||||
h3.text-color-heading.text-semibold.text-uppercase(data-trans='about.card1.subTitle')
|
||||
h3.text-color-heading.text-semibold.text-uppercase.line-xlarge(data-trans='about.card1.subTitle')
|
||||
div
|
||||
p.segment.whitespace-normal.text-large(data-trans='about.card1.paragraph1')
|
||||
p.segment.whitespace-normal.text-large(data-trans='about.card1.paragraph2')
|
||||
p.segment.whitespace-normal.text-large.line-xlarge(data-trans='about.card1.paragraph1')
|
||||
p.segment.whitespace-normal.text-large.line-xlarge(data-trans='about.card1.paragraph2')
|
||||
a.link.text-xlarge(href="https://startinblox.com/fr/" target="_blank") https://startinblox.com/fr/
|
||||
|
||||
div.segment.lg-third.sm-full.margin-top-small.text-top
|
||||
@ -14,5 +14,5 @@ div.segment.padding-top-small.padding-right-large.padding-bottom-small.padding-l
|
||||
div.segment.margin-top-small
|
||||
div.segment.center.icon.icon-xlarge.rounded-third.rounded.rounded-large.icon-envelope.icon-secondary
|
||||
h3.text-color-heading.text-semibold.text-uppercase.text-medium(data-trans='about.card2.subTitle')
|
||||
p(data-trans='about.card2.paragraph1')
|
||||
p.line-xlarge(data-trans='about.card2.paragraph1')
|
||||
a.button.text-bold.text-uppercase.color-secondary.bordered(href="https://startinblox.com/fr/#home-contact" target="_blank" data-trans='about.card2.link').main-cta
|
||||
|
||||
@ -18,7 +18,7 @@ nav.jsRightMenu.sidebar.whitespace-normal(role='navigation')
|
||||
span.icon.icon-arrow-right.xxsmall.margin-right-xxsmall
|
||||
a(data-trans='circle.menuRight.fold')
|
||||
solid-route.segment.lg-full.sm-full(name='circle-chat')
|
||||
li.segment.lg-full.padding-medium
|
||||
li.segment.lg-full.sm-full.padding-medium
|
||||
span.icon.ci-chat.icon-xlarge.margin-right-medium
|
||||
a(data-trans='circle.menuRight.chat')
|
||||
solid-route.segment.lg-full.sm-full(name='circle-information')
|
||||
@ -39,5 +39,4 @@ nav.jsRightMenu.sidebar.whitespace-normal(role='navigation')
|
||||
solid-route.segment.lg-full.sm-full(name='circle-polls' use-id)
|
||||
li.segment.lg-full.sm-full.padding-medium
|
||||
span.icon.ci-networking.icon-xlarge.margin-right-medium
|
||||
a(data-trans='circle.menuRight.polls')
|
||||
|
||||
a(data-trans='circle.menuRight.polls')
|
||||
|
||||
@ -1,5 +1,8 @@
|
||||
div.segment.lg-full.sm-full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey
|
||||
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='circle.create.title')
|
||||
div.segment.lg-half
|
||||
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='circle.create.title')
|
||||
div.segment.lg-half.sm-hidden.text-right
|
||||
solid-link(class="backlink", bind-resources, next='admin-circle-list' data-trans='circle.create.backlink')
|
||||
|
||||
div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal
|
||||
div#loader-circles-create.loader.loader-top
|
||||
@ -11,27 +14,35 @@ div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-mediu
|
||||
solid-form.form(
|
||||
data-src=`${endpoints.circles || endpoints.post.circles}`
|
||||
|
||||
fields='status, linebreak, name, description'
|
||||
fields='status, linebreak, name, subtitle, description, help'
|
||||
required-status
|
||||
required-name
|
||||
required-description
|
||||
required-subtitle
|
||||
loader-id='loader-circles-create'
|
||||
|
||||
class-status='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-half sm-hidden'
|
||||
class-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-description='segment margin-bottom-medium lg-half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading'
|
||||
class-subtitle='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-help='segment lg-full sm-full text-small margin-bottom-medium padding-left-small'
|
||||
|
||||
|
||||
label-status=''
|
||||
label-name=''
|
||||
label-subtitle=''
|
||||
label-description=''
|
||||
label-help=''
|
||||
|
||||
widget-status='hubl-status'
|
||||
widget-linebreak='solid-form-hidden'
|
||||
|
||||
widget-description='solid-form-richtext-label'
|
||||
widget-help='solid-form-hidden-label'
|
||||
|
||||
next='circle'
|
||||
|
||||
submit-button=''
|
||||
|
||||
data-trans='label-status=circle.create.labelStatus;label-name=circle.create.labelName;label-description=circle.create.labelDescription;submit-button=circle.create.buttonSubmit'
|
||||
data-trans='label-status=circle.create.labelStatus;label-name=circle.create.labelName;label-description=circle.create.labelDescription;submit-button=circle.create.buttonSubmit;label-subtitle=circle.create.labelSubtitle;label-help=circle.create.descriptionHelp'
|
||||
)
|
||||
|
||||
@ -76,14 +76,15 @@ solid-router(default-route='admin-circle-list', hidden)
|
||||
class='table-body'
|
||||
bind-user
|
||||
nested-field='circles'
|
||||
fields='cell1(circle.name, circle.description), cell2(circle.owner), cell3(leaveButton)'
|
||||
fields='cell1(circle.name, circle.subtitle), cell2(circle.owner), cell3(leaveButton)'
|
||||
loader-id='loader-admin-circles'
|
||||
|
||||
class-cell1='segment table-cell lg-third text-left text-top'
|
||||
class-cell1='segment table-cell lg-third whitespace-normal'
|
||||
class-cell2='segment table-cell lg-third text-center text-left'
|
||||
class-cell3='segment table-cell lg-third text-center'
|
||||
|
||||
class-circle.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellipsis'
|
||||
class-circle.subtitle='segment lg-full sm-full'
|
||||
|
||||
action-leaveButton="joinButton"
|
||||
widget-leaveButton="hubl-admin-circle-leave-button"
|
||||
@ -102,7 +103,7 @@ solid-router(default-route='admin-circle-list', hidden)
|
||||
value-user.username='hubl-workaround-493'
|
||||
widget-user.username='solid-form-hidden'
|
||||
|
||||
submit-button='Rejoindre'
|
||||
submit-button=''
|
||||
data-trans='submit-button=circle.list.buttonJoin'
|
||||
)
|
||||
hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}` target-src='${value}')
|
||||
@ -116,14 +117,15 @@ solid-router(default-route='admin-circle-list', hidden)
|
||||
class='table-body'
|
||||
|
||||
data-src=`${endpoints.circles || endpoints.get.circles}joinable/`
|
||||
fields='cell1(name, description), cell2(owner), cell3(members)'
|
||||
fields='cell1(name, subtitle), cell2(owner), cell3(members)'
|
||||
loader-id='loader-admin-circles'
|
||||
|
||||
class-cell1='segment table-cell lg-third text-left text-top'
|
||||
class-cell1='segment table-cell lg-third whitespace-normal'
|
||||
class-cell2='segment table-cell lg-third text-center text-left'
|
||||
class-cell3='segment table-cell lg-third text-center'
|
||||
|
||||
class-name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellipsis'
|
||||
class-subtitle='segment lg-full sm-full'
|
||||
|
||||
widget-owner='hubl-circle-owner'
|
||||
widget-members="hubl-admin-circle-join-button"
|
||||
|
||||
@ -51,5 +51,5 @@ solid-widget(name='hubl-action-community')
|
||||
div
|
||||
div
|
||||
|
||||
#admin-users-create.content-box__height(hidden, data-view="admin-users-create")
|
||||
#admin-users-create(hidden, data-view="admin-users-create")
|
||||
include page-admin-users-create.pug
|
||||
|
||||
@ -1,5 +1,8 @@
|
||||
div.segment.lg-full.sm-full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey
|
||||
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='project.create.title')
|
||||
div.segment.lg-half
|
||||
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='project.create.title')
|
||||
div.segment.lg-half.sm-hidden.text-right
|
||||
solid-link(class="backlink right", next='admin-project-list' data-trans='project.create.backlink')
|
||||
|
||||
div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal
|
||||
div#loader-projects-create.loader.loader-top
|
||||
@ -11,7 +14,7 @@ div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-mediu
|
||||
solid-form.form(
|
||||
data-src=`${endpoints.projects || endpoints.post.projects}`
|
||||
|
||||
fields='status, customer.name, name, description, captain, linebreak'
|
||||
fields='status, customer.name, name, description, help, captain, linebreak'
|
||||
range-captain=`${endpoints.users || endpoints.get.users}`
|
||||
|
||||
required-status
|
||||
@ -23,23 +26,26 @@ div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-mediu
|
||||
label-status=''
|
||||
label-customer.name=''
|
||||
label-name=''
|
||||
label-description='Description'
|
||||
label-description=''
|
||||
label-help=''
|
||||
label-captain=''
|
||||
|
||||
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-medium lg-full sm-full 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-help='segment lg-full sm-full text-small margin-bottom-medium padding-left-small'
|
||||
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 sm-hidden'
|
||||
|
||||
widget-status='solid-form-hidden'
|
||||
value-status='Private'
|
||||
widget-description='solid-form-textarea-label'
|
||||
widget-description='solid-form-richtext-label'
|
||||
widget-captain='solid-form-dropdown-autocompletion-label'
|
||||
widget-help='solid-form-hidden-label'
|
||||
widget-linebreak='solid-form-hidden'
|
||||
|
||||
submit-button=''
|
||||
next='project'
|
||||
|
||||
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;submit-button=project.create.buttonSubmit'
|
||||
)
|
||||
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'
|
||||
)
|
||||
|
||||
@ -95,12 +95,13 @@ solid-router(default-route='admin-project-list', hidden)
|
||||
fields='cell1(project.customer.name, project.name), cell2(project.members), cell3(project.captain), cell4(leaveButton)'
|
||||
loader-id='loader-admin-projects'
|
||||
|
||||
class-cell1='segment table-cell lg-quarter text-left'
|
||||
class-cell1='segment table-cell lg-quarter text-left whitespace-normal'
|
||||
class-cell2='segment table-cell lg-quarter text-left'
|
||||
class-cell3='segment table-cell lg-quarter text-left'
|
||||
class-cell4='segment table-cell lg-quarter text-center'
|
||||
|
||||
class-project.customer.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellipsis'
|
||||
class-project.name='segment lg-full sm-full'
|
||||
|
||||
action-leaveButton="joinButton"
|
||||
widget-leaveButton="hubl-admin-project-leave-button"
|
||||
@ -139,12 +140,13 @@ solid-router(default-route='admin-project-list', hidden)
|
||||
fields='cell1(customer.name, name), cell2(members), cell3(captain), cell4(joinButton)'
|
||||
loader-id='loader-admin-projects'
|
||||
|
||||
class-cell1='segment table-cell lg-quarter text-left'
|
||||
class-cell1='segment table-cell lg-quarter text-left whitespace-normal'
|
||||
class-cell2='segment table-cell lg-quarter text-left'
|
||||
class-cell3='segment table-cell lg-quarter text-left'
|
||||
class-cell4='segment table-cell lg-quarter text-center'
|
||||
|
||||
class-customer.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellpsis'
|
||||
class-name='segment lg-full sm-full'
|
||||
|
||||
action-joinButton="joinButton" # Workaround: I need members two times
|
||||
widget-joinButton="hubl-admin-project-join-button"
|
||||
|
||||
@ -1,5 +1,8 @@
|
||||
div.segment.lg-full.sm-full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.padding-large.border-bottom.border-color-grey
|
||||
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='communities.title')
|
||||
div.segment.lg-half
|
||||
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='communities.title')
|
||||
div.segment.lg-half.sm-hidden.text-right
|
||||
solid-link(class="backlink", bind-resources, next='admin-communities-list' data-trans='circle.create.backlink')
|
||||
|
||||
|
||||
div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
div.segment.lg-full.sm-full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey.whitespace-normal
|
||||
solid-display.text-xxlarge.text-letter-spacing-large(
|
||||
bind-resources
|
||||
fields='name, dash, description'
|
||||
fields='name, dash, subtitle'
|
||||
|
||||
value-dash=' - '
|
||||
|
||||
|
||||
@ -1,23 +1,23 @@
|
||||
solid-ac-checker(permission='acl:Read', bind-resources)
|
||||
div.segment.lg-full.padding-large.border-bottom.border-color-grey
|
||||
div.segment.lg-full.sm-full.padding-large.border-bottom.border-color-grey
|
||||
div.segment.lg-half
|
||||
solid-display.text-xxlarge.text-letter-spacing-large(
|
||||
bind-resources
|
||||
fields='name, dash, description'
|
||||
fields='name, dash, subtitle'
|
||||
|
||||
value-dash=' - '
|
||||
|
||||
class-name='text-color-heading text-bold'
|
||||
class-dash='text-color-heading text-bold'
|
||||
)
|
||||
div.segment.lg-half.text-right
|
||||
div.segment.lg-half.sm-hidden.text-right
|
||||
solid-link(class="backlink", bind-resources, next='circle-profile' data-trans='circle.edit.backlink')
|
||||
|
||||
div.segment.lg-full.padding-large.whitespace-normal
|
||||
div.segment.lg-full.sm-full.padding-large.whitespace-normal
|
||||
|
||||
solid-widget(name="circle-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}"
|
||||
@ -38,24 +38,30 @@ div.segment.lg-full.padding-large.whitespace-normal
|
||||
solid-form.form(
|
||||
bind-resources
|
||||
|
||||
fields='name, description, status, owner'
|
||||
fields='name, subtitle, description, status, owner'
|
||||
required-status
|
||||
required-name
|
||||
required-owner
|
||||
required-subtitle
|
||||
range-owner=`${endpoints.users || endpoints.get.users}`
|
||||
|
||||
label-status=''
|
||||
widget-status='hubl-status'
|
||||
|
||||
label-name=''
|
||||
label-owner=''
|
||||
label-description=''
|
||||
label-subtitle=''
|
||||
label-status=''
|
||||
label-help=''
|
||||
|
||||
class-name='segment margin-bottom-medium lg-half padding-right-small text-small text-semibold text-uppercase text-color-heading'
|
||||
class-description='segment margin-bottom-medium lg-half padding-left-small text-small text-semibold text-uppercase text-color-heading'
|
||||
class-status='segment margin-bottom-medium lg-half padding-right-small text-small text-semibold text-uppercase text-color-heading whitespace-normal'
|
||||
class-owner='segment margin-bottom-medium lg-half padding-left-small text-small text-semibold text-uppercase text-color-heading whitespace-normal'
|
||||
class-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-subtitle='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-medium lg-full sm-full sm-full text-small text-semibold text-uppercase text-color-heading'
|
||||
class-status='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-owner='segment margin-bottom-medium lg-half sm-full padding-left-small sm-padding-none text-small text-semibold text-uppercase text-color-heading whitespace-normal'
|
||||
class-help='segment lg-full sm-full text-small margin-bottom-medium padding-left-small'
|
||||
|
||||
widget-status='hubl-status'
|
||||
widget-description='solid-form-richtext-label'
|
||||
widget-help='solid-form-hidden-label'
|
||||
widget-owner='solid-form-dropdown-autocompletion-label'
|
||||
|
||||
partial=''
|
||||
@ -63,10 +69,10 @@ div.segment.lg-full.padding-large.whitespace-normal
|
||||
submit-button='Enregistrer'
|
||||
next='circle-information'
|
||||
|
||||
data-trans='label-status=circle.edit.labelStatus;label-name=circle.edit.labelName;label-owner=circle.edit.labelOwner;label-description=circle.edit.labelDescription;submit-button=circle.edit.buttonSubmit'
|
||||
data-trans='label-status=circle.edit.labelStatus;label-name=circle.edit.labelName;label-owner=circle.edit.labelOwner;label-description=circle.edit.labelDescription;submit-button=circle.edit.buttonSubmit;label-subtitle=circle.edit.labelSubtitle;label-help=circle.edit.descriptionHelp'
|
||||
)
|
||||
|
||||
h3.segment.lg-full.padding-bottom-small.border-bottom.border-color-grey.text-color-heading.text-bold.text-letter-spacing-large(data-trans='circle.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='circle.edit.subTitle')
|
||||
|
||||
solid-ac-checker(permission='acl:Append', bind-resources, nested-field='members')
|
||||
solid-form.block.segment.margin-bottom-xlarge.form(
|
||||
@ -85,8 +91,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='circle.edit.tableHeader1')
|
||||
div.segment.table-cell.lg-third(data-trans='circle.edit.tableHeader2')
|
||||
div.segment.table-cell.lg-half(data-trans='circle.edit.tableHeader1')
|
||||
div.segment.table-cell.lg-half(data-trans='circle.edit.tableHeader2')
|
||||
|
||||
solid-display(
|
||||
class='table-body'
|
||||
@ -95,8 +101,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-circle-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'
|
||||
@ -120,4 +126,4 @@ div.segment.lg-full.padding-large.whitespace-normal
|
||||
)
|
||||
|
||||
//- Only to show the table grid
|
||||
div.segment.table-cell.lg-third
|
||||
div.segment.table-cell.lg-half
|
||||
|
||||
@ -7,7 +7,7 @@ solid-router(default-route='circle-profile', hidden)
|
||||
div.segment.lg-full.sm-full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey.whitespace-normal
|
||||
solid-display.text-xxlarge.text-letter-spacing-large(
|
||||
bind-resources
|
||||
fields='name, dash, description'
|
||||
fields='name, dash, subtitle'
|
||||
|
||||
value-dash=' - '
|
||||
|
||||
@ -52,48 +52,56 @@ solid-router(default-route='circle-profile', hidden)
|
||||
data-trans='data-label=circle.profile.buttonDelete'
|
||||
next='admin-circles'
|
||||
)
|
||||
|
||||
h3.text-color-heading.text-bold.text-letter-spacing-large(data-trans='circle.profile.description')
|
||||
|
||||
solid-display.segment.block.sm-hidden.whitespace-normal(
|
||||
bind-resources
|
||||
fields='description'
|
||||
widget-description='solid-display-value-markdown'
|
||||
)
|
||||
|
||||
solid-widget(name='hubl-circle-leave-button')
|
||||
template
|
||||
solid-ac-checker(no-permission='acl:Delete', data-src="${src}", nested-field="circle")
|
||||
solid-delete(
|
||||
class='button text-xsmall text-bold text-uppercase color-secondary bordered'
|
||||
data-src="${src}"
|
||||
data-label=''
|
||||
data-trans='data-label=circle.profile.buttonQuit'
|
||||
next='circle-left'
|
||||
)
|
||||
solid-widget(name='hubl-circle-leave-button')
|
||||
template
|
||||
solid-ac-checker(no-permission='acl:Delete', data-src="${src}", nested-field="circle")
|
||||
solid-delete(
|
||||
class='button text-xsmall text-bold text-uppercase color-secondary bordered'
|
||||
data-src="${src}"
|
||||
data-label=''
|
||||
data-trans='data-label=circle.profile.buttonQuit'
|
||||
next='circle-left'
|
||||
)
|
||||
|
||||
solid-widget(name='hubl-circle-join-button')
|
||||
template
|
||||
button.button.text-xsmall.text-bold.text-uppercase.reversed.color-secondary.bordered.icon.icon-arrow-right-circle
|
||||
solid-form(
|
||||
data-src=''
|
||||
nested-field='members'
|
||||
solid-widget(name='hubl-circle-join-button')
|
||||
template
|
||||
button.button.text-xsmall.text-bold.text-uppercase.reversed.color-secondary.bordered.icon.icon-arrow-right-circle
|
||||
solid-form(
|
||||
data-src=''
|
||||
nested-field='members'
|
||||
|
||||
fields='user.username'
|
||||
value-user.username='hubl-workaround-493'
|
||||
widget-user.username='solid-form-hidden'
|
||||
fields='user.username'
|
||||
value-user.username='hubl-workaround-493'
|
||||
widget-user.username='solid-form-hidden'
|
||||
|
||||
submit-button=''
|
||||
data-trans='submit-button=circle.profile.buttonJoin'
|
||||
)
|
||||
submit-button=''
|
||||
data-trans='submit-button=circle.profile.buttonJoin'
|
||||
)
|
||||
|
||||
solid-display(
|
||||
bind-resources
|
||||
nested-field='members'
|
||||
fields='relation'
|
||||
action-relation='relation'
|
||||
widget-relation='hubl-circle-leave-button'
|
||||
search-fields='user'
|
||||
search-widget-user='solid-form-hidden'
|
||||
search-value-user=""
|
||||
empty-widget='hubl-circle-join-button'
|
||||
hubl-inherit-bind-resources='hubl-circle-join-button'
|
||||
hubl-inherit-user-id="search-value-user"
|
||||
)
|
||||
solid-display(
|
||||
bind-resources
|
||||
nested-field='members'
|
||||
fields='relation'
|
||||
action-relation='relation'
|
||||
widget-relation='hubl-circle-leave-button'
|
||||
search-fields='user'
|
||||
search-widget-user='solid-form-hidden'
|
||||
search-value-user=""
|
||||
empty-widget='hubl-circle-join-button'
|
||||
hubl-inherit-bind-resources='hubl-circle-join-button'
|
||||
hubl-inherit-user-id="search-value-user"
|
||||
)
|
||||
|
||||
h3.text-color-heading.text-bold.text-uppercase.text-letter-spacing-large(data-trans='circle.profile.subTitle')
|
||||
h3.text-color-heading.text-bold.text-letter-spacing-large(data-trans='circle.profile.subTitle')
|
||||
|
||||
solid-widget(name='hubl-circle-user-admin')
|
||||
template ${value ? "Administrateur" : ""}
|
||||
|
||||
@ -104,16 +104,16 @@ div
|
||||
li.segment.padding-small.sm-padding-medium.sm-padding-left-xlarge.border-bottom.border-color-grey
|
||||
div(data-trans='header.admin')
|
||||
ul.text-normal
|
||||
if (endpoints.users || (endpoints.get && endpoints.get.users))
|
||||
solid-route.text-hover(name='admin-communities')
|
||||
if endpoints.get.users
|
||||
solid-link.text-hover(next='admin-communities')
|
||||
li.segment.padding-top-small.sm-padding-top-medium
|
||||
a.icon.icon-people.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.community')
|
||||
if endpoints.circles || (endpoints.get && endpoints.get.circles)
|
||||
solid-route.text-hover(name='admin-circles')
|
||||
if endpoints.get.circles
|
||||
solid-link.text-hover(next='admin')
|
||||
li.segment.padding-top-small.sm-padding-top-medium
|
||||
a.icon.icon-globe.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.circles')
|
||||
if endpoints.projects || (endpoints.get && endpoints.get.projects)
|
||||
solid-route.text-hover(name='admin-projects')
|
||||
if endpoints.get.projects
|
||||
solid-link.text-hover(next='admin-projects')
|
||||
li.segment.padding-top-small.sm-padding-top-medium
|
||||
a.icon.icon-folder-alt.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.projects')
|
||||
li.border-bottom.border-color-grey
|
||||
|
||||
@ -140,7 +140,7 @@ solid-router#navbar-router(default-route='dashboard')
|
||||
div.divider
|
||||
if endpoints.get.projects
|
||||
div.menu-wrapper
|
||||
solid-link.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(next='admin-project-list')
|
||||
solid-link.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(next='admin-projects')
|
||||
div.segment.margin-right-xxsmall
|
||||
div.segment.icon.icon-small.icon-folder-alt
|
||||
div.segment.lg-three-quarter.sm-three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.projects")
|
||||
@ -167,7 +167,7 @@ solid-router#navbar-router(default-route='dashboard')
|
||||
div.divider
|
||||
if endpoints.get.circles
|
||||
div.menu-wrapper
|
||||
solid-link.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(next='admin-circle-list')
|
||||
solid-link.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(next='admin')
|
||||
div.segment.margin-right-xxsmall
|
||||
div.segment.icon.icon-small.icon-folder-alt
|
||||
div.segment.lg-three-quarter.sm-three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.circles")
|
||||
|
||||
@ -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