diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/emails/createEvent/createEventHtml.handlebars | 1 | ||||
| -rw-r--r-- | views/emails/createEvent/createEventText.handlebars | 2 | ||||
| -rwxr-xr-x | views/layouts/main.handlebars | 25 | ||||
| -rwxr-xr-x | views/newevent.handlebars | 92 | ||||
| -rwxr-xr-x | views/partials/eventForm.handlebars | 14 | ||||
| -rw-r--r-- | views/partials/eventList.handlebars | 7 | ||||
| -rwxr-xr-x | views/partials/sidebar.handlebars | 3 | ||||
| -rw-r--r-- | views/publicEventList.handlebars | 52 |
8 files changed, 97 insertions, 99 deletions
diff --git a/views/emails/createEvent/createEventHtml.handlebars b/views/emails/createEvent/createEventHtml.handlebars index 9310c2a..b7d71ed 100644 --- a/views/emails/createEvent/createEventHtml.handlebars +++ b/views/emails/createEvent/createEventHtml.handlebars @@ -1,6 +1,7 @@ <p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.createevent.preface" }}</p> <p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{t "views.emails.createevent.sharelink" }}: <a href="https://{{domain}}/{{eventID}}">https://{{domain}}/{{eventID}}</a></p> <p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{{{t "views.emails.createeventhtml.desc" }}}</p> +<p style="font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;"><a href="https://{{domain}}/new?{{duplicateParams}}">Create a new edition of this event with the same information</a></p> <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;"> <tbody> diff --git a/views/emails/createEvent/createEventText.handlebars b/views/emails/createEvent/createEventText.handlebars index 7c85d5c..d88f12c 100644 --- a/views/emails/createEvent/createEventText.handlebars +++ b/views/emails/createEvent/createEventText.handlebars @@ -4,3 +4,5 @@ {{t "views.emails.createevent.desc" }} https://{{domain}}/{{eventID}}?e={{editToken}} + +Duplicate this event: https://{{domain}}/new{{duplicateParams}} diff --git a/views/layouts/main.handlebars b/views/layouts/main.handlebars index d2eeeac..925114d 100755 --- a/views/layouts/main.handlebars +++ b/views/layouts/main.handlebars @@ -54,32 +54,9 @@ <body> <div id="container"> - <header id="sidebar"> - {{>sidebar}} - </header> <section id="content" {{#if editingEnabled}}class="content--editing"{{/if}}> + <div class="text-center"><a href="/"><img class="logo" src="/logo2-min.png" alt="Quiet Reading"></a></div> {{{body}}} - <footer> - {{#if showInstanceInformation}} - <p class="small text-muted"> - <strong>{{siteName}}</strong> - {{#each staticPages}} - {{#if @first}} - · - {{/if}} - - <a href="{{this.path}}">{{this.title}}</a> - - {{#unless @last}} - · - {{/unless}} - {{/each}} - </p> - {{/if}} - <p class="small text-muted"> - {{{t "views.layouts.main.footnote" }}} - </p> - </footer> </section> </div> </html> diff --git a/views/newevent.handlebars b/views/newevent.handlebars index 9de2efd..57ee4d1 100755 --- a/views/newevent.handlebars +++ b/views/newevent.handlebars @@ -1,16 +1,72 @@ -<main class="page" x-data="{currentTab: null}"> -<h2 class="mb-3 pb-2 text-center border-bottom">{{t "views.newevent.pagetitle" }}</h2> +<main class="page" x-data="{currentTab: 'event'}"> <div class="container-fluid mb-4"> <div class="row"> + <details> + <summary> + <strong>Quiet reading belongs to you.</strong> Learn more about hosting your own events.<br> + </summary> + <div class="event"> + <div> + At quiet reading events, readers bring their own books, read for one hour, + and then chat for one hour about books, literature, and arts. <strong>Start + your own independently-operated quiet reading today!</strong> + </div> + </div> + <br> + <div class="event"> + <div> + <span class="event-time">1. Audience</span><br> + If you’re an individual, invite your friends, family, or classmates. + <br> + <br> + If you run an event space, invite your regulars and local community. + <br> + <br> + Quiet reading events generally do not require advance registration. + </div> + </div> + <br> + <div class="event"> + <div> + <span class="event-time">2. Location</span><br> + For example: a park, library discussion room, community garden, apartment, cafe, or bar. + <br> + <br> + A quiet environment is nice but silence is not required; readers can bring noise-cancelling headphones if they wish. + </div> + </div> + <br> + <div class="event"> + <div> + <span class="event-time">3. Time</span><br> + Quiet reading can happen at mornings, afternoons, evenings, or nights. Weekly events are perfect for building community. + </div> + </div> + <br> + <div class="event"> + <div> + <span class="event-time">4. Promotion</span><br> + Text, social media, flyers, venue website, local subreddit, and so on. + <br><br> + If you run a public space like a library, park, cafe, or bar, we can help advertise your independent event: contact <code>team@quietreading.org</code>. + </div> + </div> + <br> + <div class="event"> + <div> + <span class="event-time">5. Host</span><br> + Quiet reading is designed to be a casual community meetup. There’s no need for a host: readers arrive, read, and then chat by themselves. + <br> + <br> + Happy reading! + </div> + </details> + </div> +<hr> + <div class="row"> <div class="col-lg-4 p-2"> <button type="button" id="showNewEventFormButton" class="button w-100" x-bind:class="currentTab === 'event' ? 'button--primary' : 'button--secondary'" x-on:click="currentTab = 'event'"><i class="fas fa-calendar-day"></i> {{t "views.newevent.neweventbutton" }}</button> </div> - <div class="col-lg-4 p-2"> - <button type="button" id="showImportEventFormButton" class="button w-100" x-bind:class="currentTab === 'importEvent' ? 'button--primary' : 'button--secondary'" x-on:click="currentTab = 'importEvent'"><i class="fas fa-file-import"></i> {{t "views.newevent.importevent" }}</button> - </div> - <div class="col-lg-4 p-2"> - <button type="button" id="showNewEventGroupFormButton" class="button w-100" x-bind:class="currentTab === 'group' ? 'button--primary' : 'button--secondary'" x-on:click="currentTab = 'group'"><i class="fas fa-calendar-alt"></i> {{t "views.newevent.neweventgroup" }} </button> - </div> </div> </div> @@ -49,26 +105,6 @@ {{>importeventform}} </div> -<div id="newEventGroupFormContainer" x-show="currentTab === 'group'" style="display: none"> - <h4 class="mb-2">{{t "views.newevent.newgroup" }}</h4> - <p class="text-muted">{{t "views.newevent.groupdesc" }}</p> - <p class="text-muted">{{{t "views.newevent.groupattention" }}}</p> - <form id="newEventGroupForm" enctype="multipart/form-data" x-data="newEventGroupForm()" @submit.prevent="submitForm"> - {{> eventGroupForm }} - <div class="form-group row"> - <div class="col-sm-12 pt-3 pb-3 text-center"> - <button - type="submit" - class="button button--primary w-50" - x-bind:disabled="submitting" - x-bind:class="submitting ? 'button--loading' : ''" - x-text="submitting ? '{{t "common.creating" }}' : '{{t "common.create" }}'" - ></button> - </div> - </div> - </form> -</div> - </main> <script src="/js/generate-timezones.js"></script> diff --git a/views/partials/eventForm.handlebars b/views/partials/eventForm.handlebars index 8714058..53f7683 100755 --- a/views/partials/eventForm.handlebars +++ b/views/partials/eventForm.handlebars @@ -1,24 +1,24 @@ <input type="hidden" name="magicLinkToken" value="{{magicLinkToken}}" x-ref="magicLinkToken"> <div class="form-group"> - <label for="eventName" >{{t "common.eventname" }}</label> + <label for="eventName" >*{{t "common.eventname" }}</label> <div class="form-group "> <input type="text" class="form-control" id="eventName" name="eventName" placeholder="{{t "views.partials.snappy" }}" x-model="data.eventName" > </div> </div> <div class="form-group"> - <label for="eventLocation" >{{t "common.eventlocation" }}</label> + <label for="eventLocation" >*{{t "common.eventlocation" }}</label> <div class="form-group "> <input type="text" class="form-control" id="eventLocation" name="eventLocation" placeholder="{{t "views.event.locationdesc" }}" x-model="data.eventLocation"> </div> </div> <div class="form-group"> - <label for="eventStart" >{{t "common.eventstart" }}</label> + <label for="eventStart" >*{{t "common.eventstart" }}</label> <div class="form-group"> <input type="datetime-local" class="form-control" id="eventStart" name="eventStart" x-model="data.eventStart" x-on:blur="updateEventEnd"> </div> </div> <div class="form-group"> - <label for="eventEnd" >{{t "common.eventend" }}</label> + <label for="eventEnd" >*{{t "common.eventend" }}</label> <div class="form-group "> <input type="datetime-local" class="form-control" id="eventEnd" name="eventEnd" x-model="data.eventEnd"> </div> @@ -30,7 +30,7 @@ </div> </div> <div class="form-group"> - <label for="eventDescription" >{{t "views.partials.eventform.eventdescription" }}</label> + <label for="eventDescription" >*{{t "views.partials.eventform.eventdescription" }}</label> <div class="form-group "> <textarea class="form-control expand" id="eventDescription" name="eventDescription" placeholder="{{t "views.event.editlater" }}" x-model="data.eventDescription" ></textarea> <small class="form-text">{{{t "views.partials.mdsupport" }}}</small> @@ -39,7 +39,7 @@ <div class="form-group"> <label for="eventURL">{{t "views.partials.eventform.eventurl" }}</label> <div class="form-group "> - <input type="url" class="form-control" id="eventURL" name="eventURL" placeholder="https://example.com" x-model="data.eventURL"> + <input type="url" class="form-control" id="eventURL" name="eventURL" placeholder="" x-model="data.eventURL"> <small class="form-text">{{t "views.partials.eventform.eventurldesc" }}</small> </div> </div> @@ -65,7 +65,7 @@ </div> </div> <div class="form-group"> - <label for="creatorEmail" >{{t "views.partials.eventform.creatoremail" }}</label> + <label for="creatorEmail" >*{{t "views.partials.eventform.creatoremail" }}</label> <div class="form-group "> <input type="email" class="form-control" id="creatorEmail" name="creatorEmail" placeholder="{{t "views.partials.wontshow" }}" x-model.fill="data.creatorEmail" {{#if creatorEmail}}value="{{creatorEmail}}" readonly{{/if}}> <small class="form-text">{{t "views.partials.creatoremaildesc" }}</small> diff --git a/views/partials/eventList.handlebars b/views/partials/eventList.handlebars index b694fa3..e8226fb 100644 --- a/views/partials/eventList.handlebars +++ b/views/partials/eventList.handlebars @@ -5,11 +5,10 @@ <h5 class="mb-0">{{this.title}}</h5> </div> {{#each this.events}} - <a href="/{{this.id}}" class="list-group-item list-group-item-action"> - <i class="fas fa-fw fa-calendar-day"></i> + <a href="/{{this.id}}" class="list-group-item list-group-item-action"> + <span class="text-muted">{{this.displayDate}}</span> <strong>{{this.name}}</strong> - {{#if this.location}}<span class="ml-2 text-muted"><i class="fas fa-map-marker-alt"></i> {{this.location}}</span>{{/if}} - <span class="ml-2 text-muted">{{this.displayDate}}</span> + {{#if this.location}}<br><span class="text-muted">{{this.location}}</span>{{/if}} {{#if this.eventGroup}} <span class="badge badge-secondary ml-2">{{this.eventGroup.name}}</span> {{/if}} diff --git a/views/partials/sidebar.handlebars b/views/partials/sidebar.handlebars index ae4929d..b771681 100755 --- a/views/partials/sidebar.handlebars +++ b/views/partials/sidebar.handlebars @@ -1,6 +1,8 @@ <div class="sidebar-sticky-wrapper"> <h1><a href="/">gathio</a></h1> + <!-- + <br> <ul id="sidebar__nav"> <li><a class="button button--primary" href="/new"><i class="far fa-calendar-plus"></i> {{t "views.partials.sidebar.createevent" }}</a></li> {{#if showPublicEventList}} @@ -8,4 +10,5 @@ <li><a href="/about">{{t "views.partials.sidebar.about" }}</a></li> {{/if}} </ul> + --> </div> diff --git a/views/publicEventList.handlebars b/views/publicEventList.handlebars index a16735b..70376b7 100644 --- a/views/publicEventList.handlebars +++ b/views/publicEventList.handlebars @@ -1,51 +1,31 @@ <main class="page" x-data="{currentTab: 'events'}"> -<h2 class="mb-3 pb-2 text-center border-bottom">{{siteName}}</h2> - {{#if instanceDescription}} <div class="instance-description mb-4"> {{{instanceDescription}}} </div> {{/if}} -{{> instanceRules }} - -<ul class="nav d-flex flex-gap--small"> - <li> - <a id="eventsTab" class="button button--lg" x-bind:class="currentTab === 'events' ? 'button--primary' : 'button--secondary'" aria-current="page" href="#" x-on:click.prevent="currentTab = 'events'">{{t "views.publiceventlist.events" }}</a> - </li> - <li> - <a id="groupsTab" class="button button--lg" x-bind:class="currentTab === 'groups' ? 'button--primary' : 'button--secondary'" href="#" x-on:click.prevent="currentTab = 'groups'">{{t "views.publiceventlist.groups" }}</a> - </li> -</ul> +{{!> instanceRules }} -<div x-show="currentTab === 'events'"> - <div class="card mt-4 mb-4" id="upcomingEvents"> - <h5 class="card-header">{{t "views.publiceventlist.upcomingevents" }}</h5> - {{> eventList upcomingEvents }} - </div> +<div class="navi"> + <a href="/"><strong>Home</strong></a> + · + <a href="/new">Create Your Own Event</a> + · + <a href="mailto:team@quietreading.org">Email Us</a> + · + <a href="https://instagram.com/quietreading.club">Instagram</a> +</div> - <div class="card mt-4 mb-4" id="pastEvents"> - <h5 class="card-header">{{t "views.publiceventlist.pastevents" }}</h5> - {{> eventList pastEvents }} - </div> +<div class="card mt-4 mb-4" id="upcomingEvents"> + <h5 class="card-header">{{t "views.publiceventlist.upcomingevents" }}</h5> + {{> eventList upcomingEvents }} </div> -<div x-show="currentTab === 'groups'"> - <div class="card mt-4 mb-4" id="eventGroups"> - <h5 class="card-header">{{t "common.eventgroups" }}</h5> - <div class="list-group list-group-flush"> - {{#if eventGroups}} - {{#each eventGroups}} - <a href="/group/{{this.id}}" class="list-group-item list-group-item-action"> - <i class="fas fa-fw fa-calendar-alt"></i> - <strong>{{this.name}}</strong> - <span class="badge badge-secondary ml-2">{{plural "views.publiceventlist.numoevents" this.numberOfEvents }}</span> - </a> - {{/each}} - {{else}} - <div class="list-group-item">{{t "views.publiceventlist.nogroups" }}</div> - {{/if}} +<div class="card mt-4 mb-4" id="pastEvents"> + <h5 class="card-header">{{t "views.publiceventlist.pastevents" }}</h5> + {{> eventList pastEvents }} </div> </main> |