jekyll-theme-conference 3.1.5 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12604ff3f3225749dc4902e16e24fbe2eb353e16269c9c86310728ada7472482
-  data.tar.gz: 3f9e820a5168e3770e787fe918472799b6735d39374ccdbc1d5ea04b3a0ce5f4
+  metadata.gz: d4f5a6058ed0096854e4b7d4714298ea9bc253a394b8170d3ae2d280bec3913e
+  data.tar.gz: 5ed07180716fc59636f3b5a9634fd7d430166796285566751a927ce9f15be913
 SHA512:
-  metadata.gz: 14222eeccadb40c84523555421c6eed16d8d99efeb12d87fca7a39706dcfed1944330bee9964d47ccc383de3440fd7330c0feb04fd379125569d31a2f7262b0e
-  data.tar.gz: bfa841aba818f649fcd58d46846e2e7f1e0365ec3f2e8f340ba4a76c1ba677c4722c695b232f0b2b4be22773cc04da63e98af35e9b25a995b75bc6abf29faecb
+  metadata.gz: '08f8a0a6c90e0c23ee563b18200cbbd902385d388373c5b77ad05c6fda440914825b685771907947f7f2165378e2edd13ef7421d75133bf3e6d38f3ea6c75d8b'
+  data.tar.gz: 7095bab0d1cd826c3f1921d203ff67ae51f69c0d218196a0e45530cc227d2c3bab3e3b10529ffa27e840980fef9f9e6ed7cc5c6c3aa111a43ba2d7363bd54ddc

data/README.md

@@ -514,7 +514,7 @@ The order of the rooms in the list defines the order of the rooms as shown in th
 Each talk consists of
 
 - a `name` (must correspond to one of the talk identifier),
-- a starting time `time_start` given as `H:M` ([`strftime`](http://www.strfti.me) formated), and
+- a starting time `time_start` given as `H:M` ([`strftime`](http://www.strfti.me) formated) or `H:M +∆` whereby ∆ is the day offset in relation to the date given for the given day, and
 - an end time `time_end`.
 
 The list of talks should (manually) be ordered by time, i.e. the first occurring talk should be listed first.
@@ -563,6 +563,8 @@ Each speaker is represented by a file in the `_speakers/` directory. It must beg
 - optionally a list of `links` (see the _Links_ subsection below for the available properties per link; links with icons are treated separately), and
 - optionally `hide: true` if the speaker's page should not be linked to.
 
+If the speaker's name consists only out of one word, populate the `last_name` property and leave the `first_name` property empty. The last name is generally used for sorting the speakers.
+
 ### Rooms
 
 Each room is represented by a file in the `_rooms/` directory. It must begin with valid [YAML Front Matter](https://jekyllrb.com/docs/frontmatter/) containing

data/_includes/partials/get_day_time.html

@@ -2,8 +2,9 @@
   {%- assign t = r.talks | first -%}
   {%- include partials/get_talk_time.html -%}
 
-  {%- if forloop.index == 1 or talk_start_hour < day_start_hour or talk_start_hour == day_start_hour and talk_start_min < day_start_min-%}
+  {%- if forloop.index == 1 or talk_start_day < day_start_day or talk_start_day == day_start_day and talk_start_hour < day_start_hour or talk_start_hour == day_start_hour and talk_start_min < day_start_min-%}
     {%- assign day_start_talk = t -%}
+    {%- assign day_start_day = talk_start_day -%}
     {%- assign day_start_hour = talk_start_hour -%}
     {%- assign day_start_min = talk_start_min -%}
   {%- endif -%}
@@ -11,8 +12,9 @@
   {%- assign t = r.talks | last -%}
   {%- include partials/get_talk_time.html -%}
 
-  {%- if forloop.index == 1 or talk_end_hour > day_end_hour or talk_end_hour == day_end_hour and talk_end_min > day_end_min-%}
+  {%- if forloop.index == 1 or talk_end_day > day_end_day or talk_end_day == day_end_day and talk_end_hour > day_end_hour or talk_end_hour == day_end_hour and talk_end_min > day_end_min-%}
     {%- assign day_end_talk = t -%}
+    {%- assign day_end_day = talk_end_day -%}
     {%- assign day_end_hour = talk_end_hour -%}
     {%- assign day_end_min = talk_end_min -%}
   {%- endif -%}

data/_includes/partials/get_talk_time.html

@@ -1,9 +1,24 @@
 {%- assign talk_start = t.time_start -%}
 {%- assign talk_end = t.time_end -%}
 
-{%- assign talk_start_hour = talk_start | split: ':' | first -%}
+{%- if talk_start contains ' +' -%}
+  {%- assign talk_start_day = talk_start | split: ' +' | last | plus: 0 -%}
+  {%- assign talk_start = talk_start | split: ' +' | first -%}
+{%- else -%}
+  {%- assign talk_start_day = 0 -%}
+{%- endif -%}
+{%- if talk_end contains ' +' -%}
+  {%- assign talk_end_day = talk_end | split: ' +' | last | plus: 0 -%}
+  {%- assign talk_end = talk_end | split: ' +' | first -%}
+{%- else -%}
+  {%- assign talk_end_day = 0 -%}
+{%- endif -%}
+
+{%- assign talk_start_hour = talk_start | split: ':' | first | plus: 0 -%}
 {%- assign talk_start_min = talk_start | split: ':' | last | divided_by: site.conference.program.time_steps | floor | times: site.conference.program.time_steps -%}
-{%- assign talk_end_hour = talk_end | split: ':' | first -%}
+{%- assign talk_end_hour = talk_end | split: ':' | first | plus: 0 -%}
 {%- assign talk_end_min = talk_end | split: ':' | last | divided_by: site.conference.program.time_steps | ceil | times: site.conference.program.time_steps -%}
 
-{%- assign talk_duration_min = talk_end_hour | minus: talk_start_hour | times: 60 | minus: talk_start_min | plus: talk_end_min -%}
+{%- assign talk_start_hour_24h = talk_start_day | times: 24 | plus: talk_start_hour -%}
+{%- assign talk_end_hour_24h = talk_end_day | times: 24 | plus: talk_end_hour -%}
+{%- assign talk_duration_min = talk_end_hour_24h | minus: talk_start_hour_24h | times: 60 | minus: talk_start_min | plus: talk_end_min -%}

data/_includes/partials/get_talk_timestamp.html

@@ -1,4 +1,9 @@
-{%- assign datetime_start = d.date | append: " " | append: t.time_start -%}
-{%- assign timestamp_start = datetime_start | date: "%s" -%}
-{%- assign datetime_end = d.date | append: " " | append: t.time_end -%}
-{%- assign timestamp_end = datetime_end | date: "%s" -%}
+{%- include partials/get_talk_time.html -%}
+
+{%- assign datetime_start = d.date | append: " " | append: time_start -%}
+{%- assign add_days_start = talk_start_day | times: 24 | times: 60 | times: 60 -%}
+{%- assign timestamp_start = datetime_start | date: "%s" | plus: add_days_start | date: "%s" -%}
+
+{%- assign datetime_end = d.date | append: " " | append: time_end -%}
+{%- assign add_days_end = talk_end_day | times: 24 | times: 60 | times: 60 -%}
+{%- assign timestamp_end = datetime_end | date: "%s" | plus: add_days_end | date: "%s" -%}

data/_layouts/program.html

@@ -61,6 +61,10 @@
         <tbody>
           {%- include partials/get_day_time.html -%}
 
+          {%- if day_end_day > day_start_day -%}
+            {%- assign day_end_hour = day_end_day | minus: day_start_day | times: 24 | plus: day_end_hour -%}
+          {%- endif -%}
+
           {%- assign day_duration_min = day_end_hour | minus: day_start_hour | times: 60 | minus: day_start_min | plus: day_end_min -%}
           {%- assign nbr_steps = day_duration_min | divided_by: site.conference.program.time_steps -%}
 
@@ -74,7 +78,12 @@
           {%- assign z-index-max = 999 -%}
 
           {%- for i in (1..nbr_steps) -%}
-            {%- assign current_hour = i | minus: 1 | times: site.conference.program.time_steps | plus: day_start_min | divided_by: 60 | floor | plus: day_start_hour | modulo: 24 -%}
+            {%- assign current_day = 0 -%}
+            {%- assign current_hour = i | minus: 1 | times: site.conference.program.time_steps | plus: day_start_min | divided_by: 60 | floor | plus: day_start_hour -%}
+            {%- if current_hour >= 24 -%}
+              {%- assign current_day = current_hour | divided_by: 24 | floor -%}
+              {%- assign current_hour = current_hour | modulo: 24 -%}
+            {%- endif -%}
             {%- assign current_min = i | minus: 1 | times: site.conference.program.time_steps | plus: day_start_min | modulo: 60 -%}
             {%- if current_min < 10 -%}
               {%- assign current_time = current_hour | append: ':0' | append: current_min -%}
@@ -106,9 +115,9 @@
 
                   {%- include partials/get_talk_time.html -%}
 
-                  {%- assign d_start_hour = current_hour | minus: talk_start_hour -%}
+                  {%- assign d_start_hour = current_day | minus: talk_start_day | times: 24 | plus: current_hour | minus: talk_start_hour -%}
                   {%- assign d_start_min = current_min | minus: talk_start_min -%}
-                  {%- assign d_end_hour = current_hour | minus: talk_end_hour -%}
+                  {%- assign d_end_hour = current_day | minus: talk_end_day | times: 24 | plus: current_hour | minus: talk_end_hour -%}
                   {%- assign d_end_min = current_min | minus: talk_end_min -%}
 
                   {%- assign has_started = false -%}
@@ -127,7 +136,7 @@
                     {%- assign has_ended = true -%}
                   {%- endif -%}
 
-                  {%- if has_started and has_ended == false -%}
+                  {%- if has_started == true and has_ended == false -%}
                     {%- assign active_talk = true -%}
                   {%- endif -%}
 
@@ -156,7 +165,7 @@
 
                 {%- endfor %}
 
-                {%- unless active_talk %}
+                {%- unless active_talk == true %}
                   <td class="p-0"></td>
                 {%- endunless -%}
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-conference
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.2.0
 platform: ruby
 authors:
 - Lorenz Schmid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll