Merge branch 'circle-admin' into circle-wip-merge

This commit is contained in:
Jean-Baptiste Pasquier 2019-10-29 14:43:37 +01:00
commit a5a63bd162
No known key found for this signature in database
GPG Key ID: F2702E6D22ED4D62
7 changed files with 83 additions and 11 deletions

View File

@ -35,6 +35,9 @@ html(lang="en")
#circle(hidden).with-sidebar #circle(hidden).with-sidebar
include page-circle.pug include page-circle.pug
#circle-admin(hidden).no-sidebar
include page-circle-admin.pug
#messages(hidden).with-sidebar #messages(hidden).with-sidebar
include page-messages.pug include page-messages.pug

44
src/page-circle-admin.pug Normal file
View File

@ -0,0 +1,44 @@
sib-widget(name='circle-admin-leave-button-template')
template
sib-ac-checker(
permission="acl:Delete"
data-src="${await value['@id']}"
)
sib-delete(
data-src="${await value['@id']}"
data-label='Leave the circle'
)
sib-widget(name='circle-admin-join-button-template')
template
sib-form.circle-admin-join-button(
data-src='${src}'
nested-field='members'
fields='user'
widget-user='sib-form-dropdown'
label-user=''
range-user=`${endpoints.users}`
submit-button='Join'
set-user-id-select="user"
)
h1 Circles
div
//- Search a circle
div.table-header
div.cell Name
div.cell Admins
div.cell Join
sib-display.table-body(
data-src=`${endpoints.circles}`
fields="name,own(owner.name,owner.account['@id']),members,button"
widget-members='circle-admin-leave-button-template'
multiple-members
widget-button='circle-admin-join-button-template'
action-button='button'
)

View File

@ -274,3 +274,4 @@ sib-delete {
@import 'form'; @import 'form';
@import 'header'; @import 'header';
@import 'menu-left'; @import 'menu-left';
@import 'user-avatar';

View File

@ -0,0 +1,29 @@
.project-profile-user-avatar {
align-self: center;
grid-column: 1 / span 1;
grid-row: 1 / span 2;
display: inline;
* {
height: 100%;
width: 100%;
}
div {
background-color: $color-0-0-100;
border-radius: 50%;
height: 7vh;
overflow: hidden;
position: relative;
width: 7vh;
img {
height: 100%;
left: 0;
object-fit: cover;
position: absolute;
top: 0;
width: 100%;
}
}
}

View File

@ -1,2 +1,3 @@
@import 'circle-profile'; @import 'circle-profile';
@import 'circle-edit'; @import 'circle-edit';
@import 'circle-admin';

View File

@ -0,0 +1,3 @@
.circle-admin-join-button select[name='user'] {
display: none;
}

View File

@ -231,13 +231,4 @@
} }
} }
} }
.project-profile-user-avatar {
display: inline;
* {
height: 100%;
width: 100%;
}
}
} }