jekyll-theme-conference 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e189dc4689ec1f3119a061eda65e6203f356ee024eb59cce5131898d01da42e
-  data.tar.gz: caae1d8393692f699d964922acba360c41bf3024337da6734f3517e1fe7270b3
+  metadata.gz: fb6885a7dd29e4d0448899ed9ceb3697e4c662bf8d5d7526111b75cd74701686
+  data.tar.gz: 619841748b22d87bcc3f9e93d5ddc193fed314f8a52abd27853f1e1d7c4ce3a1
 SHA512:
-  metadata.gz: 44650df79619a5af969f95a6fd13c6b55daf1d8c8879313303faf3574b3b6cd00fed8fb4ee41d7d8776bc0beca7ff761a2ceb32ac7097a89fcbe67e140f3b244
-  data.tar.gz: a67cc157d5a0073fda943ab2785e6879987c7636346576294a098f5b5f4652284c511e51a876c45fe7338ca61fe61777115e833cda7acd188bbf868f001639ef
+  metadata.gz: 87ed50dda511d8308a865682c62b91ab77050139543d39efdc4ff8958d698f9112be253d4a68c005e169215432baa1a8ef65075832ffa56a3408da5370aa5d3a
+  data.tar.gz: 492c12d703bcf061bee43117efcf04a197cc396349c77195c673191b670a4f5555975ef7352315d2c3f11f552d6b536c4f07a35c5b9c0d5178608f968786e98e

data/README.md

@@ -127,15 +127,15 @@ To install:
    bundle
    ```
 
-4. Add `remote_theme: "DigitaleGesellschaft/jekyll-theme-conference@4.0.1"` to your `_config.yml` file. Remove any other `theme:` or `remote_theme:` entry.
+4. Add `remote_theme: "DigitaleGesellschaft/jekyll-theme-conference@v4.0.1"` to your `_config.yml` file. Remove any other `theme:` or `remote_theme:` entry.
 
    ```yaml
-   remote_theme: "DigitaleGesellschaft/jekyll-theme-conference@4.0.1"
+   remote_theme: "DigitaleGesellschaft/jekyll-theme-conference@v4.0.2"
    ```
 
 5. Continue with the [_Setup_](#setup) section below to customize the theme and add content for your conference.
 
-To update the theme, change the version tag in the `remote_theme` value (e.g., `@4.0.0` to `@v4.1.0`).
+To update the theme, change the version tag in the `remote_theme` value (e.g., `@v4.0.0` to `@v4.1.0`).
 
 
 ## Setup
@@ -706,8 +706,10 @@ window.conference.awaitReady().then(async () => {
 Program settings are configured directly in the Front Matter of the program page (the page with `layout: program`). The program page's Front Matter supports the following properties:
 
 - `title`: The title shown on the program page (defaults to "Program")
-- `time_steps`: The time interval in minutes for each row in the schedule grid (default: `15`)
+- `time_steps`: The time interval in minutes for each row in the schedule grid or `start` to show only the intervals that correspond to a talk start time (default: `15`)
 - `show_alltimes`: Show time labels for all intervals, not just full hours (default: `false`)
+- `show_first_hour`: Always show hour in time label of first row (default: `false`)
+- `hide_legend`: Hide track legends at the bottom of program table (default: `false`)
 
 ```yaml
 ---

data/_includes/get_program_config.html

@@ -12,7 +12,11 @@
 {%- if program_page -%}
   {%- assign program_url = program_page.url -%}
   {%- if program_page.time_steps -%}
-    {%- assign program_time_steps = program_page.time_steps -%}
+    {%- if program_page.time_steps == "start" -%}
+      {%- assign program_time_steps = 1 -%}
+    {%- else -%}
+      {%- assign program_time_steps = program_page.time_steps -%}
+    {%- endif -%}
   {%- endif -%}
 {%- endif -%}
 

data/_includes/get_start_times.html

@@ -0,0 +1,12 @@
+{%- assign selected_day = site.data.program.days | where: "date", d.date | first -%}
+{%- assign start_times = "" | split: "," -%}
+
+{%- if selected_day -%}
+  {%- for room in selected_day.rooms -%}
+    {%- for talk in room.talks -%}
+      {%- unless start_times contains talk.time_start -%}
+        {%- assign start_times = start_times | push: talk.time_start -%}
+      {%- endunless -%}
+    {%- endfor -%}
+  {%- endfor -%}
+{%- endif -%}

data/_layouts/program.html

@@ -64,32 +64,55 @@
             {%- 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: page.time_steps -%}
-
-          {%- for i in (1..nbr_steps) -%}
-            {%- assign current_day = 0 -%}
-            {%- assign current_hour = i | minus: 1 | times: page.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: page.time_steps | plus: day_start_min | modulo: 60 -%}
-            {%- if current_min < 10 -%}
-              {%- assign current_time = current_hour | append: ':0' | append: current_min -%}
+          {%- unless page.time_steps == "start" -%}
+            {%- assign time_steps = page.time_steps | default: 15 -%}
+
+            {%- 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: time_steps -%}
+          {%- else -%}
+            {%- assign time_steps = 1 -%}
+            {%- include get_start_times.html -%}
+            {%- assign nbr_steps = start_times.size %}
+          {%- endunless -%}
+
+          {%- for step_idx in (1..nbr_steps) -%}
+
+            {%- unless page.time_steps == "start" -%}
+              {%- assign current_hour = step_idx | minus: 1 | times: time_steps | plus: day_start_min | divided_by: 60 | floor | plus: day_start_hour | modulo: 24 -%}
+              {%- assign current_min = step_idx | minus: 1 | times: time_steps | plus: day_start_min | modulo: 60 -%}
             {%- else -%}
-              {%- assign current_time = current_hour | append: ':' | append: current_min -%}
-            {%- endif -%}
+              {% assign start_time_idx = step_idx | minus: 1 %}
+              {% assign current_time = start_times[start_time_idx] %}
+
+              {% assign current_hour = current_time | split: ":" | first | plus: 0 %}
+              {% assign current_min = current_time | split: ":" | last | plus: 0 %}
+            {%- endunless -%}
 
             <tr class="h-100">
 
-              {%- if current_min == 0 -%}
+              {%- if current_min == 0 or page.time_steps == "start" -%}
                 <th scope="row" class="program-time text-end">
-                  {{- current_time -}}
+                  {%- if current_min < 10 -%}
+                    {{- current_hour | append: ':0' | append: current_min -}}
+                  {%- else -%}
+                    {{- current_hour | append: ':' | append: current_min -}}
+                  {%- endif -%}
                 </th>
               {%- elsif page.show_alltimes -%}
                 <th scope="row" class="program-time text-end text-muted fw-normal">
-                  :{{ current_min }}
+                  {%- if page.show_first_hour and step_idx == 1 -%}
+                    {%- if current_min < 10 -%}
+                      {{- current_hour | append: ':0' | append: current_min -}}
+                    {%- else -%}
+                      {{- current_hour | append: ':' | append: current_min -}}
+                    {%- endif -%}
+                  {%- else -%}
+                    {%- if current_min < 10 -%}
+                      {{- ':0' | append: current_min -}}
+                    {%- else -%}
+                      {{- ':' | append: current_min -}}
+                    {%- endif -%}
+                  {%- endif -%}
                 </th>
               {%- else -%}
                 <th scope="row"></th>
@@ -105,24 +128,26 @@
 
                   {%- include get_talk_time.html -%}
 
-                  {%- assign d_start_hour = current_day | minus: talk_start_day | times: 24 | plus: current_hour | minus: talk_start_hour -%}
+                  {%- assign d_start_hour = current_hour | minus: talk_start_hour -%}
                   {%- assign d_start_min = current_min | minus: talk_start_min -%}
-                  {%- assign d_end_hour = current_day | minus: talk_end_day | times: 24 | plus: current_hour | minus: talk_end_hour -%}
+                  {%- assign d_end_hour = current_hour | minus: talk_end_hour -%}
                   {%- assign d_end_min = current_min | minus: talk_end_min -%}
 
-                  {%- assign has_started = false -%}
-                  {%- if d_start_hour == 0 and d_start_min > 0 -%}
-                    {%- assign has_started = true -%}
+                  {%- if talk_start_hour > talk_end_hour -%}
+                    {%- if current_hour >= talk_start_hour -%}
+                      {%- assign d_end_hour = current_hour | minus: 24 | minus: talk_end_hour -%}
+                    {%- else -%}
+                      {%- assign d_start_hour = current_hour | plus: 24 | minus: talk_start_hour -%}
+                    {%- endif -%}
                   {%- endif -%}
-                  {%- if d_start_hour > 0 -%}
+
+                  {%- assign has_started = false -%}
+                  {%- if d_start_hour > 0 or d_start_hour == 0 and d_start_min >= 0 -%}
                     {%- assign has_started = true -%}
                   {%- endif -%}
 
                   {%- assign has_ended = false -%}
-                  {%- if d_end_hour == 0 and d_end_min >= 0 -%}
-                    {%- assign has_ended = true -%}
-                  {%- endif -%}
-                  {%- if d_end_hour > 0 -%}
+                  {%- if d_end_hour > 0 or d_end_hour == 0 and d_end_min >= 0 -%}
                     {%- assign has_ended = true -%}
                   {%- endif -%}
 
@@ -132,7 +157,24 @@
 
                   {%- if d_start_hour == 0 and d_start_min == 0 -%}
 
-                    {%- assign talk_nbr_steps = talk_duration_min | divided_by: page.time_steps -%}
+                    {%- unless page.time_steps == "start" -%}
+                      {%- assign talk_nbr_steps = talk_duration_min | divided_by: time_steps -%}
+                    {%- else -%}
+                      {%- assign talk_nbr_steps = 0 -%}
+                      {%- for start_time in start_times -%}
+                        {%- assign start_hour = start_time | split: ":" | first | plus: 0 -%}
+                        {%- assign start_min = start_time | split: ":" | last | plus: 0 -%}
+                        {%- assign d_start_hour = start_hour | minus: talk_start_hour -%}
+                        {%- if talk_start_hour > talk_end_hour and start_hour < talk_start_hour -%}
+                          {%- assign d_start_hour = d_start_hour | plus: 24 -%}
+                        {%- endif -%}
+                        {%- assign start_ts = d_start_hour | times: 60 | plus: start_min | minus: talk_start_min -%}
+                        {%- if start_ts >= 0 and start_ts < talk_duration_min -%}
+                          {%- assign talk_nbr_steps = talk_nbr_steps | plus: 1 -%}
+                        {%- endif -%}
+                      {%- endfor -%}
+                    {%- endunless -%}
+
                     {%- include get_track_properties.html -%}
                     <td rowspan="{{ talk_nbr_steps }}" class="program-talk p-0 h-100">
                       <div class="h-100 p-2 bg-{{ track_color }}-subtle text-{{ track_color }}-emphasis border-4 border-start border-{{ track_color }}-subtle shadow-sm overflow-hidden">
@@ -181,12 +223,14 @@
   {%- endif -%}
 
   {%- if site.conference.talks.tracks %}
-    <h5 class="mt-4">{{ site.data.lang[site.conference.lang].program.legend | default: "Caption" }}</h5>
+    {%- unless page.hide_legend -%}
+      <h5 class="mt-4">{{ site.data.lang[site.conference.lang].program.legend | default: "Caption" }}</h5>
       {%- for track_prop in site.conference.talks.tracks %}
         <div class="d-block d-sm-inline-block m-1 p-1 ps-2 pe-2 bg-{{ track_prop.color | default: 'light' }}-subtle text-{{ track_prop.color | default: 'light' }}-emphasis border-start border-4 border-{{ track_prop.color | default: 'light' }}-subtle fw-normal">
           {{- track_prop.name -}}
         </div>
       {%- endfor -%}
+    {%- endunless -%}
   {%- endif -%}
 
 {% include footer.html %}

data/_sass/theme.scss

@@ -20,16 +20,19 @@
 
     width: 4rem;
     min-width: 4rem;
+    max-width: 4rem;
   }
 
   .program-talk {
     width: 15rem;
     min-width: 15rem;
+    max-width: 15rem;
   }
 
   .program-space {
     width: 1rem;
     min-width: 1rem;
+    max-width: 1rem;
   }
 }