autonomic-cooperative
/
hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'staging' into project-admin

This commit is contained in:
Jean-Baptiste Pasquier 2020-01-09 11:34:17 +01:00
parent 74fe061e9a 9ad8126311
commit 07abdce85c
No known key found for this signature in database
GPG Key ID: F2702E6D22ED4D62
4 changed files with 16 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/styles/layout/project-profile/project-profile.scss
View File

@ -56,6 +56,7 @@
grid-template-columns: 7vh auto;
grid-template-rows: repeat(2, 5.2vh);
>[name='user.account.picture'],
>[name='account.picture'] {
align-items: center;
align-self: center;
@ -150,7 +151,7 @@
li {
margin-bottom: 0.5em;
&::before {
span::before {
color: $color-43-100-50;
font-size: 2.2rem;
margin: 0 1rem 0 0;

16
src/templates/hd-customer.pug
View File

@ -5,15 +5,13 @@ sib-widget(name='hd-customer')
h3 Client:
ul
li #[span Business name: ]${await value.name}
li #[span Company register: ]${await value.companyRegister}
li
span Address:
br
p ${await value.address}
li ${await value.companyRegister ? `<span>Company register: </span> ${await value.companyRegister}` : ``}
li ${await value.address ? `<span>Address: </span><br/><p>${await value.address}</p>`: ``}
div
h3 Contact:
ul
li(class='mdi-account-outline') #[span ${await value.firstName} ${await value.lastName}], ${await value.role}
li(class='mdi-email-outline')
a(href='mailto:${await value.email}') ${await value.email}
li(class='mdi-cellphone-iphone') ${await value.phone}
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-email-outline')
a(href='mailto:${await value.email}') ${await value.email}
span ${await value.phone ? `<li><span class='mdi-cellphone-iphone'>${await value.phone}</span></li>` : ``}

9
src/templates/hd-project-team.pug
View File

@ -4,17 +4,22 @@ sib-widget(name='hd-project-team')
template
sib-display(
data-src='${await value}'
fields='account.picture, sup(user.name, user.groups), sub(user.profile.city, name)'
fields='user.account.picture, sup(user.name, is_admin, user.groups), sub(user.profile.city, name)'
class-user.name='user-name'
class-is_admin='tag-admin'
class-user.groups='tag-group'
class-user.profile.city='city'
widget-account.picture='hd-user-avatar'
widget-user.account.picture='hd-user-avatar'
widget-is_admin='hd-user-admin'
widget-user.groups='hd-user-groups'
multiple-user.groups=''
)
sib-widget(name='hd-user-admin')
template ${await value ? "Administrator" : ""}
sib-widget(name='hd-user-groups')
template ${await value.name}

25
src/templates/template-team.pug
View File

@ -1,25 +0,0 @@
include hd-user-avatar.pug
sib-widget(name='project-team-template')
template
sib-display(
data-src='${await value}'
fields='account.picture, sup(user.name, is_admin, user.groups), sub(user.profile.city)'
class-user.name='user-name'
class-is_admin='tag-admin'
class-user.groups='tag-group'
class-user.profile.city='city'
widget-account.picture='hd-user-avatar'
widget-is_admin='hd-user-admin'
widget-user.groups='hd-user-groups'
multiple-user.groups=''
)
sib-widget(name='hd-user-admin')
template ${await value ? "Administrator" : ""}
sib-widget(name='hd-user-groups')
template ${await value.name}