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

Merge remote-tracking branch 'origin/feature/multi-dashboard-fixes' into feature/uniq-behavior-change

Browse Source
This commit is contained in:
Jean-Baptiste Pasquier
2021-02-26 15:56:01 +01:00
parent efb6e9f77f ab34104746
commit a515da9b48
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,4 +2,4 @@ div.padding-top-xlarge.padding-right-xsmall.padding-bottom-xlarge.padding-left-x
solid-dashboard(
data-src=component.endpoints.get
uniq=component.uniq
)
)&attributes({target:component.parameters?.target})

6
src/views/partials/circle/page-circle-events.pug
View File

@ -2,9 +2,9 @@ solid-event(
class='w700'
bind-resources
nested-field="events"
range-event-type=`${extension.get('events').endpoints.typeevents}`
range-event-type=`${component.extensions.find(c => c.type=='events').endpoints.typeevents}`
range-event-circle=`${component.endpoints.get}`
upload-dir=`${extension.get('events').endpoints.uploads}`
upload-dir=`${component.extensions.find(c => c.type=='events').endpoints.uploads}`
id-prefix=`${component.route}`
uniq=component.uniq
)
)

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

@ -7,7 +7,7 @@ solid-router#navbar-router(default-route='dashboard')
solid-route.menu.segment.full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name=component.route)
div.segment.margin-right-xxsmall
div.icon.icon-small.icon-home
div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.dashboard")
div.segment.text-uppercase.text-letter-spacing-large(data-trans=`${component.name?component.name:"menuLeft.dashboard"}`)
div.divider
if component.type == "circles"
div.menu-wrapper
@ -50,7 +50,7 @@ solid-router#navbar-router(default-route='dashboard')
solid-route.menu.segment.full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name=`admin-${component.route}`)
div.segment.margin-right-xxsmall
div.segment.icon.icon-small.icon-folder-alt
div.segment.three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.messages")
div.segment.three-quarter.text-uppercase.text-letter-spacing-large(data-trans=`${component.name?component.name:"menuLeft.messages"}`)
div.menu-chevron.segment
div.menu-icon.icon-arrow-right-circle
solid-route(name=`admin-${component.route}-create`, use-id='', hidden)
@ -58,7 +58,7 @@ solid-router#navbar-router(default-route='dashboard')
div.menu.segment.full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading
div.segment.margin-right-xxsmall
div.segment.icon.icon-small.icon-folder-alt
div.segment.three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.messages")
div.segment.three-quarter.text-uppercase.text-letter-spacing-large(data-trans=`${component.name?component.name:"menuLeft.messages"}`)
solid-route(name=component.route, rdf-type='foaf:user', use-id='', hidden)
div.sub-menu.menu-notification
div.loader.loader-menu(id=`loader-${component.route}`)