diff --git a/Makefile b/Makefile
index d7a8fb39ea3d8a127524065789b7093d342d458b..6bbdda3ed90b286dcd9e562399ec66598919d757 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ install: node_modules copy_lib copy_samples submodules
submodules:
git submodule init
- git submodule update
+ git submodule update --recursive --remote
build: $(DIST_DIR)/index.html $(DIST_DIR)/styles/index.css $(SCRIPT_DEST)
diff --git a/src/header.pug b/src/header.pug
index a20b9813356c60684ef83ddd14951e4b6a220ca8..63b1b49fde362f84927250a199002866f5229c05 100644
--- a/src/header.pug
+++ b/src/header.pug
@@ -15,8 +15,9 @@ details
#notifications
include page-notifications.pug
-#profile
- img(src="/images/user.jpg")
- span
- | Profile
- span.icon-arrow-down
+sib-display#profile(
+ data-fields='first_name,member.avatar',
+ widget-member.avatar='sib-display-img',
+ bind-user
+ )
+
diff --git a/src/index.pug b/src/index.pug
index 21d2192dc2b5655e091abefdc285de712898ca1c..60d534a0a3b5d6b0b7bcf6a1401171c679d5c862 100644
--- a/src/index.pug
+++ b/src/index.pug
@@ -19,6 +19,8 @@ html(lang="en")
include page-dashboard.pug
#members(hidden)
include page-members.pug
+ #member-chat(hidden)
+ include page-member-chat.pug
#member(hidden)
include page-member.pug
#job-offers(hidden)
diff --git a/src/menu.pug b/src/menu.pug
index 15d25664894892bd8f38399787a3a5042512549c..25b7d1474a25c661ddff97d267491ff971cfe645 100644
--- a/src/menu.pug
+++ b/src/menu.pug
@@ -48,11 +48,11 @@ nav#navbar
div.menu-icon.icon-arrow-down
div.menu-label Chat
div.menu-icon.icon-envelope-letter
- sib-route(hidden, name='chat', id-prefix=`${sdn}/members/`)
+ sib-route(hidden, name='member-chat', id-prefix=`${sdn}/members/`)
div.sub-menu
sib-display(
data-src=`${sdn}/members/`,
data-fields='pseudo',
- next='chat'
+ next='member-chat'
)
div.divider
diff --git a/src/page-member-chat.pug b/src/page-member-chat.pug
index 59730e711d2840f00195fe6ff9cc359657e6a781..a082cf02c7ae653f150f59b4be92084f7b1c9858 100644
--- a/src/page-member-chat.pug
+++ b/src/page-member-chat.pug
@@ -1,9 +1,10 @@
-.chat-view
- sib-chat(
- data-authentication='login',
- data-auto-login='true',
- data-bosh-service-url=xmpp,
- data-debug='false',
- data-locales-url='en',
- bind-resources
- )
+div
+ .chat-view
+ sib-chat(
+ data-authentication='login',
+ data-auto-login='true',
+ data-bosh-service-url=xmpp,
+ data-debug='false',
+ data-locales-url='en',
+ bind-resources
+ )
diff --git a/src/page-member-profile.pug b/src/page-member-profile.pug
index 47b82a086e4d78e3c1108ffbe178577449de6c61..04d14ba6a87b87e0147fe713527bcd15f5240994 100644
--- a/src/page-member-profile.pug
+++ b/src/page-member-profile.pug
@@ -1,10 +1,14 @@
+template#chat-link
+ sib-link(next="member-chat") ${value}
sib-display#member-info(
data-fields='available, header, name, pseudonym, infos, skills',
set-header='avatar',
- set-infos='cell, roles, user.email, number, foaf:homepage',
+ set-infos='cell, roles,send, user.email, number, foaf:homepage',
set-name='user.first_name, user.last_name',
set-pseudonym='before-pseudo, pseudo',
value-before-pseudo='@',
+ value-send='SEND A MESSAGE',
+ template-send='chat-link',
widget-available='hdapp-available',
widget-avatar='sib-display-img',
widget-user='hdapp-userinfo',
diff --git a/src/page-member.pug b/src/page-member.pug
index cc5bcfe693faba7c0b16b970c00ed59983e0340d..ef0c0ff88bffea6236cc763c4fd89708c5ccc0dd 100644
--- a/src/page-member.pug
+++ b/src/page-member.pug
@@ -1,7 +1,5 @@
sib-router#member-router(default-route='member-profile')
- sib-route(name='member-chat')
- div Chat
sib-route(name='member-profile')
div Profile
sib-ac-checker(permission='change' bind-resources)
@@ -10,8 +8,6 @@ sib-router#member-router(default-route='member-profile')
#member-views-container
sib-trigger(next="members" class="back") Back to directory
div
- #member-chat
- include page-member-chat.pug
#member-profile
include page-member-profile.pug
#member-edit
diff --git a/src/page-members.pug b/src/page-members.pug
index b1562263aebbf9e903f21b0b1932c524ac8f969a..1c381095097ffaa6c2d504a04e29fb5f457d362d 100644
--- a/src/page-members.pug
+++ b/src/page-members.pug
@@ -1,8 +1,8 @@
div.grid-layer
template#read-more-link
sib-link(next="member") ${value}
- template#read-more-link
- sib-link(next="member") ${value}
+ template#chat-link
+ sib-link(next="member-chat") ${value}
div.grid-layer-main.containerV
h1 Members
sib-display#profiles-list(
@@ -16,6 +16,7 @@ div.grid-layer
value-more='read more...',
template-more='hdapp-link-more',
value-send='SEND A MESSAGE',
+ template-send='chat-link',
widget-avatar='sib-display-img',
widget-user='hdapp-userinfo',
widget-foaf:hompage='hdapp-hyperlink',
diff --git a/src/styles/content.scss b/src/styles/content.scss
index 7605e890c348b148ed3c75f44258bc0fd0f6af82..10d941f90b99671cd01304b778026656250a1eb9 100644
--- a/src/styles/content.scss
+++ b/src/styles/content.scss
@@ -363,6 +363,19 @@ hdapp-available {
}
}
+ sib-link[next='member-chat'] {
+ border-style: solid;
+ margin: 1em;
+ display: flex;
+ border-radius: 25px;
+ border-style: solid;
+ border-color: $color-blue-light;
+ color: $color-blue-light;
+ margin: 1em;
+ padding: 1em;
+ text-decoration:none;
+ }
+
div[name='pseudonym'] {
margin-top: -1em;
margin-bottom: 1em;
diff --git a/www/lib/sib-chat b/www/lib/sib-chat
index f6d3c2d846eabb3e3b236f218ec5878b81597967..7c841f1f972b6bbe35608a5c980101dbe117741c 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 4162a4cc2d68ab76290a1691760a740634eee953..56e754a6c80259ec7a274375044687db42a023e5 160000
--- a/www/lib/sib-core
+++ b/www/lib/sib-core
@@ -1 +1 @@
-Subproject commit 4162a4cc2d68ab76290a1691760a740634eee953
+Subproject commit 56e754a6c80259ec7a274375044687db42a023e5
diff --git a/www/lib/sib-oidc b/www/lib/sib-oidc
index 34a75986f9a5d8d4e95e4c8e04743f1be362b752..d29cf792ad5f818eea604176df83604bf2c2b9e2 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 e46f24ad020d5eeb38a40b42a0f95b9f08a88dd6..d44e9c0c1cff4cd588be8955d43c35bffcdfa185 160000
--- a/www/lib/sib-router
+++ b/www/lib/sib-router
@@ -1 +1 @@
-Subproject commit e46f24ad020d5eeb38a40b42a0f95b9f08a88dd6
+Subproject commit d44e9c0c1cff4cd588be8955d43c35bffcdfa185