From 6b220e094f215c488eb5102e25506f5b3d371245 Mon Sep 17 00:00:00 2001 From: Raphael Kabo Date: Sun, 8 Oct 2023 12:11:36 +0100 Subject: Refactor: event group form and API, extract JS --- .../createEventGroupHtml.handlebars | 2 +- .../createEventGroupText.handlebars | 2 +- views/event.handlebars | 5 + views/eventgroup.handlebars | 35 ++-- views/newevent.handlebars | 183 +++------------------ views/partials/editeventgroupmodal.handlebars | 32 +--- views/partials/editeventmodal.handlebars | 102 +----------- views/partials/eventForm.handlebars | 86 +++++----- views/partials/eventGroupForm.handlebars | 47 ++++++ views/partials/neweventgroupform.handlebars | 66 -------- views/partials/sidebar.handlebars | 2 +- 11 files changed, 134 insertions(+), 428 deletions(-) create mode 100644 views/partials/eventGroupForm.handlebars delete mode 100755 views/partials/neweventgroupform.handlebars (limited to 'views') diff --git a/views/emails/createEventGroup/createEventGroupHtml.handlebars b/views/emails/createEventGroup/createEventGroupHtml.handlebars index 9951a28..0a12e91 100644 --- a/views/emails/createEventGroup/createEventGroupHtml.handlebars +++ b/views/emails/createEventGroup/createEventGroupHtml.handlebars @@ -1,6 +1,6 @@

You just created a new event group on {{siteName}}! Thanks a bunch - we're delighted to have you.

You can edit your event group by clicking the button below, or just following this link: https://{{domain}}/{{eventGroupID}}?e={{editToken}}

-

To add events to this group (whether brand new events or ones you've already made), click the 'This event is part of an event group' checkbox. You will need to copy the following two codes into the dark grey box which opens:

+

To add events to this group (whether brand new events or ones you've already made), click the 'This event is part of an event group' checkbox. You will need to copy the following two codes into the box which opens:

Event group ID: {{eventGroupID}}

Event group secret editing code: {{editToken}}

diff --git a/views/emails/createEventGroup/createEventGroupText.handlebars b/views/emails/createEventGroup/createEventGroupText.handlebars index b017510..34ad618 100644 --- a/views/emails/createEventGroup/createEventGroupText.handlebars +++ b/views/emails/createEventGroup/createEventGroupText.handlebars @@ -2,7 +2,7 @@ You just created a new event group on {{siteName}}! Thanks a bunch - we're delig You can edit your event group by clicking the button below, or just following this link: https://{{domain}}/{{eventGroupID}}?e={{editToken}} -To add events to this group (whether brand new events or ones you've already made), click the 'This event is part of an event group' checkbox. You will need to copy the following two codes into the dark grey box which opens: +To add events to this group (whether brand new events or ones you've already made), click the 'This event is part of an event group' checkbox. You will need to copy the following two codes into the box which opens: Event group ID: {{eventGroupID}} diff --git a/views/event.handlebars b/views/event.handlebars index b759b0a..ae6674a 100755 --- a/views/event.handlebars +++ b/views/event.handlebars @@ -397,6 +397,11 @@ {{/if}} + + + + - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/views/partials/editeventgroupmodal.handlebars b/views/partials/editeventgroupmodal.handlebars index 3b8f55a..2506e26 100644 --- a/views/partials/editeventgroupmodal.handlebars +++ b/views/partials/editeventgroupmodal.handlebars @@ -8,32 +8,10 @@
-
-
- - -
-
- - - Markdown formatting supported. -
-
- - -
-
- - -
-
- -
- - -
- Recommended dimensions (w x h): 920px by 300px. -
+ + + {{> eventGroupForm }} +
Delete this event group
@@ -51,3 +29,5 @@
+ + \ No newline at end of file diff --git a/views/partials/editeventmodal.handlebars b/views/partials/editeventmodal.handlebars index 2572cbb..a36cd98 100644 --- a/views/partials/editeventmodal.handlebars +++ b/views/partials/editeventmodal.handlebars @@ -46,104 +46,4 @@ - - \ No newline at end of file + diff --git a/views/partials/eventForm.handlebars b/views/partials/eventForm.handlebars index 36da7b8..93d679d 100755 --- a/views/partials/eventForm.handlebars +++ b/views/partials/eventForm.handlebars @@ -1,52 +1,52 @@ -
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
Markdown formatting supported.
-
- -
+
+ +
-
- -
-
- - +
+ +
+
+ +
Recommended dimensions (w x h): 920px by 300px. {{#if eventData.image}} @@ -54,22 +54,22 @@ {{/if}}
-
- -
+
+ +
-
- -
- +
+ +
+ If you provide your email, we will send your secret editing password here, and use it to notify you of updates to the event.
-
-
Options
-
+
+ +
-
+
You can find this short string of characters in the event group's link, in your confirmation email, or on the event group's page.
-
+
@@ -117,13 +117,13 @@
-
- -
+
+ +
-
+
+ + +
+
+ + + Markdown formatting supported. +
+
+ + +
+
+ + +
+
+ +
+ + If you provide your email, we will send your secret editing password here, and use it to notify you of updates to the event. +
+
+
+ +
+ + +
+ Recommended dimensions (w x h): 920px by 300px. +
+
+
+ +
\ No newline at end of file diff --git a/views/partials/neweventgroupform.handlebars b/views/partials/neweventgroupform.handlebars deleted file mode 100755 index 616b8ca..0000000 --- a/views/partials/neweventgroupform.handlebars +++ /dev/null @@ -1,66 +0,0 @@ -

Create an event group

-

An event group is a holding area for a set of linked events, like a series of film nights, a festival, or a band tour. You can share a public link to your event group just like an individual event link, and people who know the secret editing code (sent in an email when you create the event group) will be able to add future events to the group.

-

Event groups do not get automatically removed like events do, but events which have been removed from {{siteName}} will of course not show up in an event group.

- -
- -
- -
-
-
- -
- - Markdown formatting supported. -
-
-
- -
- -
-
-
- -
-
- - -
- Recommended dimensions (w x h): 920px by 300px. -
-
-
- -
- -
-
-
- -
- - If you provide your email, we will send your secret editing password here, and use it to notify you of updates to the event. -
-
-
-
- -
-
- - - diff --git a/views/partials/sidebar.handlebars b/views/partials/sidebar.handlebars index 980e699..5d8e847 100755 --- a/views/partials/sidebar.handlebars +++ b/views/partials/sidebar.handlebars @@ -3,5 +3,5 @@

Nicer events

- New event + New
-- cgit v1.2.3