update: integrations events and resources on circles

This commit is contained in:
Marjolaine Le Bon 2020-08-11 13:01:13 +02:00
parent 415f06c36e
commit 250192ef51
9 changed files with 50 additions and 23 deletions

View File

@ -70,7 +70,7 @@ solid-router#navbar-router(default-route='dashboard')
div.menu-icon.icon-calendar
div.divider
if endpoints.resources || (endpoints.get && endpoints.get.resources)
sib-route.menu(name='resources')
solid-route.menu(name='resources')
div.menu-label Ressources
div.menu-icon.icon-docs
div.divider

View File

@ -32,10 +32,10 @@ nav.jsRightMenu(role='navigation')
solid-route(name='circle-information')
li
a Information
sib-route(name='circle-events' use-id)
li
a Events
sib-route(name='circle-resources' use-id)
solid-route(name='circle-resources' use-id)
li
a Resources
solid-route(name='circle-events' use-id)
li
a Events

View File

@ -1,5 +1,6 @@
.views-container
sib-event(data-src=`${endpoints.events || (endpoints.get && endpoints.get.events)}`
range-event-type=`${endpoints.typeevents || (endpoints.get && endpoints.get.typeevents)}`
range-event-circle=`${endpoints.circles || (endpoints.get && endpoints.get.circles)}`
upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}`
)

View File

@ -2,5 +2,6 @@
sib-resource(data-src=`${endpoints.resources || (endpoints.get && endpoints.get.resources)}`
range-resource-type=`${endpoints.resourcestypes || (endpoints.get && endpoints.get.resourcestypes)}`
range-resource-keyword=`${endpoints.resourceskeywords || (endpoints.get && endpoints.get.resourceskeywords)}`
range-resource-circle=`${endpoints.circles || (endpoints.get && endpoints.get.circles)}`
upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}`
)

View File

@ -46,6 +46,10 @@
background-color: var(--color-menu-badge-background);
}
}
&[name="resources"][active] .menu-icon:before,
&[name="events"][active] .menu-icon:before {
background-color: transparent;
}
.menu-icon {
align-items: center;
@ -88,6 +92,11 @@
>solid-display {
display: block;
}
&[name="events"], &[name="resources"] {
.menu-label {
width: 9.9em;
}
}
}
.sub-menu {

View File

@ -1,4 +1,4 @@
#events {
#events, #circle-events {
width: 100%;
font-family: "Facit";
font-weight: 400;
@ -16,10 +16,12 @@
.event-place-name {
font-weight: 700;
}
#listevents [name="name"],
#listevents, #circle-listevents {
[name="name"],
solid-display-link-event .mdi::before {
color: #C4262E;
}
}
.event-place-name,
.nextevent-startdate,
solid-display-link-event {
@ -30,12 +32,13 @@
font-weight: 400;
.page-title {
font-family: "RefrigeratorDelxW01Bold";
font-size: 3.2rem;
line-height: 3.8rem;
color: #063B5C;
font-size: 3.2rem;
line-height: 3.8rem;
color: #063B5C;
}
}
#listevents {
#listevents,
#circle-listevents {
.newtype .button{
font-size: 1.2rem;
width: max-content;

View File

@ -7,6 +7,12 @@
background-color: #F0F3F6;
.sib-resource {
font-family: "Facit";
.page-title {
font-family: "RefrigeratorDelxW01Bold";
font-size: 3.2rem;
line-height: 3.8rem;
color: #063B5C;
}
.red-button {
background-color: #C4262E;
}

View File

@ -1,6 +1,9 @@
sib-display(
class='w700'
bind-resources
nested-field="events"
fields='name, shortDescription, startDate'
)
#circle-listevents
sib-event(
class='w700'
bind-resources
nested-field="events"
range-event-type=`${endpoints.typeevents || (endpoints.get && endpoints.get.typeevents)}`
range-event-circle=`${endpoints.circles || (endpoints.get && endpoints.get.circles)}`
upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}`
)

View File

@ -1,6 +1,10 @@
sib-display(
class='w700'
bind-resources
nested-field="resources"
fields='name, shortdesc, keywords'
)
#circle-listresources
sib-resource(
class='w700'
bind-resources
nested-field="resources"
range-resource-type=`${endpoints.resourcestypes || (endpoints.get && endpoints.get.resourcestypes)}`
range-resource-keyword=`${endpoints.resourceskeywords || (endpoints.get && endpoints.get.resourceskeywords)}`
range-resource-circle=`${endpoints.circles || (endpoints.get && endpoints.get.circles)}`
upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}`
)