Skip to content

Commit

Permalink
Merge pull request #35 from thefirstspine/next
Browse files Browse the repository at this point in the history
Release 1.17.0
  • Loading branch information
thefirstspine authored Nov 10, 2020
2 parents 411ceec + 6891563 commit 3dc16a7
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 0 deletions.
Binary file added assets/images/event-scheduled-loot-header.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions views/elements/event-online-scheduled-loot.ejs
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<div class="card <%= event.datetimeFrom < Date.now() && event.datetimeTo > Date.now() ? 'active' : 'inactive' %>">
<div class="card-image">
<figure class="image is-3by1">
<img src="/images/event-scheduled-loot-header.png" />
</figure>
</div>
<div class="card-content">
<div class="media">
<div class="media-content">
<p class="title is-4"><%= event.title %></p>
<p class="subtitle is-7">
<i class="fas fa-wifi"></i> <%= __('events.online') %>
</p>
</div>
</div>
<div class="content">
<%- event.text %>
</div>
<div class="card-footer">
<p class="card-footer-item">
<date timestamp="<%= event.datetimeFrom %>"></date>
&nbsp;-&nbsp;
<date timestamp="<%= event.datetimeTo %>"></date>
</p>
</div>
</div>
</div>
1 change: 1 addition & 0 deletions views/pages/events.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
'online:corsairs': 'event-online-corsairs.ejs',
'online:tournament': 'event-online-tournament.ejs',
'online:tricks-celebration': 'event-online-tricks-celebration.ejs',
'online:scheduled-loot': 'event-online-scheduled-loot.ejs',
'offline:festival': 'event-offline-festival.ejs',
}[events[j].type],
{
Expand Down

0 comments on commit 3dc16a7

Please sign in to comment.