diff --git a/_includes/event.html b/_includes/event.html index b836f51..272b6dc 100644 --- a/_includes/event.html +++ b/_includes/event.html @@ -1,11 +1,4 @@ -

{{ event.date | date: "%A %d %B %Y, %H:%M %Z" }}

- +

{{ event.date | date: "%A %d %B %Y, %H:%M %Z" }}

{% if event.intro %}

{{ event.intro }}

{% endif %} @@ -13,7 +6,7 @@ {% for game in event.games %} {% assign time = game.time | split: ":"%} {% if game.time %} -
  • {{ game.time }}UTC {{ game.title }}{%if game.tournament %} Tournament{% endif %}
    • +
  • {{ game.time }}UTC {{ game.title }}{%if game.tournament %} Tournament{% endif %}
    • {% else %}
  • {{ game.title }}{%if game.tournament %} Tournament{% endif %}
    • {% endif %} diff --git a/_layouts/default.html b/_layouts/default.html index 4017ebd..fc29842 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -6,6 +6,7 @@ + {% include nav.html %} diff --git a/assets/js/localtime.js b/assets/js/localtime.js new file mode 100644 index 0000000..fb84e23 --- /dev/null +++ b/assets/js/localtime.js @@ -0,0 +1,70 @@ +function parseEventTimes() { + const dateformatter = Intl.DateTimeFormat( + "en-CA", + { + hour: '2-digit', + minute: '2-digit', + timeZoneName: 'short', + hour12: false + }); + + const eventtimes = document.getElementsByClassName("eventtime"); + for(eventtime of eventtimes) { + const eventdate = eventtime.getAttribute("data-event-date") + if(eventdate) { + let parts = eventdate.split("-"); + if(parts.length !== 3) + continue; + + const year = parseInt(parts[0], 10); + const month = parseInt(parts[1], 10); + const day = parseInt(parts[2], 10); + + parts = eventtime.innerText.split("UTC"); + if(parts.length < 2) + continue; + + parts = parts[0].split(":") + if(parts.length !== 2) + continue; + + const hour = parseInt(parts[0], 10); + const minute = parseInt(parts[1], 10); + + let date = Date.UTC(year, month, day, hour, minute); + date = new Date(date); + date = dateformatter.format(date); + eventtime.innerHTML += " (" + date + ")"; + } + } +} + +function parseEventDates() { + const dateformatter = Intl.DateTimeFormat( + "en-CA", + { + weekday: 'short', + hour: '2-digit', + minute: '2-digit', + timeZoneName: 'short', + hour12: false + }); + + const eventdates = document.getElementsByClassName("eventdate"); + for(eventdate of eventdates) { + const date_attribute = eventdate.getAttribute("data-event-datetime") + if(date_attribute) { + let date = Date.parse(date_attribute.replace("UTC", "Z")) + if(isNaN(date)) + continue; + + date = new Date(date); + date = dateformatter.format(date); + eventdate.innerHTML += " (" + date + ")"; + } + }} + +document.addEventListener("DOMContentLoaded", (event) => { + parseEventTimes(); + parseEventDates(); +}); diff --git a/index.html b/index.html index afb7f17..dffe50e 100644 --- a/index.html +++ b/index.html @@ -18,8 +18,7 @@ nav_pill: home {% assign sitetime = site.time | date: "%FT%T" %} {% assign upcoming = site.data.events | where_exp: "item", "item.date >= sitetime" | last %} {% if upcoming %} -

    {{ upcoming.date | date: "%A %e %B %Y, %R" }} UTC

    - +

    {{ upcoming.date | date: "%A %e %B %Y, %R" }} UTC

    See schedule for more information.

    {% else %}

    No next event has been scheduled yet.

    diff --git a/tournament.html b/tournament.html index 99f2e25..ee0ef8c 100644 --- a/tournament.html +++ b/tournament.html @@ -7,36 +7,17 @@ nav_pill: tournament {% assign nextevent = site.data.events | where_exp: "item", "item.date >= sitetime" | last %} {% assign tournaments = nextevent.games | where_exp: "item", "item.tournament" %} {% if tournaments and tournaments.size != 0 %} - -

    There will be a tournament for the next event on {{ nextevent.date | date: "%a, %b %d, %Y" }}

    +

    There will be a tournament for the next event on {{ nextevent.date | date: "%a, %b %e, %Y" }}

    -

    Ranking

    -
      -

      Rounds

      -
      - - {% else %}

      No tournaments have been planned for the next event.

      {% endif %}