diff options
Diffstat (limited to 'views')
| -rwxr-xr-x | views/event.handlebars | 27 | ||||
| -rwxr-xr-x | views/eventgroup.handlebars | 6 | ||||
| -rwxr-xr-x | views/home.handlebars | 2 | ||||
| -rwxr-xr-x | views/layouts/main.handlebars | 14 | ||||
| -rwxr-xr-x | views/partials/neweventgroupform.handlebars | 2 |
5 files changed, 35 insertions, 16 deletions
diff --git a/views/event.handlebars b/views/event.handlebars index 842239f..0b49808 100755 --- a/views/event.handlebars +++ b/views/event.handlebars @@ -67,11 +67,20 @@ <span class="fa-li"> <i class="fas fa-fw fa-share-square"></i> </span> - <a href="https://gath.io/{{eventData.id}}">gath.io/{{eventData.id}}</a> - <button type="button" id="copyEventLink" class="eventInformationAction btn btn-outline-secondary btn-sm" data-clipboard-text="https://gath.io/{{eventData.id}}"> + <a href="https://{{domain}}/{{eventData.id}}">{{domain}}/{{eventData.id}}</a> + <button type="button" id="copyEventLink" class="eventInformationAction btn btn-outline-secondary btn-sm" data-clipboard-text="https://{{domain}}/{{eventData.id}}"> <i class="fas fa-copy"></i> Copy </button> </li> + <li> + <span class="fa-li"> + <i class="fas fa-fw fa-share-square"></i> + </span> + @{{eventData.id}}@{{domain}} + <button type="button" id="copyAPLink" class="eventInformationAction btn btn-outline-secondary btn-sm" data-clipboard-text="@{{eventData.id}}@{{domain}}"> + <i class="fas fa-copy"></i> Copy + </button> + </li> </ul> </div> </div> @@ -135,7 +144,7 @@ {{#if eventAttendees}} <ul class="attendeesList"> {{#each eventAttendees}} - <li{{#if ../editingEnabled}} data-attendee-name="{{this.name}}" data-attendee-id="{{this._id}}"{{/if}}><span class="attendee-name">{{this.name}}</span>{{#if ../editingEnabled}} <a href="#" class="remove-attendee" data-toggle="modal" data-target="#removeAttendeeModal" title="Remove user from event"><i class="fas fa-user-times"></i></a>{{/if}}</li> + <li{{#if ../editingEnabled}} data-attendee-name="{{this.name}}" data-attendee-id="{{this._id}}"{{/if}}>{{#if this.email}}<span class="attendee-name">{{this.name}}</span>{{else}}<a href="{{this.id}}"><span class="attendee-name">{{this.name}}</span></a>{{/if}}{{#if ../editingEnabled}} <a href="#" class="remove-attendee" data-toggle="modal" data-target="#removeAttendeeModal" title="Remove user from event"><i class="fas fa-user-times"></i></a>{{/if}}</li> {{/each}} </ul> {{else}} @@ -259,7 +268,11 @@ <div class="comment"> <div class="row commentContainer"> <div class="col-lg commentText"> - <p class="mb-0"><strong>{{this.author}}</strong> <small class="commentTimestamp text-muted">{{this.timestamp}}</small></p> + {{#if this.actorId}} + <p class="mb-0"><a href="{{this.actorId}}"><strong>{{this.author}}</strong></a> <a href="{{this.activityId}}"><small class="commentTimestamp text-muted">{{this.timestamp}}</small></a></p> + {{else}} + <p class="mb-0"><strong>{{this.author}}</strong> <small class="commentTimestamp text-muted">{{this.timestamp}}</small></p> + {{/if}} <p>{{this.content}}</p> {{#if this.replies}} <hr> @@ -440,6 +453,12 @@ $(this).html('<i class="fas fa-copy"></i> Copied!'); setTimeout(function(){ $("#copyEventLink").html('<i class="fas fa-copy"></i> Copy');}, 5000); }) + new ClipboardJS('#copyAPLink'); + $("#copyAPLink").click(function(){ + console.log('hhhhh') + $(this).html('<i class="fas fa-copy"></i> Copied!'); + setTimeout(function(){ $("#copyAPLink").html('<i class="fas fa-copy"></i> Copy');}, 5000); + }) $(".daysToDeletion").html(moment("{{eventEndISO}}").add(7, 'days').fromNow()); if ($("#joinCheckbox").is(':checked')){ $("#maxAttendeesCheckboxContainer").css("display","flex"); diff --git a/views/eventgroup.handlebars b/views/eventgroup.handlebars index 00bae2c..dffb847 100755 --- a/views/eventgroup.handlebars +++ b/views/eventgroup.handlebars @@ -49,10 +49,10 @@ <span class="fa-li"> <i class="fas fa-share-square"></i> </span> - <a href="https://gath.io/group/{{eventGroupData.id}}"> - gath.io/group/{{eventGroupData.id}} + <a href="https://{{domain}}/group/{{eventGroupData.id}}"> + {{domain}}/group/{{eventGroupData.id}} </a> - <button type="button" id="copyEventLink" class="eventInformationAction btn btn-outline-secondary btn-sm" data-clipboard-text="https://gath.io/group/{{eventGroupData.id}}"> + <button type="button" id="copyEventLink" class="eventInformationAction btn btn-outline-secondary btn-sm" data-clipboard-text="https://{{domain}}/group/{{eventGroupData.id}}"> <i class="fas fa-copy"></i> Copy </button> </li> diff --git a/views/home.handlebars b/views/home.handlebars index c1a610f..164250c 100755 --- a/views/home.handlebars +++ b/views/home.handlebars @@ -1,4 +1,4 @@ -<h1>Organise all the things</h1> +<h1>{{siteName}}</h1> <p class="lead"> <strong>gath<span class="text-muted">io</span></strong> is a quick and easy way to make and share events which respects your privacy. diff --git a/views/layouts/main.handlebars b/views/layouts/main.handlebars index 4f0cfbc..d7c3bf2 100755 --- a/views/layouts/main.handlebars +++ b/views/layouts/main.handlebars @@ -17,17 +17,17 @@ <meta property="og:image:width" content="260"> <meta property="og:image:height" content="260"> <meta property="og:description" content="{{#if metadata.description}}{{metadata.description}}{{else}}An easier, quicker, and much less privacy-invading way to make and share events{{/if}}"> - <meta property="og:title" content="{{#if metadata.title}}{{metadata.title}} · gathio{{else}}gathio{{/if}}"> - <meta property="og:url" content="{{#if metadata.url}}{{metadata.url}}{{else}}https://gath.io/{{/if}}"> - <meta property="og:image" content="{{#if metadata.image}}{{metadata.image}}{{else}}http://gath.io/og-image.jpg{{/if}}"> + <meta property="og:title" content="{{#if metadata.title}}{{metadata.title}} · {{siteName}}{{else}}{{siteName}}{{/if}}"> + <meta property="og:url" content="{{#if metadata.url}}{{metadata.url}}{{else}}https://{{domain}}/{{/if}}"> + <meta property="og:image" content="{{#if metadata.image}}{{metadata.image}}{{else}}http://{{domain}}/og-image.jpg{{/if}}"> <meta name="twitter:card" content="summary"> - <meta name="twitter:title" content="{{#if metadata.title}}{{metadata.title}} · gathio{{else}}gathio{{/if}}"> + <meta name="twitter:title" content="{{#if metadata.title}}{{metadata.title}} · {{siteName}}{{else}}{{siteName}}{{/if}}"> <meta name="twitter:description" content="{{#if metadata.description}}{{metadata.description}}{{else}}An easier, quicker, and much less privacy-invading way to make and share events{{/if}}"> - <meta name="twitter:image" content="{{#if metadata.image}}{{metadata.image}}{{else}}http://gath.io/og-image.jpg{{/if}}"> + <meta name="twitter:image" content="{{#if metadata.image}}{{metadata.image}}{{else}}http://{{domain}}/og-image.jpg{{/if}}"> - <title>{{#if title}}{{title}} · {{/if}}gathio</title> + <title>{{#if title}}{{title}} · {{/if}}{{siteName}}</title> <!-- FONTS --> @@ -73,7 +73,7 @@ </div> <div id="footerContainer"> <small class="text-muted"> - <a href="https://github.com/lowercasename/gathio">GitHub</a> · Made with <i class="far fa-heart"></i> by <a href="http://raphaelkabo.com">Raphael</a> · Need help? <a href="mailto:support@gath.io">Email us</a>.<br /> + <a href="https://github.com/lowercasename/gathio">GitHub</a> · Made with <i class="far fa-heart"></i> by <a href="http://raphaelkabo.com">Raphael</a> · Need help? <a href="mailto:{{email}}">Email us</a>.<br /> If you like gathio, you might like <strong><a href="http://sweet.sh/" style="color:#ed5e5e;">sweet</a></strong>, my utopian social network. </small> </div> diff --git a/views/partials/neweventgroupform.handlebars b/views/partials/neweventgroupform.handlebars index 20dd832..fddc795 100755 --- a/views/partials/neweventgroupform.handlebars +++ b/views/partials/neweventgroupform.handlebars @@ -1,6 +1,6 @@ <h4 class="mb-2">Create an event group</h4> <p>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.</p> -<p>Event groups do not get automatically removed like events do, but events which have been removed from Gathio will of course not show up in an event group.</p> +<p>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.</p> <form id="newEventForm" action="/neweventgroup" method="post" enctype="multipart/form-data"> <div class="form-group row"> <label for="eventGroupName" class="col-sm-2 col-form-label">Event group name</label> |