From 74a453d169b8a0c259f6ade26a366de58e1dea6d Mon Sep 17 00:00:00 2001 From: Matthieu Fesselier Date: Fri, 20 Mar 2020 14:48:56 +0100 Subject: [PATCH] bugfix: remove extra-context --- src/dependencies.pug | 5 +---- src/header.pug | 2 +- src/styles/base/header.scss | 4 ++-- src/styles/layout/job-offers/job-offers.scss | 2 +- src/templates/hd-customer.pug | 2 +- src/views/admin/page-admin-projects.pug | 6 +++--- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index ec43d24..caa799d 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -42,8 +42,5 @@ script(data-default-context, type="application/ld+json") | "author": "http://happy-dev.fr/owl/#author", | "account": "http://happy-dev.fr/owl/#account", | "jabberID": "foaf:jabberID", - | "picture": "foaf:depiction", - | "firstName": "http://happy-dev.fr/owl/#first_name", - | "lastName": "http://happy-dev.fr/owl/#last_name", - | "isAdmin": "http://happy-dev.fr/owl/#is_admin" + | "picture": "foaf:depiction" | } diff --git a/src/header.pug b/src/header.pug index ef56755..83e9cfb 100644 --- a/src/header.pug +++ b/src/header.pug @@ -17,7 +17,7 @@ include templates/hd-user-avatar.pug details#user-controls.notLoggedIn summary(tabindex='0' role='button') sib-display#user-controls__profile( - fields='firstName, account.picture' + fields='first_name, account.picture' widget-account.picture='hd-user-avatar' bind-user ) diff --git a/src/styles/base/header.scss b/src/styles/base/header.scss index b330266..093cfcd 100644 --- a/src/styles/base/header.scss +++ b/src/styles/base/header.scss @@ -169,7 +169,7 @@ width: 45%; } - sib-display-value[name='firstName'] { + sib-display-value[name='first_name'] { @include icon('arrow-down'); align-items: center; display: flex; @@ -241,7 +241,7 @@ div { - sib-display-value[name='firstName'] { + sib-display-value[name='first_name'] { @include icon('close'); &::before { diff --git a/src/styles/layout/job-offers/job-offers.scss b/src/styles/layout/job-offers/job-offers.scss index 172e863..64c41fe 100644 --- a/src/styles/layout/job-offers/job-offers.scss +++ b/src/styles/layout/job-offers/job-offers.scss @@ -75,7 +75,7 @@ sib-job-board { margin: 0.25em; } - [name='author.firstName'] { + [name='author.first_name'] { color: $color-0-0-29; font-weight: 600; } diff --git a/src/templates/hd-customer.pug b/src/templates/hd-customer.pug index 813aa81..04e891f 100644 --- a/src/templates/hd-customer.pug +++ b/src/templates/hd-customer.pug @@ -10,7 +10,7 @@ sib-widget(name='hd-customer') div h3 Contact: ul - li #[span(class='mdi-account-outline') ${await value.firstName} ${await value.lastName ? await value.lastName : ""}]${await value.role ? `, ${await value.role}` : ""} + li #[span(class='mdi-account-outline') ${await value.first_name} ${await value.last_name ? await value.last_name : ""}]${await value.role ? `, ${await value.role}` : ""} li span(class='link-color norm-weight mdi-email-outline') a(href='mailto:${await value.email}') ${await value.email} diff --git a/src/views/admin/page-admin-projects.pug b/src/views/admin/page-admin-projects.pug index d93aa33..6ae79e9 100644 --- a/src/views/admin/page-admin-projects.pug +++ b/src/views/admin/page-admin-projects.pug @@ -50,9 +50,9 @@ sib-display( data-src='${value}' fields='user' - search-fields='isAdmin' - search-value-isAdmin='true' - search-widget-isAdmin='sib-form-hidden' + search-fields='is_admin' + search-value-is_admin='true' + search-widget-is_admin='sib-form-hidden' widget-user='project-captain' )