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

feature: multiple small fixes and updates

Browse Source
This commit is contained in:
gaelle morin
2021-01-21 14:58:43 +01:00
parent 398dba539e
commit ef2b2295e4
25 changed files with 78 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/page-dashboard.pug
View File

@ -1,4 +1,4 @@
div.padding-top-xlarge.padding-right-xsmall.padding-bottom-xlarge.padding-left-xsmall.sm-padding-top-medium.whitespace-normal
div.padding-top-xlarge.padding-right-xsmall.padding-bottom-xlarge.padding-left-xsmall.sm-padding-top-medium.bg-color-grey.whitespace-normal
solid-dashboard(
data-src=`${endpoints.dashboards || endpoints.get.dashboards}`
)

2
src/views/partials/admin/page-admin-circles-create.pug
View File

@ -1,5 +1,5 @@
div.segment.lg-full.sm-full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey
h2.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='circle.create.title')
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='circle.create.title')
div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal
div#loader-circles-create.loader.loader-top

23
src/views/partials/admin/page-admin-circles.pug
View File

@ -19,9 +19,8 @@ solid-router(default-route='admin-circle-list', hidden)
class-segment2='segment lg-three-quarter margin-left-xsmall'
class-line1='block'
class-name='text-semibold text-color-heading text-sub'
class-line2='block'
class-username=''
class-name='text-small text-semibold text-color-heading text-sub'
class-line2='block text-xsmall'
widget-account.picture='hubl-user-avatar'
@ -29,7 +28,7 @@ solid-router(default-route='admin-circle-list', hidden)
)
div.segment.lg-full.sm-full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey.whitespace-normal
h2.lg-margin-none.sm-margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='circle.list.title')
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='circle.list.title')
div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-normal.whitespace-normal
@ -80,11 +79,11 @@ solid-router(default-route='admin-circle-list', hidden)
fields='cell1(circle.name, circle.description), cell2(circle.owner), cell3(leaveButton)'
loader-id='loader-admin-circles'
class-cell1='segment table-cell padding-xsmall lg-third text-left text-top'
class-cell2='segment table-cell padding-top-xsmall padding-right-xlarge padding-bottom-xsmall padding-left-xlarge lg-third text-center text-left'
class-cell3='segment table-cell padding-xsmall lg-third text-center'
class-cell1='segment table-cell lg-third text-left text-top'
class-cell2='segment table-cell lg-third text-center text-left'
class-cell3='segment table-cell lg-third text-center'
class-circle.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline'
class-circle.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellipsis'
action-leaveButton="joinButton"
widget-leaveButton="hubl-admin-circle-leave-button"
@ -120,11 +119,11 @@ solid-router(default-route='admin-circle-list', hidden)
fields='cell1(name, description), cell2(owner), cell3(members)'
loader-id='loader-admin-circles'
class-cell1='segment table-cell padding-xsmall lg-third text-left text-top'
class-cell2='segment table-cell padding-top-xsmall padding-right-xlarge padding-bottom-xsmall padding-left-xlarge lg-third text-center text-left'
class-cell3='segment table-cell padding-xsmall lg-third text-center'
class-cell1='segment table-cell lg-third text-left text-top'
class-cell2='segment table-cell lg-third text-center text-left'
class-cell3='segment table-cell lg-third text-center'
class-name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline'
class-name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellipsis'
widget-owner='hubl-circle-owner'
widget-members="hubl-admin-circle-join-button"

8
src/views/partials/admin/page-admin-communities.pug
View File

@ -16,7 +16,7 @@ solid-widget(name='hubl-action-community')
#admin-communities-list(hidden, data-view="admin-communities-list")
div.segment.lg-full.sm-full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey.whitespace-normal
h2.lg-margin-none.sm-margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='communities.title')
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='communities.title')
div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal
@ -36,10 +36,10 @@ solid-widget(name='hubl-action-community')
fields='cell1(community.name), cell2(community)'
loader-id='loader-admin-community'
class-cell1='segment table-cell padding-medium lg-half text-center'
class-cell2='segment table-cell padding-medium lg-half text-center'
class-cell1='segment table-cell lg-half text-center'
class-cell2='segment table-cell lg-half text-center'
class-community.name='text-xlarge text-color-heading text-semibold text-letter-spacing-large'
class-community.name='text-xlarge text-color-heading text-semibold text-letter-spacing-large ellipsis'
widget-community='hubl-action-community'
order-asc='community.name'

2
src/views/partials/admin/page-admin-projects-create.pug
View File

@ -1,5 +1,5 @@
div.segment.lg-full.sm-full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey
h2.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='project.create.title')
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='project.create.title')
div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal
div#loader-projects-create.loader.loader-top

27
src/views/partials/admin/page-admin-projects.pug
View File

@ -9,7 +9,7 @@ solid-router(default-route='admin-project-list', hidden)
#admin-project-list(hidden, data-view="admin-project-list")
div.segment.lg-full.sm-full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.border-bottom.border-color-grey.whitespace-normal
h2.lg-margin-none.sm-margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='project.list.title')
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='project.list.title')
div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal
@ -59,9 +59,8 @@ solid-router(default-route='admin-project-list', hidden)
class-segment2='segment lg-three-quarter margin-left-xsmall'
class-line1='block'
class-name='text-semibold text-color-heading text-sub'
class-line2='block'
class-username=''
class-name='text-small text-semibold text-color-heading text-sub'
class-line2='block text-xsmall'
widget-account.picture='hubl-user-avatar'
@ -96,12 +95,12 @@ solid-router(default-route='admin-project-list', hidden)
fields='cell1(project.customer.name, project.name), cell2(project.members), cell3(project.captain), cell4(leaveButton)'
loader-id='loader-admin-projects'
class-cell1='segment table-cell padding-xsmall lg-quarter text-left'
class-cell2='segment table-cell padding-xsmall lg-quarter text-left'
class-cell3='segment table-cell padding-top-xsmall padding-right-small padding-bottom-xsmall padding-left-small lg-quarter text-left'
class-cell4='segment table-cell padding-xsmall lg-quarter text-center'
class-cell1='segment table-cell lg-quarter text-left'
class-cell2='segment table-cell lg-quarter text-left'
class-cell3='segment table-cell lg-quarter text-left'
class-cell4='segment table-cell lg-quarter text-center'
class-project.customer.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline'
class-project.customer.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellipsis'
action-leaveButton="joinButton"
widget-leaveButton="hubl-admin-project-leave-button"
@ -140,12 +139,12 @@ solid-router(default-route='admin-project-list', hidden)
fields='cell1(customer.name, name), cell2(members), cell3(captain), cell4(joinButton)'
loader-id='loader-admin-projects'
class-cell1='segment table-cell padding-xsmall lg-quarter text-left'
class-cell2='segment table-cell padding-xsmall lg-quarter text-left'
class-cell3='segment table-cell padding-top-xsmall padding-right-small padding-bottom-xsmall padding-left-small lg-quarter text-left'
class-cell4='segment table-cell padding-xsmall lg-quarter text-center'
class-cell1='segment table-cell lg-quarter text-left'
class-cell2='segment table-cell lg-quarter text-left'
class-cell3='segment table-cell lg-quarter text-left'
class-cell4='segment table-cell lg-quarter text-center'
class-customer.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline'
class-customer.name='segment block margin-bottom-xxsmall text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline ellpsis'
action-joinButton="joinButton" # Workaround: I need members two times
widget-joinButton="hubl-admin-project-join-button"

2
src/views/partials/admin/page-admin-users-create.pug
View File

@ -1,5 +1,5 @@
div.segment.lg-full.sm-full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-padding-bottom-small.sm-padding-left-xsmall.padding-large.border-bottom.border-color-grey
h2.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='communities.title')
h2.margin-none.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='communities.title')
div.segment.lg-full.sm-full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespace-normal

8
src/views/partials/circle/page-circle-edit.pug
View File

@ -95,15 +95,15 @@ div.segment.lg-full.padding-large.whitespace-normal
fields='cell(segment1(user.account.picture), segment2(line1(user.name, is_admin), line2(atom, user.communities))), self'
loader-id='loader-circle-edit'
class-cell='segment table-cell padding-top-xsmall padding-right-medium padding-bottom-xsmall padding-left-medium lg-two-third labelled-avatar two-lines text-left'
class-self='segment table-cell padding-top-xsmall padding-right-medium padding-bottom-xsmall padding-left-medium lg-third text-center'
class-cell='segment table-cell lg-two-third labelled-avatar two-lines text-left'
class-self='segment table-cell lg-third text-center'
class-segment1='segment'
class-user.account.picture='avatar'
class-segment2='segment lg-three-quarter margin-left-xsmall'
class-line1='block'
class-user.name='text-semibold text-color-heading text-sub'
class-user.name='text-small text-semibold text-color-heading text-sub'
class-is_admin='segment margin-left-medium tag color-primary'
class-line2='block'
class-atom='icon icon-large icon-third mdi-atom margin-right-xxsmall'
@ -120,4 +120,4 @@ div.segment.lg-full.padding-large.whitespace-normal
)
//- Only to show the table grid
div.segment.padding-top-xsmall.padding-right-medium.padding-bottom-xsmall.padding-left-medium.table-cell.lg-third
div.segment.table-cell.lg-third

2
src/views/partials/circle/page-circle-profile.pug
View File

@ -109,7 +109,7 @@ solid-router(default-route='circle-profile', hidden)
class-segment2='segment lg-three-quarter margin-left-xsmall'
class-line1='block'
class-user.name='text-semibold text-color-heading text-sub'
class-user.name='text-small text-semibold text-color-heading text-sub'
class-line2='block'
class-atom='icon icon-large icon-third mdi-atom margin-right-xxsmall'
class-user.communities='lg-full'

12
src/views/partials/header.pug
View File

@ -46,16 +46,16 @@ div
li.segment.padding-small.border-bottom.border-color-grey
div(data-trans='header.admin')
ul.text-normal
if (endpoints.users || (endpoints.get && endpoints.get.users))
solid-route.text-hover(name='admin-communities')
if endpoints.get.users
solid-link.text-hover(next='admin-communities')
li.segment.padding-top-small
a.icon.icon-people.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.community')
if endpoints.circles || (endpoints.get && endpoints.get.circles)
solid-route.text-hover(name='admin-circles')
if endpoints.get.circles
solid-link.text-hover(next='admin')
li.segment.padding-top-small
a.icon.icon-globe.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.circles')
if endpoints.projects || (endpoints.get && endpoints.get.projects)
solid-route.text-hover(name='admin-projects')
if endpoints.get.projects
solid-link.text-hover(next='admin-projects')
li.segment.padding-top-small
a.icon.icon-folder-alt.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.projects')
li.border-bottom.border-color-grey

28
src/views/partials/menu-left.pug
View File

@ -102,52 +102,50 @@ solid-widget(name='hubl-menu-fix-url-project')
solid-router#navbar-router(default-route='dashboard')
if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards)
if endpoints.get.dashboards
solid-route.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='dashboard')
div.segment.margin-right-xxsmall
div.icon.icon-small.icon-home
div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.dashboard")
div.divider
if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users))
if publicDirectory && endpoints.get.users
solid-route.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='members')
div.segment.margin-right-xxsmall
div.icon.icon-small.icon-people
div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.profileDirectory")
div.divider
if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers)
if endpoints.get.joboffers
solid-route.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='job-offers', rdf-type='hd:joboffer')
div.segment.margin-right-xxsmall
div.segment.icon.icon-small.icon-briefcase
div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.jobBoard")
div.divider
if endpoints.resources || (endpoints.get && endpoints.get.resources)
if endpoints.get.resources
solid-route.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='resources')
div.segment.margin-right-xxsmall
div.segment.icon.icon-small.icon-docs
div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.resources")
div.divider
if endpoints.polls || (endpoints.get && endpoints.get.polls)
if endpoints.get.polls
solid-route.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='polls')
div.segment.margin-right-xxsmall
div.segment.icon.icon-small.icon-bubbles
div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.gov")
div.divider
if endpoints.events || (endpoints.get && endpoints.get.events)
if endpoints.get.events
solid-route.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='events')
div.segment.margin-right-xxsmall
div.segment.icon.icon-small.icon-calendar
div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.events")
div.divider
if endpoints.projects || (endpoints.get && endpoints.get.projects)
if endpoints.get.projects
div.menu-wrapper
solid-link.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active
//- (next='admin-project-list')
solid-link.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(next='admin-project-list')
div.segment.margin-right-xxsmall
div.segment.icon.icon-small.icon-folder-alt
div.segment.lg-three-quarter.sm-three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.projects")
div.menu-chevron.segment
div.icon-arrow-up
//- div.menu-icon.icon-arrow-right-circle
div.icon-arrow-right-circle
solid-route(name='project', rdf-type='hd:project', use-id='', hidden)
div.sub-menu.menu-notification
div#loader-projects.loader.loader-menu
@ -167,16 +165,14 @@ solid-router#navbar-router(default-route='dashboard')
order-asc="project.customer.name"
)
div.divider
if endpoints.circles || (endpoints.get && endpoints.get.circles)
if endpoints.get.circles
div.menu-wrapper
solid-link.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active
//- (next='admin-circle-list')
solid-link.menu.segment.lg-full.sm-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(next='admin-circle-list')
div.segment.margin-right-xxsmall
div.segment.icon.icon-small.icon-folder-alt
div.segment.lg-three-quarter.sm-three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.circles")
div.menu-chevron.segment
div.icon-arrow-up
//- div.menu-icon.icon-arrow-right-circle
div.menu-icon.icon-arrow-right-circle
solid-route(name='circle', rdf-type='hd:circle', use-id='', hidden)
div.sub-menu.menu-notification
div#loader-circles.loader.loader-menu

2
src/views/partials/notifications/message-circle.pug
View File

@ -1,7 +1,7 @@
solid-notifications-template(data-rdf-type='hd:circle')
template
.solid-notification__avatar
| ${await author['account.foaf:depiction'] ? `<img src="${await author['account.foaf:depiction']}" style="max-width:100%; max-height: 100%;" />` : `<object type="image/svg+xml" data="/images/alien.svg"></object>`}
| ${await author['account.foaf:depiction'] ? `<img src="${await author['account.foaf:depiction']}" style="max-width:100%; max-height: 100%;" />` : `<img src="/images/alien.webp" />`}
.solid-notification__content
.solid-notification__title ${await author.name}
span.solid-notification__title__side

2
src/views/partials/notifications/message-private.pug
View File

@ -1,7 +1,7 @@
solid-notifications-template(data-rdf-type='foaf:user')
template
.solid-notification__avatar
| ${await author['account.foaf:depiction'] ? `<img src="${await author['account.foaf:depiction']}" style="max-width:100%; max-height: 100%;" />` : `<object type="image/svg+xml" data="/images/alien.svg"></object>`}
| ${await author['account.foaf:depiction'] ? `<img src="${await author['account.foaf:depiction']}" style="max-width:100%; max-height: 100%;" />` : `<img src="/images/alien.webp" />`}
.solid-notification__content
.solid-notification__title ${await author.name}
span.solid-notification__title__side(data-trans='notification.private.private')

6
src/views/partials/project/page-project-edit.pug
View File

@ -103,15 +103,15 @@ div.segment.lg-full.padding-large.whitespace-normal
fields='cell(segment1(user.account.picture), segment2(line1(user.name, is_admin), line2(atom, user.communities))), self'
loader-id='loader-project-edit'
class-cell='segment table-cell padding-top-xsmall padding-right-medium padding-bottom-xsmall padding-left-medium lg-two-third labelled-avatar two-lines text-left'
class-self='segment table-cell padding-top-xsmall padding-right-medium padding-bottom-xsmall padding-left-medium lg-third text-center'
class-cell='segment table-cell lg-two-third labelled-avatar two-lines text-left'
class-self='segment table-cell lg-third text-center'
class-segment1='segment'
class-user.account.picture='avatar'
class-segment2='segment lg-three-quarter margin-left-xsmall'
class-line1='block'
class-user.name='text-semibold text-color-heading text-sub'
class-user.name='text-small text-semibold text-color-heading text-sub'
class-is_admin='segment margin-left-medium tag color-primary'
class-line2='block'
class-atom='icon icon-large icon-third mdi-atom margin-right-xxsmall'

2
src/views/partials/project/page-project-profile.pug
View File

@ -105,7 +105,7 @@ solid-router(default-route='project-profile', hidden)
class-segment2='segment lg-three-quarter margin-left-xsmall'
class-line1='block'
class-user.name='text-semibold text-color-heading text-sub'
class-user.name='text-small text-semibold text-color-heading text-sub'
class-line2='block'
class-atom='icon icon-large icon-third mdi-atom margin-right-xxsmall'
class-user.communities='lg-full'

2
src/views/partials/widgets/hubl-captain.pug
View File

@ -13,7 +13,7 @@ solid-widget(name='hubl-captain')
class-segment2='segment lg-three-quarter margin-left-xsmall'
class-line1='block'
class-name='text-semibold text-color-heading text-sub'
class-name='text-small text-semibold text-color-heading text-sub'
class-line2='block'
class-atom='icon icon-large icon-third mdi-atom margin-right-xxsmall'
class-communities='lg-full'

2
src/views/partials/widgets/hubl-user-avatar.pug
View File

@ -1,2 +1,2 @@
solid-widget(name='hubl-user-avatar')
template ${value ? `<img src="${value}" />` : `<object type="image/svg+xml" data="/images/alien.svg"></object>`}
template ${value ? `<img src="${value}" />` : `<img src="/images/alien.webp" />`}