From d6f6cd8f953878d54ad676150bbecf3ae4f95f2f Mon Sep 17 00:00:00 2001
From: simon louvet <smon.louvet.zen@gmail.com>
Date: Thu, 13 Dec 2018 04:56:13 +0100
Subject: [PATCH 1/2] ui : integration of search evolution of sib-display on
 members page

---
 src/page-members.pug | 10 +++++++---
 www/lib/sib-chat     |  2 +-
 www/lib/sib-core     |  2 +-
 www/lib/sib-oidc     |  2 +-
 www/lib/sib-router   |  2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/page-members.pug b/src/page-members.pug
index 1c38109..2bc6877 100644
--- a/src/page-members.pug
+++ b/src/page-members.pug
@@ -11,7 +11,10 @@ div.grid-layer
       set-header='avatar, user, pseudonym, bio, send',
       set-infos='cell, roles, user.email, foaf:homepage, skills',
       set-pseudonym='before-pseudo,pseudo'
-      label-skills='skill',
+      search-label-skills='competences',
+      search-label-name='nom, prenom, pseudo',
+      search-widget-name='sib-form-placeholder-text',
+      search-label-user.groups='group',
       value-before-pseudo='@',
       value-more='read more...',
       template-more='hdapp-link-more',
@@ -24,9 +27,10 @@ div.grid-layer
       widget-roles='sib-display-lookuplist',
       widget-skills='sib-display-lookuplist',
       set-name='pseudo,user.first_name,user.last_name',
-      search-fields='name, skills, user.groups',
+      search-fields='name, skills, roles',
       search-range-skills=`${sdn}/skills/`,
-      search-range-user.groups=`${sdn}/group/`,
+      search-range-roles=`${sdn}/role/`,
+
       next='member')
   div.grid-layer-links.containerV
     div.containerH.containerCenter.how-link
diff --git a/www/lib/sib-chat b/www/lib/sib-chat
index f6d3c2d..7c841f1 160000
--- a/www/lib/sib-chat
+++ b/www/lib/sib-chat
@@ -1 +1 @@
-Subproject commit f6d3c2d846eabb3e3b236f218ec5878b81597967
+Subproject commit 7c841f1f972b6bbe35608a5c980101dbe117741c
diff --git a/www/lib/sib-core b/www/lib/sib-core
index 4162a4c..da21d36 160000
--- a/www/lib/sib-core
+++ b/www/lib/sib-core
@@ -1 +1 @@
-Subproject commit 4162a4cc2d68ab76290a1691760a740634eee953
+Subproject commit da21d36eed22e1ad4d4886f26deb0b60abc58c06
diff --git a/www/lib/sib-oidc b/www/lib/sib-oidc
index 34a7598..d29cf79 160000
--- a/www/lib/sib-oidc
+++ b/www/lib/sib-oidc
@@ -1 +1 @@
-Subproject commit 34a75986f9a5d8d4e95e4c8e04743f1be362b752
+Subproject commit d29cf792ad5f818eea604176df83604bf2c2b9e2
diff --git a/www/lib/sib-router b/www/lib/sib-router
index e46f24a..2d78d30 160000
--- a/www/lib/sib-router
+++ b/www/lib/sib-router
@@ -1 +1 @@
-Subproject commit e46f24ad020d5eeb38a40b42a0f95b9f08a88dd6
+Subproject commit 2d78d30a691f937a5b2cd64cdc40d1fba8a75835

From ab74e4df4b15f3063f48b88d6a848461b95aab3a Mon Sep 17 00:00:00 2001
From: simon louvet <smon.louvet.zen@gmail.com>
Date: Thu, 13 Dec 2018 05:13:42 +0100
Subject: [PATCH 2/2] ui : sib-core local temp

---
 src/dependencies.pug | 8 ++++----
 src/page-members.pug | 8 +++-----
 www/lib/sib-router   | 2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/dependencies.pug b/src/dependencies.pug
index 711b96b..fe1b271 100644
--- a/src/dependencies.pug
+++ b/src/dependencies.pug
@@ -29,11 +29,11 @@ link(href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,6
 // Web components
 
 //- local
-//- link(rel='import', href='/lib/sib-core/sib-display.html')
-  link(rel='import', href='/lib/sib-router/sib-router.html')
-  link(rel='import', href='/lib/sib-chat/sib-chat.html')
+link(rel='import', href='/lib/sib-core/sib-display.html')
+//  link(rel='import', href='/lib/sib-router/sib-router.html')
+//  link(rel='import', href='/lib/sib-chat/sib-chat.html')
 
 //- cdn
-link(rel='import', href="https://cdn.happy-dev.fr/sib-core/sib-display.html")
+//  link(rel='import', href="https://cdn.happy-dev.fr/sib-core/sib-display.html")
 link(rel='import', href="https://cdn.happy-dev.fr/sib-router/sib-router.html")
 link(rel='import', href="https://cdn.happy-dev.fr/sib-chat/sib-chat.html")
diff --git a/src/page-members.pug b/src/page-members.pug
index 53c7277..c67b942 100644
--- a/src/page-members.pug
+++ b/src/page-members.pug
@@ -11,10 +11,6 @@ div.grid-layer
       set-header='picture, user, pseudonym, bio, send, city, country',
       set-infos='cell, roles, user.email, foaf:homepage, skills',
       set-pseudonym='before-pseudo,pseudo'
-      search-label-skills='competences',
-      search-label-name='nom, prenom, pseudo',
-      search-widget-name='sib-form-placeholder-text',
-      search-label-user.groups='group',
       value-before-pseudo='@',
       value-more='read more...',
       template-more='hdapp-link-more',
@@ -29,7 +25,9 @@ div.grid-layer
       search-fields='name, skills, roles',
       search-range-skills=`${sdn}/skills/`,
       search-range-roles=`${sdn}/role/`,
-
+      search-label-skills='competences',
+      search-label-name='nom, prenom, pseudo',
+      search-widget-name='sib-form-placeholder-text',
       next='member')
   div.grid-layer-links.containerV
     div.containerH.containerCenter.how-link
diff --git a/www/lib/sib-router b/www/lib/sib-router
index 5be7c64..2d78d30 160000
--- a/www/lib/sib-router
+++ b/www/lib/sib-router
@@ -1 +1 @@
-Subproject commit 5be7c64588b25ba63394f99f03ff19ee6e0c6644
+Subproject commit 2d78d30a691f937a5b2cd64cdc40d1fba8a75835