From fd018d54b38c89426bd7ff9b42203b8475c16db8 Mon Sep 17 00:00:00 2001 From: lowercasename Date: Sat, 24 Aug 2019 11:48:55 +0100 Subject: Some tweaks to event page display --- public/css/style.css | 18 +++++++++++++++--- routes.js | 4 +++- views/event.handlebars | 25 +++++++++++++++---------- views/layouts/main.handlebars | 5 ++++- 4 files changed, 37 insertions(+), 15 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index ed755e3..3793e8f 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -140,10 +140,14 @@ body, html { margin-bottom: 0.8em; } -.eventInformation > li > .eventInformationAction { +#copyEventLink { margin-left: 5px; } +.eventInformationAction:not(#copyEventLink) { + margin-top: 0.25rem; +} + .commentContainer { background: #fafafa; border-radius: 5px; @@ -239,11 +243,19 @@ body, html { height: 2.25rem !important; } -#removeAttendee { +.attendee-name { + white-space: nowrap; + overflow: hidden; + text-overflow: ""; + overflow: hidden; + max-width: 62px; +} + +.remove-attendee { color: #fff; } -#removeAttendee:hover { +.remove-attendee:hover { color: #016418; } diff --git a/routes.js b/routes.js index ba5750b..fde1b86 100755 --- a/routes.js +++ b/routes.js @@ -243,7 +243,8 @@ router.get('/:eventID', (req, res) => { } } } - var metadata = { + let eventAttendees = event.attendees.sort((a,b) => (a.name > b.name) ? 1 : ((b.name > a.name) ? -1 : 0)); + let metadata = { title: event.name, description: marked(event.description, { renderer: render_plain()}).split(" ").splice(0,40).join(" ").trim(), image: (eventHasCoverImage ? 'https://gath.io/events/' + event.image : null), @@ -254,6 +255,7 @@ router.get('/:eventID', (req, res) => { title: event.name, escapedName: escapedName, eventData: event, + eventAttendees: eventAttendees, eventStartISO: eventStartISO, eventEndISO: eventEndISO, parsedLocation: parsedLocation, diff --git a/views/event.handlebars b/views/event.handlebars index 9314c09..1b25f20 100755 --- a/views/event.handlebars +++ b/views/event.handlebars @@ -23,9 +23,13 @@ - {{eventData.location}} - - Find on Google Maps + {{eventData.location}}
+ + Show on Google Maps + +   + + Show on OpenStreetMap {{#if eventHasHost}} @@ -41,13 +45,14 @@ {{{displayDate}}} - - Add to Google Calendar -
{{#if eventHasBegun}}{{#unless eventHasConcluded}}Started {{else}}Ended {{/unless}}{{/if}}{{fromNow}} +
+ + Add to Google Calendar + {{#if eventData.url}}
  • @@ -95,17 +100,17 @@ {{#if eventData.usersCanAttend}}
    -
    Attendees {{#if eventData.attendees}}({{eventData.attendees.length}}){{/if}} +
    Attendees {{#if eventAttendees}}({{eventAttendees.length}}){{/if}}
    - {{#if eventData.attendees}} + {{#if eventAttendees}}
      - {{#each eventData.attendees}} - {{this.name}}{{#if ../editingEnabled}}{{/if}} + {{#each eventAttendees}} + {{this.name}}{{#if ../editingEnabled}}{{/if}} {{/each}}
    {{else}} diff --git a/views/layouts/main.handlebars b/views/layouts/main.handlebars index a7c4321..06bb146 100755 --- a/views/layouts/main.handlebars +++ b/views/layouts/main.handlebars @@ -74,7 +74,10 @@ {{{body}}}
    - GitHub · Made with by Raphael · Need help? Email us. + + GitHub · Made with by Raphael · Need help? Email us.
    + If you like gathio, you might like sweet, my utopian social network. +
    -- cgit v1.2.3