diff --git a/src/index.pug b/src/index.pug index 2f6a640..3445ac9 100644 --- a/src/index.pug +++ b/src/index.pug @@ -58,7 +58,7 @@ html(lang="en") include page-project.pug if endpoints.circles || (endpoints.get && endpoints.get.circles) - #circle(hidden, data-view="circle").with-sidebar + #circle(hidden, data-view="circle").segment.lg-full.with-sidebar if (endpoints.post && endpoints.post.circles) && (endpoints.get && endpoints.get.circles) hubl-reactivity(data-src=`${endpoints.post.circles}joinable/` target-src=`${endpoints.get.circles}`) hubl-reactivity(data-src=`${endpoints.post.circles}` target-src=`${endpoints.get.circles}`) diff --git a/src/page-circle.pug b/src/page-circle.pug index 26091f3..8756f50 100644 --- a/src/page-circle.pug +++ b/src/page-circle.pug @@ -1,45 +1,43 @@ .views-container.sidebar-is-closed - .content-box - div.content-box__height - solid-ac-checker(permission='acl:Read', bind-resources) - #circle-chat(hidden, data-view="circle-chat") - include views/circle/page-circle-chat.pug - #circle-information.content-box__height(hidden, data-view="circle-information") - include views/circle/page-circle-profile.pug - #circle-events(hidden, data-view="circle-events") - include views/circle/page-circle-events.pug - #circle-resources(hidden, data-view="circle-resources") - include views/circle/page-circle-resources.pug - #circle-polls(hidden, data-view="circle-polls") - include views/circle/page-circle-polls.pug + solid-ac-checker(permission='acl:Read', bind-resources) + #circle-chat(hidden, data-view="circle-chat") + include views/circle/page-circle-chat.pug + #circle-information.content-box__height(hidden, data-view="circle-information") + include views/circle/page-circle-profile.pug + #circle-events(hidden, data-view="circle-events") + include views/circle/page-circle-events.pug + #circle-resources(hidden, data-view="circle-resources") + include views/circle/page-circle-resources.pug + #circle-polls(hidden, data-view="circle-polls") + include views/circle/page-circle-polls.pug nav.jsRightMenu(role='navigation') - solid-router.text-color-heading.reverse.text-bold(default-route='circle-chat') + solid-router.text-color-heading.text-bold(default-route='circle-chat') ul - li.segment.padding-small.text-right.jsOffsiteToggle - span.icon.icon-arrow-right.xxsmall.icon-margin-right-xxsmall + li.segment.padding-small.text-right.text-normal.jsOffsiteToggle + span.icon.icon-arrow-right.xxsmall.margin-right-xxsmall a(data-trans='circle.menuRight.fold') solid-route(name='circle-chat') - li.segment.padding-large - span.icon.ci-chat.large.icon-margin-right + li.segment.padding-medium + span.icon.ci-chat.icon-xlarge.margin-right-small a(data-trans='circle.menuRight.chat') solid-route(name='circle-information') - li.segment.padding-large - span.icon.ci-information.large.icon-margin-right + li.segment.padding-medium + .icon.ci-information.icon-xlarge.margin-right-small a(data-trans='circle.menuRight.information') if (endpoints.resources || (endpoints.get && endpoints.get.resources)) && (endpoints.resourceskeywords || (endpoints.get && endpoints.get.resourceskeywords)) && (endpoints.resourcestypes || (endpoints.get && endpoints.get.resourcestypes)) solid-route(name='circle-resources' use-id) - li.segment.padding-large - span.icon.ci-networking.large.icon-margin-right + li.segment.padding-medium + span.icon.ci-networking.icon-xlarge.margin-right-small a(data-trans='circle.menuRight.resources') if (endpoints.events || (endpoints.get && endpoints.get.events)) && (endpoints.typeevents || (endpoints.get && endpoints.get.typeevents)) solid-route(name='circle-events' use-id) - li.segment.padding-large - span.icon.ci-networking.large.icon-margin-right + li.segment.padding-medium + span.icon.ci-networking.icon-xlarge.margin-right-small a(data-trans='circle.menuRight.events') if endpoints.polls || (endpoints.get && endpoints.get.polls) solid-route(name='circle-polls' use-id) - li.segment.padding-large - span.icon.ci-networking.large.icon-margin-right + li.segment.padding-medium + span.icon.ci-networking.icon-xlarge.margin-right-small a(data-trans='circle.menuRight.polls') diff --git a/src/views/admin/page-admin-circles.pug b/src/views/admin/page-admin-circles.pug index 1d46a31..f5d4459 100644 --- a/src/views/admin/page-admin-circles.pug +++ b/src/views/admin/page-admin-circles.pug @@ -1,132 +1,132 @@ -.content-box.full-width - solid-router(default-route='admin-circle-list', hidden) - solid-route(name='admin-circle-list') - solid-route(name='admin-circle-create') - solid-route(name='circle-left') +solid-router(default-route='admin-circle-list', hidden) + solid-route(name='admin-circle-list') + solid-route(name='admin-circle-create') + solid-route(name='circle-left') +#circle-left(hidden, data-view="circle-left") include ../circle/page-circle-left.pug - #admin-circle-list.content-box__height(hidden, data-view="admin-circle-list") - include ../../templates/hubl-user-avatar.pug +#admin-circle-list(hidden, data-view="admin-circle-list") + include ../../templates/hubl-user-avatar.pug - solid-widget(name='hubl-circle-owner') - template - solid-display.segment.margin-left-xlarge.user-thumb( - data-src='${await value}' - fields='account.picture, content(name-and-icon(name), sub(username))' + solid-widget(name='hubl-circle-owner') + template + solid-display.segment.margin-left-xlarge.user-thumb( + data-src='${await value}' + fields='account.picture, content(name-and-icon(name), sub(username))' - class-account.picture='user-thumb-avatar' - class-content='user-thumb-content' - class-name-and-icon='user-thumb-content__name-and-icon' - class-name='name' - class-sub='user-thumb-content__sub-text username' - class-username='' + class-account.picture='user-thumb-avatar' + class-content='user-thumb-content' + class-name-and-icon='user-thumb-content__name-and-icon' + class-name='name' + class-sub='user-thumb-content__sub-text username' + class-username='' - widget-account.picture='hubl-user-avatar' + widget-account.picture='hubl-user-avatar' + ) + + div.segment.padding-top-xsmall.padding-right-large.padding-bottom-xsmall.padding-left-large.border-bottom.border-color-grey.text-color-heading + div + h2.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='circle.list.title') + div.segment.lg-hidden + button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle(data-trans='circle.list.buttonMobile') + + div.segment.padding-large + div.segment.margin-bottom-medium.clearfix + div.segment.lg-half.float-left + h3.text-color-heading.text-semibold.text-letter-spacing-large(data-trans='circle.list.subTitle') + div.segment.lg-half.float-left.text-right.padding-top-xxsmall + solid-ac-checker(data-src=`${endpoints.circles || (endpoints.post && endpoints.post.circles)}`, permission='acl:Append') + solid-link( + class='button text-xsmall text-bold text-uppercase reversed color-secondary bordered icon icon-plus' + next='admin-circle-create' + data-trans='circle.list.buttonCreate' + ) + + .table-wrapper + .table + + div.table-header.bg-color-third.text-color-heading + div.table-cell.w280(data-trans='circle.list.tableHeader1') + div.table-cell.w280(data-trans='circle.list.tableHeader2') + div.table-cell.w280(data-trans='circle.list.tableHeader3') + + solid-widget(name='hubl-admin-circle-leave-button') + template + solid-delete( + class='button text-xsmall text-bold text-uppercase color-secondary bordered' + data-src="${src}" + data-label='' + data-trans='data-label=circle.list.buttonQuit' + ) + hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}` target-src='${src}') + hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}joinable/` target-src='${src}') + hubl-reactivity(bind-user nested-field="circles" target-src='${src}') + if (endpoints.post && endpoints.post.circles) && (endpoints.get && endpoints.get.circles) + hubl-reactivity(data-src=`${endpoints.post.circles}joinable/` target-src=`${src}`) + hubl-reactivity(data-src=`${endpoints.post.circles}` target-src=`${src}`) + + solid-display( + class='table-body' + + bind-user + nested-field='circles' + fields='circle.name, circle.owner, leaveButton' + loader-id='loader-admin-circles' + + class-circle.name='table-cell w280 text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline' + class-circle.owner='table-cell w280' + class-leaveButton='table-cell w280' + + action-leaveButton="joinButton" + widget-leaveButton="hubl-admin-circle-leave-button" + widget-circle.owner='hubl-circle-owner' + + order-by="circle.name" ) - div.segment.padding-top-xsmall.padding-right-large.padding-bottom-xsmall.padding-left-large.border-bottom.border-color-grey.text-color-heading - div - h2.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='circle.list.title') - div.segment.lg-hidden - button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle(data-trans='circle.list.buttonMobile') + solid-widget(name='hubl-admin-circle-join-button') + template + solid-form( + class='button text-xsmall text-bold text-uppercase reversed color-secondary bordered icon icon-arrow-right-circle' + data-src='${value}' - div.segment.padding-large - div.segment.margin-bottom-medium.clearfix - div.segment.lg-half.float-left - h3.text-color-heading.text-semibold.text-letter-spacing-large(data-trans='circle.list.subTitle') - div.segment.lg-half.float-left.text-right.padding-top-xxsmall - solid-ac-checker(data-src=`${endpoints.circles || (endpoints.post && endpoints.post.circles)}`, permission='acl:Append') - solid-link( - class='button text-xsmall text-bold text-uppercase reversed color-secondary bordered icon icon-plus' - next='admin-circle-create' - data-trans='circle.list.buttonCreate' + fields='user.username' + value-user.username='hubl-workaround-493' + widget-user.username='solid-form-hidden' + + submit-button='Rejoindre' + data-trans='submit-button=circle.list.buttonJoin' ) + hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}` target-src='${value}') + hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}joinable/` target-src='${value}') + hubl-reactivity(bind-user nested-field="circles" target-src='${value}') + if (endpoints.post && endpoints.post.circles) && (endpoints.get && endpoints.get.circles) + hubl-reactivity(data-src=`${endpoints.post.circles}joinable/` target-src=`${value}`) + hubl-reactivity(data-src=`${endpoints.post.circles}` target-src=`${value}`) - .table-wrapper - .table + solid-display( + class='table-body' - div.table-header.bg-color-third.text-color-heading - div.table-cell.w280(data-trans='circle.list.tableHeader1') - div.table-cell.w280(data-trans='circle.list.tableHeader2') - div.table-cell.w280(data-trans='circle.list.tableHeader3') + data-src=`${endpoints.circles || endpoints.get.circles}joinable/` + fields='name, owner, members' + loader-id='loader-admin-circles' - solid-widget(name='hubl-admin-circle-leave-button') - template - solid-delete( - class='button text-xsmall text-bold text-uppercase color-secondary bordered' - data-src="${src}" - data-label='' - data-trans='data-label=circle.list.buttonQuit' - ) - hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}` target-src='${src}') - hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}joinable/` target-src='${src}') - hubl-reactivity(bind-user nested-field="circles" target-src='${src}') - if (endpoints.post && endpoints.post.circles) && (endpoints.get && endpoints.get.circles) - hubl-reactivity(data-src=`${endpoints.post.circles}joinable/` target-src=`${src}`) - hubl-reactivity(data-src=`${endpoints.post.circles}` target-src=`${src}`) + class-name='table-cell w280 text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline' + class-owner='table-cell w280' + widget-owner='hubl-circle-owner' - solid-display( - class='table-body' + class-members='table-cell w280' + widget-members="hubl-admin-circle-join-button" - bind-user - nested-field='circles' - fields='circle.name, circle.owner, leaveButton' - loader-id='loader-admin-circles' + order-by="name" + ) - class-circle.name='table-cell w280 text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline' - class-circle.owner='table-cell w280' - class-leaveButton='table-cell w280' + div#loader-admin-circles.loader.loader-top + div + div + div + div - action-leaveButton="joinButton" - widget-leaveButton="hubl-admin-circle-leave-button" - widget-circle.owner='hubl-circle-owner' - - order-by="circle.name" - ) - - solid-widget(name='hubl-admin-circle-join-button') - template - solid-form( - class='button text-xsmall text-bold text-uppercase reversed color-secondary bordered icon icon-arrow-right-circle' - data-src='${value}' - - fields='user.username' - value-user.username='hubl-workaround-493' - widget-user.username='solid-form-hidden' - - submit-button='Rejoindre' - data-trans='submit-button=circle.list.buttonJoin' - ) - hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}` target-src='${value}') - hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}joinable/` target-src='${value}') - hubl-reactivity(bind-user nested-field="circles" target-src='${value}') - if (endpoints.post && endpoints.post.circles) && (endpoints.get && endpoints.get.circles) - hubl-reactivity(data-src=`${endpoints.post.circles}joinable/` target-src=`${value}`) - hubl-reactivity(data-src=`${endpoints.post.circles}` target-src=`${value}`) - - solid-display( - class='table-body' - - data-src=`${endpoints.circles || endpoints.get.circles}joinable/` - fields='name, owner, members' - loader-id='loader-admin-circles' - - class-name='table-cell w280 text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline' - class-owner='table-cell w280' - widget-owner='hubl-circle-owner' - - class-members='table-cell w280' - widget-members="hubl-admin-circle-join-button" - - order-by="name" - ) - - div#loader-admin-circles.loader.loader-top - div - div - div - div - - #admin-circle-create.content-box__height(hidden, data-view="admin-circle-create") - include page-admin-circles-create.pug +#admin-circle-create(hidden, data-view="admin-circle-create") + include page-admin-circles-create.pug diff --git a/src/views/circle/page-circle-left.pug b/src/views/circle/page-circle-left.pug index afd0751..f538ec4 100644 --- a/src/views/circle/page-circle-left.pug +++ b/src/views/circle/page-circle-left.pug @@ -1,10 +1,9 @@ -#circle-left(hidden, data-view="circle-left") - div.content-box__info.flex(style="padding: 15px") +div.content-box__info.flex(style="padding: 15px") - p(data-trans='circle.left.paragraphQuit') - p - span(data-trans='circle.left.paragraphJoin') - span   - solid-link(next="admin-circle-list" data-trans='circle.left.admin') - span   - span(data-trans='circle.left.paragraphContact') \ No newline at end of file + p(data-trans='circle.left.paragraphQuit') + p + span(data-trans='circle.left.paragraphJoin') + span   + solid-link(next="admin-circle-list" data-trans='circle.left.admin') + span   + span(data-trans='circle.left.paragraphContact') \ No newline at end of file diff --git a/src/views/circle/page-circle-profile.pug b/src/views/circle/page-circle-profile.pug index ccb1d6c..effe696 100644 --- a/src/views/circle/page-circle-profile.pug +++ b/src/views/circle/page-circle-profile.pug @@ -128,6 +128,5 @@ solid-router(default-route='circle-profile', hidden) widget-is_admin='hubl-circle-user-admin' ) - -#circle-edit.content-box__height(hidden, data-view="circle-edit") +#circle-edit(hidden, data-view="circle-edit") include page-circle-edit.pug