From 3c72a4fee053fb0bbfd1848e5509e7968985115e Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Pasquier <contact@jbpasquier.eu>
Date: Tue, 29 Oct 2019 14:59:57 +0100
Subject: [PATCH] update: user avatar on admin
---
src/index.pug | 3 ---
src/page-admin-circles.pug | 31 ++++++++++++++--------
src/page-circle-admin.pug | 44 --------------------------------
src/templates/hd-user-avatar.pug | 2 +-
4 files changed, 21 insertions(+), 59 deletions(-)
delete mode 100644 src/page-circle-admin.pug
diff --git a/src/index.pug b/src/index.pug
index b4532545..ab13cbda 100644
--- a/src/index.pug
+++ b/src/index.pug
@@ -35,9 +35,6 @@ html(lang="en")
#circle(hidden).with-sidebar
include page-circle.pug
- #circle-admin(hidden).no-sidebar
- include page-circle-admin.pug
-
#messages(hidden).with-sidebar
include page-messages.pug
diff --git a/src/page-admin-circles.pug b/src/page-admin-circles.pug
index 448bee2b..2b302d49 100644
--- a/src/page-admin-circles.pug
+++ b/src/page-admin-circles.pug
@@ -8,7 +8,7 @@
#admin-circle-list(hidden)
- sib-widget(name="admin-circle-leave")
+ sib-widget(name="circle-admin-leave-button-template")
template
sib-ac-checker(
permission="acl:Delete"
@@ -19,37 +19,46 @@
data-label='Leave'
)
- sib-widget(name="admin-circle-join")
+ sib-widget(name="circle-admin-join-button-template")
template
//- BUG: Populate event trigger before the view is fully loaded! - https://git.happy-dev.fr/startinblox/framework/sib-core/issues/521
- sib-form(
+ 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}`
- widget-user='sib-form-dropdown'
-
- set-user-id-select="user"
-
submit-button='Join'
+ set-user-id-select="user"
)
+ include hd-user-avatar.pug
div.content-box__info
sib-link(class="right-btn", next="admin-circle-create") Create a new circle
+
h3 Circles
- sib-display.block(
+
+ div.table-header
+ div.cell Name
+ div.cell Admins
+ div.cell Join
+
+ sib-display.table-body(
data-src=`${endpoints.circles}`
- fields="name, owner.name, buttons(members, button)"
+ fields="name, own(owner.account.picture, owner.name), buttons(members, button)"
search-fields="name"
search-label-name="Search a Circle"
multiple-groups=""
- widget-members="admin-circle-leave"
+ widget-members="circle-admin-leave-button-template"
multiple-members=""
- widget-button="admin-circle-join"
+
+ widget-button="circle-admin-join-button-template"
action-button="button"
+
+ widget-owner.account.picture='hd-user-avatar'
)
diff --git a/src/page-circle-admin.pug b/src/page-circle-admin.pug
deleted file mode 100644
index 2731be53..00000000
--- a/src/page-circle-admin.pug
+++ /dev/null
@@ -1,44 +0,0 @@
-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'
-)
\ No newline at end of file
diff --git a/src/templates/hd-user-avatar.pug b/src/templates/hd-user-avatar.pug
index ec37182a..8ee2dba0 100644
--- a/src/templates/hd-user-avatar.pug
+++ b/src/templates/hd-user-avatar.pug
@@ -1,2 +1,2 @@
sib-widget(name='hd-user-avatar')
- template ${value ? `<img src="${value}" style="max-width:100%; max-height: 100%;" />` : `<object type="image/svg+xml" data="/images/alien.svg"></object>`}
+ template ${await value ? `<img src="${await value}" style="max-width:100%; max-height: 100%;" />` : `<object type="image/svg+xml" data="/images/alien.svg"></object>`}
--
GitLab