Skip to content

Commit f948029

Browse files
LeonVrelingWikiRik
andauthored
fix(events): update small things on rendering events (#2225)
* fix(events): use correct capitalisation for event types as per CIA 35.0 * fix(events): make display of one-day events nicer * fix(events): fix scaling of custom event images --------- Co-authored-by: Rik Smale <[email protected]>
1 parent 5338ed6 commit f948029

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

src/constants.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
const constants = {
22
EVENT_TYPES_NAMES: {
3-
training: 'Training event',
4-
nwm: 'Network meeting',
3+
training: 'Training Event',
4+
nwm: 'Network Meeting',
55
conference: 'Conference',
6-
cultural: 'Cultural event'
6+
cultural: 'Cultural Event'
77
},
88
STATUTORY_TYPES_NAMES: {
99
agora: 'Agora',

src/views/events/List.vue

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<div class="media-left">
4646
<figure class="image is-96x96">
4747
<img v-if="!event.image" src="/images/logo.png">
48-
<img v-if="event.image" :src="services['events-static'] + '/headimages/' + event.image">
48+
<img v-if="event.image" :src="services['events-static'] + '/headimages/' + event.image" style="max-height: 96px; object-fit: contain">
4949
</figure>
5050
</div>
5151
<div class="media-content">
@@ -99,15 +99,13 @@
9999
<div class="columns is-multiline">
100100
<div class="column is-one-quarter" v-for="event in events" v-bind:key="event.id">
101101
<div class="card">
102-
<div class="card-image">
102+
<div class="card-content">
103103
<figure class="image is-square">
104104
<img v-if="!event.image" src="/images/logo.png">
105-
<img v-if="event.image" :src="services['events-static'] + '/headimages/' + event.image">
105+
<img v-if="event.image" :src="services['events-static'] + '/headimages/' + event.image" style="object-fit: contain; margin: auto">
106106
</figure>
107-
</div>
108107

109-
<div class="card-content" style="padding-top: 0;">
110-
<div class="content">
108+
<div class="content" style="padding-top: 1rem">
111109
<ul style="list-style-type: none; padding: 0; margin: 0">
112110
<li><span class="title is-4">{{ event.name }}</span></li>
113111
<li style="display: flex; justify-content: space-between;">
@@ -123,7 +121,10 @@
123121
<table>
124122
<tr>
125123
<td><span class="subtitle is-4"><font-awesome-icon :icon="['fa', 'calendar']" /></span></td>
126-
<td>{{ event.starts | date }} - {{ event.ends | date }}</td>
124+
<td>
125+
<span>{{ event.starts | date }}</span>
126+
<span v-if="!isOneDayEvent(event.starts, event.ends)"> - {{ event.ends | date }}</span>
127+
</td>
127128
</tr>
128129
<tr>
129130
<td><span class="subtitle is-4"><font-awesome-icon :icon="['fa', 'coins']" /></span></td>
@@ -264,6 +265,9 @@ export default {
264265
})
265266
},
266267
methods: {
268+
isOneDayEvent (start, end) {
269+
return moment(start).isSame(moment(end), 'day')
270+
},
267271
toggleDisplayPast () {
268272
this.displayPast = !this.displayPast
269273
this.refetch()

src/views/events/Single.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="tile is-vertical is-3">
44
<div class="tile is-parent is-vertical">
55
<article class="tile is-child is-primary">
6-
<figure class="image is-1by1">
6+
<figure class="image">
77
<img v-if="!event.image" src="/images/logo.png">
88
<img v-if="event.image" :src="services['events-static'] + '/headimages/' + event.image">
99
</figure>

0 commit comments

Comments
 (0)