diff --git a/src/app.css b/src/app.css index 12556d45..933e0539 100644 --- a/src/app.css +++ b/src/app.css @@ -35,6 +35,10 @@ text-decoration: none; } + .markdown div > p:not(:last-child) { + padding-bottom: 1em; + } + .external::after { padding-left: 0.5rem; content: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='13.5' height='13.5' aria-hidden='true' viewBox='0 0 24 24' class='iconExternalLink_nPIU'%3E%3Cpath fill='currentColor' d='M21 13v10h-21v-19h12v2h-10v15h17v-8h2zm3-12h-10.988l4.035 4-6.977 7.07 2.828 2.828 6.977-7.07 4.125 4.172v-11z'%3E%3C/path%3E%3C/svg%3E"); diff --git a/src/lib/components/CalendarList.svelte b/src/lib/components/CalendarList.svelte index 215ec3f5..24d3167f 100644 --- a/src/lib/components/CalendarList.svelte +++ b/src/lib/components/CalendarList.svelte @@ -5,6 +5,7 @@ export let segments; export let date; + export let col = 'event'; export let entry; export let bundle; export let event = null; @@ -32,7 +33,7 @@
- +
@@ -41,7 +42,7 @@ {(segment.event || event)[event && event.shortname ? 'shortname' : 'name']}* {:else} {(segment.event || event)[event && event.shortname ? 'shortname' : 'name']} diff --git a/src/lib/pbw.js b/src/lib/pbw.js index 9bee5d7e..ef761c44 100644 --- a/src/lib/pbw.js +++ b/src/lib/pbw.js @@ -30,6 +30,10 @@ export const config = { chains: { title: 'Blockchains', model: 'chain' + }, + 'other-events': { + title: 'Other events', + model: 'other-event' } }, eventTypeColors: { diff --git a/src/routes/[entry]/+page.svelte b/src/routes/[entry]/+page.svelte index dd63595a..a27d786e 100644 --- a/src/routes/[entry]/+page.svelte +++ b/src/routes/[entry]/+page.svelte @@ -16,7 +16,7 @@ const collections = [ { title: 'Days', value: 10, col: 'schedule' }, - { title: 'Events', col: 'events', filter: e => !e.hidden }, + { title: 'Events', col: 'events', filter: (e) => !e.hidden }, { title: 'Speakers', col: 'speakers' }, { title: 'Places', col: 'places' }, { title: 'Media Partners', col: 'media-partners' }, @@ -38,7 +38,7 @@ diff --git a/src/routes/[entry]/[type]/+page.svelte b/src/routes/[entry]/[type]/+page.svelte index 36eac4e2..4483659b 100644 --- a/src/routes/[entry]/[type]/+page.svelte +++ b/src/routes/[entry]/[type]/+page.svelte @@ -72,7 +72,7 @@

- {tc.title} ({processedItems.filter(e => !e.hidden).length}) + {tc.title} ({processedItems.filter((e) => !e.hidden).length})

diff --git a/src/routes/[entry]/[type]/[slug]/+page.svelte b/src/routes/[entry]/[type]/[slug]/+page.svelte index a536e645..bea4977c 100644 --- a/src/routes/[entry]/[type]/[slug]/+page.svelte +++ b/src/routes/[entry]/[type]/[slug]/+page.svelte @@ -65,7 +65,7 @@

{item.name}

- {#if col === 'event'} + {#if col === 'event' || col === 'other-event'}
{#each item.types as type} @@ -117,7 +117,7 @@ {/each}
{/if} - {#if col === 'event'} + {#if col === 'event' || col === 'other-event'}
{#if item.chains && item.chains.length > 0}
@@ -169,10 +169,12 @@
{/if} -
-
Organizator
-
-
+ {#if col !== 'other-event'} +
+
Organizator
+
+
+ {/if} {#if item.poc}
Point of contact
diff --git a/src/routes/[entry]/day/[date]/+page.svelte b/src/routes/[entry]/day/[date]/+page.svelte index 8d5430d5..ab4a9cf4 100644 --- a/src/routes/[entry]/day/[date]/+page.svelte +++ b/src/routes/[entry]/day/[date]/+page.svelte @@ -43,6 +43,7 @@ } $: segments = makeSegments(data.bundle.events, $page.params.date); + $: relatedEvents = makeSegments(data.bundle['other-events'], $page.params.date); $: haveHiddenEvents = (() => { for (const s of segments) { @@ -76,9 +77,25 @@ bundle={data.bundle} />
- {#if haveHiddenEvents} - +
+ {#if haveHiddenEvents} + + {/if} +
+ + {#if relatedEvents && relatedEvents.length > 0} +

Other events

+
+ +
{/if} +