From 1a3c36ef4de934154532b6eb36a028ae49a423f6 Mon Sep 17 00:00:00 2001
From: simon louvet <smon.louvet.zen@gmail.com>
Date: Sun, 25 Nov 2018 17:30:11 +0100
Subject: [PATCH] ui : members with user.groups
---
src/page-members.pug | 17 +++++++++++------
src/page-project-edit.pug | 3 ++-
src/scripts/hd-widgets.js | 13 +++++++++++++
src/styles/content.scss | 6 ++++--
www/lib/sib-core | 2 +-
www/lib/sib-oidc | 2 +-
6 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/src/page-members.pug b/src/page-members.pug
index 9befd7c9..b1562263 100644
--- a/src/page-members.pug
+++ b/src/page-members.pug
@@ -1,26 +1,31 @@
div.grid-layer
+ template#read-more-link
+ sib-link(next="member") ${value}
+ template#read-more-link
+ sib-link(next="member") ${value}
div.grid-layer-main.containerV
h1 Members
sib-display#profiles-list(
data-src=`${sdn}/members/`,
- data-fields='header, infos, group, role',
- set-header='avatar, user, pseudonym, bio, user.email',
- set-infos='cell, roles, foaf:homepage, skills',
+ data-fields='header, infos, group, role, more',
+ set-header='avatar, user, pseudonym, bio, send',
+ set-infos='cell, roles, user.email, foaf:homepage, skills',
set-pseudonym='before-pseudo,pseudo'
label-skills='skill',
value-before-pseudo='@',
+ value-more='read more...',
+ template-more='hdapp-link-more',
value-send='SEND A MESSAGE',
widget-avatar='sib-display-img',
widget-user='hdapp-userinfo',
- widget-user.email='hdapp-mail',
widget-foaf:hompage='hdapp-hyperlink',
widget-cell='hdapp-usercell',
widget-roles='sib-display-lookuplist',
widget-skills='sib-display-lookuplist',
set-name='pseudo,user.first_name,user.last_name',
- search-fields='name, skills, roles',
+ search-fields='name, skills, user.groups',
search-range-skills=`${sdn}/skills/`,
- search-range-roles=`${sdn}/role/`
+ search-range-user.groups=`${sdn}/group/`,
next='member')
div.grid-layer-links.containerV
div.containerH.containerCenter.how-link
diff --git a/src/page-project-edit.pug b/src/page-project-edit.pug
index 6c778627..534754ff 100644
--- a/src/page-project-edit.pug
+++ b/src/page-project-edit.pug
@@ -7,6 +7,7 @@ h1 Edit project
data-fields=`name, number, client, description, team, jabberRoom, foaf:jabberID`,
widget-jabberRoom='sib-form-checkbox',
widget-description='sib-form-textarea',
- widget-team='sib-form-multiple-dropdown',
+ widget-team='hdapp-link-more',
+ label-team='Equipe'
bind-resources
)
diff --git a/src/scripts/hd-widgets.js b/src/scripts/hd-widgets.js
index 1417762e..63ece24c 100644
--- a/src/scripts/hd-widgets.js
+++ b/src/scripts/hd-widgets.js
@@ -149,4 +149,17 @@ document.addEventListener('WebComponentsReady', function(event) {
}
customElements.define('hdapp-hyperlink', HDAppHyperlink);
+
+ class HDAppLinkMore extends SIBWidget {
+ get template() {
+ const id = uniqID();
+ console.warn('HDAppLinkMore'this);
+ return `
+ ${this.label}
+ ${this.name}
+ ${this.escapedValue}
+ `;
+ }
+ }
+ customElements.define('hdapp-link-more', HDAppLinkMore);
});
diff --git a/src/styles/content.scss b/src/styles/content.scss
index 47f16267..7605e890 100644
--- a/src/styles/content.scss
+++ b/src/styles/content.scss
@@ -176,8 +176,6 @@ sib-display#member-info {
display: none;
}
-
-
div[name='header'] {
border-bottom: 1px solid $color-grey-light;
padding-bottom: 1em;
@@ -251,6 +249,10 @@ sib-display#member-info {
sib-display-div[name$='foaf:homepage'] * {
@include icon('link');
}
+ sib-display-div[name$='more']{
+ display: flex;
+ flex-direction: row-reverse;
+ }
}
hdapp-available {
diff --git a/www/lib/sib-core b/www/lib/sib-core
index ca1e0e35..4162a4cc 160000
--- a/www/lib/sib-core
+++ b/www/lib/sib-core
@@ -1 +1 @@
-Subproject commit ca1e0e35196b9ea1c235e81ad93987d115832188
+Subproject commit 4162a4cc2d68ab76290a1691760a740634eee953
diff --git a/www/lib/sib-oidc b/www/lib/sib-oidc
index 79804ac2..34a75986 160000
--- a/www/lib/sib-oidc
+++ b/www/lib/sib-oidc
@@ -1 +1 @@
-Subproject commit 79804ac27cd389bcf91e5eb5714f42c1436c430d
+Subproject commit 34a75986f9a5d8d4e95e4c8e04743f1be362b752
--
GitLab