diff --git a/src/menu-left.pug b/src/menu-left.pug index 7860eef..26a72fb 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -1,6 +1,6 @@ sib-widget(name='hd-counter') template - sib-badge(data-src="${src}") + sib-badge(data-src="${value['@id']}") sib-widget(name='hd-create') template @@ -29,18 +29,15 @@ nav#main__menu sib-route(name='project', rdf-type='hd:project', use-id='', hidden) div.sub-menu.menu-notification sib-display( - data-src=`${endpoints.projects}` - fields='project(customer.name, dash, name), badge' + bind-user + nested-field='projects' + fields='line(project.customer.name, dash, project.name), project' empty-widget='hd-create' empty-value='project' value-dash=' - ' - search-fields='members.user' - search-widget-members.user='sib-form-hidden' - search-value-members.user='-' - hd-inherit-user-id='search-value-members.user' - hd-inherit-widgets - widget-badge='hd-counter' - action-badge='badge' + widget-project='hd-counter' + order-by='project.customer.name' + next='project' ) div.divider div.menu-wrapper @@ -53,19 +50,14 @@ nav#main__menu sib-route(name='circle', rdf-type='hd:circle', use-id='', hidden) div.sub-menu.menu-notification sib-display( - data-src=`${endpoints.circles}` - fields='name, badge' + bind-user + nested-field='circles' + fields='circle.name, circle' empty-widget='hd-create' empty-value='circle' - widget-name='sib-display-div', - widget-badge='hd-counter' - action-badge='badge' - search-fields='members.user' - search-widget-members.user='sib-form-hidden' - search-value-members.user='-' - hd-inherit-user-id='search-value-members.user' - hd-inherit-widgets - order-by='name' + widget-circle.name='sib-display-div', + widget-circle='hd-counter' + order-by='circle.name' next='circle' ) div.divider diff --git a/src/page-admin-projects-create.pug b/src/page-admin-projects-create.pug index 6ee748c..4668bb2 100644 --- a/src/page-admin-projects-create.pug +++ b/src/page-admin-projects-create.pug @@ -1,6 +1,17 @@ div.content-box__info sib-link(class="backlink" next='admin-project-list') Back + sib-widget(name="admin-project-add-user") + template + sib-form( + data-holder + fields='user, project' + range-user=`${endpoints.users}` + value-project='${src}' + widget-project='sib-form-hidden' + naked + ) + h1 New project p.center Here you can create a new project according to your interests, what you want to share, etc. @@ -8,7 +19,7 @@ div.content-box__info sib-form.block( data-src=`${endpoints.projects}` - fields='line-1(customer.name, name), line-2(customer.logo), line-3(project.description), line-4(businessProvider.name, businessProvider.fee), line-5(customer.companyRegister), line-6(customer.address), line-7(customer.firstName, customer.lastName), line-8(customer.role), line-9(customer.email, customer.phone), line-10(captain)' + fields='line-1(customer.name, name), line-2(customer.logo), line-3(project.description), line-4(businessProvider.name, businessProvider.fee), line-5(customer.companyRegister), line-6(customer.address), line-7(customer.firstName, customer.lastName), line-8(customer.role), line-9(customer.email, customer.phone), line-10(captain), line-11(members)' label-customer.name='Customer\'s name*' @@ -40,6 +51,10 @@ div.content-box__info range-captain=`${endpoints.users}` + widget-members='admin-project-add-user' + action-members='members' + multiple-members + next='admin-project-list' submit-button='Save' diff --git a/src/page-admin.pug b/src/page-admin.pug index 854c0e0..2dd6834 100644 --- a/src/page-admin.pug +++ b/src/page-admin.pug @@ -3,8 +3,8 @@ include page-admin-circles.pug #admin-projects(hidden) include page-admin-projects.pug -//- #admin-users(hidden) -//- include page-admin-users.pug + //- #admin-users(hidden) + include page-admin-users.pug nav.jsRightMenu(role='navigation') sib-router(default-route='admin-circles') ul