jekyll-theme-conference 3.1.3 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 290ef7543f9a8ab54959840f192c5329dda0be8a89e9e0f48be7d47a65f14acb
-  data.tar.gz: 5f027d3e781262a69078285efff4d1165b3fdb4a302354e528514aaeb6000c0b
+  metadata.gz: 32623dfa5fc548002ea9f1e8dac8b1e4c5833d33e6619bce8f77ea54c8080dc6
+  data.tar.gz: 565f13adc6ec08fab3a2240a8ef1adf0562454f1a4d9c58585c173d9ca583ecd
 SHA512:
-  metadata.gz: 75858c8629307dc5c1490564540ff312de55f009abf8e5cb1c1f6868a7082ac93b4b1119e0dd70e8f447c956eb5b3d7787497cc1872cd6445740728cb205367f
-  data.tar.gz: 5a91a0c9f85612576f0e55c190ee5d74f7e4f93383dca5b851103de68ebf1d0457cfd826935ffde33160c73093f96838e1e6026aa34e6707e824597693a1b4e7
+  metadata.gz: bb1d8eae3fd5e858a24977bc77aafeebe6cdca657d4d0222afbcd40e0c4fe0011b13cacba8217cd32a68b7d6fd5fbda2756829f80bc44c601ad71aa79cc4ae36
+  data.tar.gz: fc2f250efcff400fbc2a96243d9f63f7659a1b071eae24391c1e6820f4cf03a63db4d43b119e0e38861423d48ab511c57dd184296d67d822756450ce4164c4c3

data/README.md

@@ -35,6 +35,7 @@ The theme was originally created for the yearly Winterkongress conference of the
   * [Main Landing Page](#main-landing-page)
   * [Information Boxes](#information-boxes)
   * [Live Indications & Streaming](#live-indications---streaming)
+  * [Map](#map)
   * [Talk Settings](#talk-settings)
   * [Speaker Settings](#speaker-settings)
   * [Location Settings](#location-settings)
@@ -50,6 +51,7 @@ The theme was originally created for the yearly Winterkongress conference of the
   * [Live Stream Overview](#live-stream-overview)
   * [Additional Pages](#additional-pages)
 - [Design](#design)
+- [Development](#development)
 - [License](#license)
 
 
@@ -137,9 +139,9 @@ In order to be up and running simply use the default content of this repository
 
 ### Automatic Import
 
-There exists a Python file in this repository, `_tools/create_entries.py`, which can be used to import content from a [frab](https://github.com/frab/frab/wiki/Manual#introduction) compatible JSON file (e.g. from [pretalx.com](https://pretalx.com/p/about/)) or a CSV table and generate the different talk, speakers and room files automatically. It has as only dependency [PyYAML](https://pypi.org/project/PyYAML/):
+There exists a Python file in this repository, `_tools/create_entries.py`, which can be used to import content from a [frab](https://github.com/frab/frab/wiki/Manual#introduction) compatible JSON file (e.g. from [pretalx.com](https://pretalx.com/p/about/)) or a CSV table and generate the different talk, speakers and room files automatically.
 
-1. Copy the file `_tools/create_entries.py` from this repository
+1. Copy the files `_tools/create_entries.py` and `_tools/requirements.txt` from this repository
 
 2. Create a virtual environment and activate it
 
@@ -148,10 +150,10 @@ There exists a Python file in this repository, `_tools/create_entries.py`, which
    source venv/bin/activate
    ```
 
-3. Install PyYAML
+3. Install the requirements
 
    ```bash
-   pip install pyyaml
+   pip install -r _tools/requirements.txt
    ```
 
 4. Execute the script, e.g. to show the help type
@@ -377,6 +379,21 @@ conference:
     demo: false
 ```
 
+### Map
+
+In order to help users finding your venue, an [OpenStreetMap](https://www.openstreetmap.org/) container displaying a map can be shown on any page. The map's initial position is globally defined and thus the same for all map containers. You can define the initial position of the map by setting the default zoom level `default_zoom`, the center coordinates `home_coord`, and the map provider for the tiles `map_provider`. Alternative map providers can be found [here](https://leaflet-extras.github.io/leaflet-providers/preview/).
+The map contains small control buttons to zoom in and out, center the map back to the initial position, and show the visitors current location (has to be manually activated and granted by the visitor).
+
+The map can be added to any page by setting `map: true` in its Front Matter or on the location main page by setting `conference.location.map: true` (see _Location Settings_ section below).
+
+```yaml
+conference:
+  map:
+    default_zoom: 17
+    home_coord: 47.37808, 8.53935
+    map_provider: "OpenStreetMap.Mapnik"
+```
+
 ### Talk Settings
 
 Each talk can have one or multiple categories associated via FrontMatter (see the _Individual Pages: Talks_ section below for more details). Some of these categories can be elevated to so called main categories". These are used to color group the talks across the entire website, particularly in the program. In order to do so add the `main_categories` property under the `talks` property. It consists of a list of all main categories. Each main category consists of:
@@ -429,8 +446,9 @@ In order to hide all rooms add the `hide: true` setting (default: `false`) to th
 
 If your `location` overview file is not located under `/location` you can indicate an alternative path by setting the `url` property (default: `/location`) under the `location` property.
 
-The `location` layout automatically includes an [OpenStreetMap](https://www.openstreetmap.org/) container to point to your venue. If you want to hide it add the `enable: false` setting (default: `true`) to the `map` property under the `location` property. Otherwise, you can define the initial position of the map by setting the default zoom level `default_zoom`, the center coordinates `home_coord`, and the map provider for the tiles `map_provider`. Alternative map providers can be found [here](https://leaflet-extras.github.io/leaflet-providers/preview/).
-The map contains small control buttons to zoom in and out, center the map back to the initial position, and show the visitors current location (has to be manually activated and granted by the visitor).
+The location main page shows a navigation bar listing all the different rooms by name. Due to the quirks of Jekyll, the main page itself cannot be listed by title as defined in its Front Matter. Instead the title of the main landing page for the navigation bar is taken from the language files and defaults to "Directions". In order to change this, you can either change the language files directly (see the _Language_ section above), or you provide an alternative title by setting the `navbar_title` to the desired title under the `location` property.
+
+The `location` layout can include a map to point to your venue by adding the `map: true` setting (default: `true`) to the `location` property. See the _Map_ section above for more information.
 
 Example:
 
@@ -438,11 +456,9 @@ Example:
 conference:
   location:
     hide: false
-    map:
-      enable: true
-      default_zoom: 17
-      home_coord: 47.37808, 8.53935
-      map_provider: "OpenStreetMap.Mapnik"
+    url: '/location'
+    navbar_title: 'Location'
+    map: true
 ```
 
 The map is based on the JavaScript Library [Leaflet](https://leafletjs.com/) and can be customized by editing the `assets/js/main.js` file, e.g. adding additional layers with markers, text, or shapes to the map. To start, copy simply the file from this repository and make use of the initialized global variable `window.conference.map` pointing to the Leaflet container.
@@ -514,7 +530,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 +579,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
@@ -602,6 +620,29 @@ Example:
       video: https://media.ccc.de/
 ```
 
+There exists a Python file in this repository, `_tools/import_resources.py`, which can be used to import resources such as slides and other documents from [pretalx.com](https://pretalx.com/p/about/)) via its API. It automatically downloads all files, stores them and updates the links of the talks concerned.
+
+1. Copy the files `_tools/import_resources.py` and `_tools/requirements.txt` from this repository
+
+2. Create a virtual environment and activate it
+
+   ```bash
+   python -m venv venv
+   source venv/bin/activate
+   ```
+
+3. Install the requirements
+
+   ```bash
+   pip install -r _tools/requirements.txt
+   ```
+
+4. Execute the script, e.g. to show the help type
+
+   ```bash
+   python _tools/import_resources.py --help
+   ```
+
 
 ## Overview Pages
 
@@ -621,7 +662,7 @@ If you choose a different location for the overview pages you must:
 
 ### Location / Room Overview
 
-The `location` layout contains a map container (if not disabled, see section _Location Settings_ above) which can be customized. See the section above for further details.
+The `location` layout can include a map container (if not disabled, see the _Location Settings_ section above) which can be customized (see the _Map_ section above).
 
 ### Live Stream Overview
 
@@ -631,6 +672,7 @@ The `stream-overview` layout contains all active streams on a single page (see t
 
 Additional static pages can easily be added as files and linked to via navigation bar or main landing page (see above on how to).
 
+Each of these pages can include a map at its end (e.g. to point to your venue) by adding the `map: true` setting to its Front Matter. See the _Map_ section above for more information.
 
 ## Design
 

data/_includes/js/conference-map.js

@@ -2,9 +2,9 @@ window.conference.mapConfig = (function() {
 
     let map;
 
-    let mapProvider = "{{ site.conference.location.map.map_provider | default: 'OpenStreetMap.Mapnik' }}";
-    let homeCoord = [{{ site.conference.location.map.home_coord }}];
-    let zoomLevel = {{ site.conference.location.map.default_zoom | default: 17 }};
+    let mapProvider = "{{ site.conference.map.map_provider | default: 'OpenStreetMap.Mapnik' }}";
+    let homeCoord = [{{ site.conference.map.home_coord }}];
+    let zoomLevel = {{ site.conference.map.default_zoom | default: 17 }};
 
     let setup = function (elId) {
         map = L.map(elId).setView(homeCoord, zoomLevel);

data/_includes/js/conference.js

@@ -13,7 +13,8 @@ window.conference = {};
 {% include js/conference-program.js %}
 
 // Leaflet (Map Display)
-{% if site.conference.location.hide != true and site.conference.location.map.enable %}
+{% include partials/get_enable_map.html %}
+{% if enable_map %}
     {% include js/leaflet.js %}
     {% include js/leaflet-easybutton.js %}
     {% include js/leaflet-locatecontrol.js %}

data/_includes/partials/checks.html

@@ -4,7 +4,7 @@
   {%- unless site.conference.lang == "en" -%}
     {%- assign errors = errors | push : "The internationalization file containing different strings for this template seems to be missing. Have you copied the `_data/lang.yml` file from the [theme's repository](https://github.com/DigitaleGesellschaft/jekyll-theme-conference/blob/master/_data/lang.yml) to you local website folder?" -%}
   {%- endunless -%}
-{%- elsif site.data.lang.version < 4 -%}
+{%- elsif site.data.lang.version != 6 -%}
   {%- assign errors = errors | push : "The internationalization file in `_data/lang.yml` seems to be outdated and does not correspond to the current version of the theme. Grab the current version from the [theme's repository](https://github.com/DigitaleGesellschaft/jekyll-theme-conference/blob/master/_data/lang.yml)." -%}
 {%- endunless -%}
 {%- unless site.conference.lang == "en" or site.conference.lang == "de" or site.conference.lang == "fr" or site.conference.lang == "pt" -%}

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_enable_map.html

@@ -0,0 +1,11 @@
+{%- if site.conference.location.map -%}
+  {%- assign enable_map = true -%}
+{%- else -%}
+  {%- assign enable_map = false -%}
+  {%- for page in site.pages -%}
+    {%- if page.map -%}
+      {%- assign enable_map = true -%}
+      {%- break -%}
+    {%- endif -%}
+  {%- endfor -%}
+{%- 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/_includes/partials/modal_live.html

@@ -12,7 +12,7 @@
       </div>
 
       <div class="modal-body embed-responsive embed-responsive-16by9">
-        <iframe class="embed-responsive-item" src="" allowfullscreen></iframe>
+        <iframe class="embed-responsive-item" src="" frameborder="none" allowfullscreen="allowfullscreen" seamless="seamless" scrolling="no"></iframe>
         <div id="stream-placeholder" class="embed-responsive-item d-none justify-content-center align-items-center">
           <div></div>
         </div>

data/_includes/partials/navbar_rooms.html

@@ -1,7 +1,11 @@
 <ul class="nav nav-pills d-print-none mb-3">
   <li class="nav-item">
     <a class="nav-link {% if page.name contains 'index' %}active{% endif %}" href="{{ site.conference.location.url | prepend: site.baseurl }}">
-      {{ site.data.lang[site.conference.lang].location.directions | default: "Directions" }}
+      {% if site.conference.location.navbar_title -%}
+        {{- site.conference.location.navbar_title -}}
+      {%- else -%}
+        {{- site.data.lang[site.conference.lang].location.directions | default: "Directions" -}}
+      {%- endif %}
     </a>
   </li>
   {%- for room in site.rooms -%}

data/_layouts/location.html

@@ -18,7 +18,7 @@
 
   {{ content }}
 
-  {% if site.conference.location.map.enable %}
+  {% if site.conference.location.map %}
     <div id="map" class="mt-4 mb-3"></div>
   {% endif %}
 

data/_layouts/page.html

@@ -6,4 +6,8 @@
 
 {{ content }}
 
+{% if page.map %}
+  <div id="map" class="mt-4 mb-3"></div>
+{% endif %}
+
 {% include partials/footer.html %}

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.3
+  version: 3.3.0
 platform: ruby
 authors:
 - Lorenz Schmid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-16 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.32
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.32
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +78,7 @@ files:
 - _includes/partials/footer.html
 - _includes/partials/get_day_hash.html
 - _includes/partials/get_day_time.html
+- _includes/partials/get_enable_map.html
 - _includes/partials/get_link.html
 - _includes/partials/get_link_types.html
 - _includes/partials/get_live_timestamps.html
@@ -279,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Jekyll template for a conference website containing program, speaker, talks