Merge pull request #135 from lowercasename/rk/public-events

Events and groups optionally visible on front page

1 files changed, 1 insertions, 2 deletions

diff --git a/views/event.handlebars b/views/event.handlebars
index 4402578..44c2f4b 100755
--- a/views/event.handlebars
+++ b/views/event.handlebars
@@ -109,7 +109,7 @@
 
 {{#if eventHasConcluded}}
 <div class="alert alert-warning mb-4" role="alert">
-  This event has concluded. It can no longer be edited, and will be automatically deleted <span class="daysToDeletion"></span>.
+  This event has concluded. It can no longer be edited{{#if eventWillBeDeleted}}, and will be automatically deleted {{daysUntilDeletion}}{{/if}}.
 </div>
 {{/if}}
 {{#if firstLoad}}
@@ -523,7 +523,6 @@ window.eventData = {{{ json jsonData }}};
       $(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");
     }