jekyll-theme-conference 3.6.0 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0da457627a261ffda7837260a6b66294a383971e653ea3e3f05299cb8f672f8f
-  data.tar.gz: b02dc7da45e1e76386635952414d57c0c22727fa6e4c6e0968e5e55db58266d3
+  metadata.gz: 3a8a764ea9cd83ec595e33843bfc153ed9771d50fc7913b27be142c48ec911ad
+  data.tar.gz: ed274c9834c5a2f832300d78260ddbd740471f59d53767ba34667fd4a7f2b762
 SHA512:
-  metadata.gz: 23c9ce1a8794dc7f25d5973c3ce70fd1c3dbb599ffc73c5a5e9fe4135a001e4ca173671d2433f66b15dd0bdc517fee1637a52325a2f233107d0590b1f554563e
-  data.tar.gz: ab334e1c2cd367f9ff3eebbc4d00760fc19a0ea0a1a7ea20df8d3bcc8ed0740a73464bb4b29db87452c780c4ade88b094766cff5377166a0249272105c5f50ee
+  metadata.gz: 73c23afdd2af6befe4d2986ba6c8d00f6c10173a5e6ed65da2440480b8664cbfb9986457d120dc91e6386fec3f41fac4ff548d634b2f3f54186cf90385894680
+  data.tar.gz: dddb4b961103052da89c38d721411a9e853ee317ebf0c5c30bc163f307e6bfac1e1b2b65a2f966b5c349ffce42805f3ff44251930f5b8002abb1632b8ba8e482

data/README.md

@@ -110,7 +110,7 @@ To install:
    bundle
    ```
 
-4. Add `remote_theme: "DigitaleGesellschaft/jekyll-theme-conference@2.0.0"` to your `_config.yml` file. Remove any other `theme:` or `remote_theme:` entry.
+4. Add `remote_theme: "DigitaleGesellschaft/jekyll-theme-conference@v3.6.1"` to your `_config.yml` file. Remove any other `theme:` or `remote_theme:` entry.
 
 5. Continue with the _Setup_ section further below to customize the theme and add some content for your conference
 
@@ -493,9 +493,14 @@ conference:
     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.
+The map is based on the [Leaflet](https://leafletjs.com/) JavaScript library. The map object can be customized by adding additional layers with markers, text, or shapes. To do so, one has to edit the main JavaScript file, `assets/js/main.js`:
 
-Example:
+1. Import the JavaScript library of the theme (via Jekyll `include` command)
+2. Await the initialization of the theme's object
+3. Fetch the map object and verify it is set (while the JavaScript code is imported and executed on each page, the map object will only exist on the location site)
+4. Modify the map.
+
+Following an example is given adding a simple marker to the map:
 
 ```javascript
 ---
@@ -503,8 +508,8 @@ Example:
 
 {% include js/conference.js %}
 
-(() => {
-    const map = window.conference.map;
+window.conference.awaitReady().then(() => {
+    const map = window.conference.map.getMap();
 
     if (typeof map !== 'undefined') {
         let main_station = L.marker([47.37785, 8.54035], {
@@ -515,7 +520,7 @@ Example:
             })
         }).addTo(map);
     }
-})();
+});
 
 ```
 

data/_includes/js/conference.js

@@ -11,6 +11,19 @@
 window.conference = {
     config: {
         baseurl: '{{ site.baseurl }}'
+    },
+
+    ready: false,
+    awaitReady: () => {
+        const poll = (resolve) => {
+            if(window.conference.ready === true) {
+                resolve();
+            }
+            else {
+                setTimeout(() => poll(resolve), 500);
+            }
+        }
+        return new Promise(poll);
     }
 };
 
@@ -22,12 +35,12 @@ window.conference = {
 // Leaflet (Map Display)
 {% include partials/get_enable_map.html %}
 {% if enable_map %}
-    {% include js/lib/leaflet.js %}
-    {% include js/lib/leaflet-easybutton.js %}
-    {% include js/lib/leaflet-locatecontrol.js %}
-    {% include js/lib/leaflet-providers.js %}
+    {%- include js/lib/leaflet.js %}
+    {%- include js/lib/leaflet-easybutton.js %}
+    {%- include js/lib/leaflet-locatecontrol.js %}
+    {%- include js/lib/leaflet-providers.js %}
 
-    {% include js/map.js %}
+    {%- include js/map.js %}
 {% endif %}
 
 // Modals ("Popups")
@@ -35,7 +48,7 @@ window.conference = {
 
 // Live and Streaming
 {% if site.conference.live %}
-    {% include js/live.js %}
+    {%- include js/live.js %}
 {% endif %}
 
 // Load configuration and start initialization

data/_includes/js/init.js

@@ -12,7 +12,7 @@ const init = () => {
 
         // Execute initialization functions
         for (const [name, module] of Object.entries(window.conference)) {
-            if (name == 'config') {
+            if (['config','ready','awaitReady'].includes(name)) {
                 continue;
             }
 
@@ -25,9 +25,11 @@ const init = () => {
                 l = config.lang[name];
             }
 
-            module.init(c, l)
+            module.init(c, l);
         }
 
+    }).then(() => {
+        window.conference.ready = true;
     })
     .catch((error) => {
         console.log(error);

data/_includes/js/map.js

@@ -1,22 +1,22 @@
-window.conference.mapConfig = (() => {
+window.conference.map = (() => {
     let config;
     let lang;
 
     let map;
 
     const setup = (elId) => {
-        map = L.map(elId).setView(config.map.home_coord, config.map.default_zoom);
+        map = L.map(elId).setView(config.home_coord, config.default_zoom);
 
-        L.tileLayer.provider(config.map.map_provider).addTo(map);
+        L.tileLayer.provider(config.map_provider).addTo(map);
 
         L.easyButton('far fa-star', () => {
-            map.flyTo(config.map.home_coord, config.map.default_zoom);
-        }, lang.location.focus_conf).addTo(map);
+            map.flyTo(config.home_coord, config.default_zoom);
+        }, lang.focus_conf).addTo(map);
 
         L.control.locate({
             flyTo: true,
             strings: {
-                title: lang.location.focus_me
+                title: lang.focus_me
             }
         }).addTo(map);
     };
@@ -32,7 +32,12 @@ window.conference.mapConfig = (() => {
         }
     };
 
+    const getMap = () => {
+        return map
+    };
+
     return {
-        init: init
+        init: init,
+        getMap: getMap
     };
 })();

data/_includes/partials/checks.html

@@ -2,10 +2,10 @@
 
 {%- unless site.data.lang.version -%}
   {%- 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?" -%}
+    {%- 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/main/_data/lang.yml) to you local website folder?" -%}
   {%- endunless -%}
 {%- elsif site.data.lang.version != 8 -%}
-  {%- 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)." -%}
+  {%- 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/main/_data/lang.yml)." -%}
 {%- endunless -%}
 {%- unless site.conference.lang == "en" or site.conference.lang == "de" or site.conference.lang == "fr" or site.conference.lang == "pt" -%}
   {%- assign errors = errors | push : "Unknown language selected for `site.conference.lang` parameter. Supported are `en`, `de`, `fr`, and `pt`." -%}

data/_layouts/config.html

@@ -2,9 +2,9 @@
     {%- include partials/get_enable_map.html -%}
     {%- if enable_map %}
     "map": {
-        "map_provider": "{{ site.conference.map.map_provider | default: 'OpenStreetMap.Mapnik' }}",
-        "home_coord": [{{ site.conference.map.home_coord }}],
-        "default_zoom": {{ site.conference.map.default_zoom | default: 17 }}
+        "map_provider": "{{ site.conference.location.map.map_provider | default: 'OpenStreetMap.Mapnik' }}",
+        "home_coord": [{{ site.conference.location.map.home_coord | default: '47.3744489, 47.3744489' }}],
+        "default_zoom": {{ site.conference.location.map.default_zoom | default: 17 }}
     },
     {%- endif %}
 

data/_sass/bootstrap/_variables.scss

@@ -677,7 +677,7 @@ $form-validation-states: map-merge(
   $form-validation-states
 );
 
-// Z-index master list
+// Z-index main list
 //
 // Warning: Avoid customizing these values. They're used for a bird's eye view
 // of components dependent on the z-axis and are designed to all work together.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-conference
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.2
 platform: ruby
 authors:
 - Lorenz Schmid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-28 00:00:00.000000000 Z
+date: 2023-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -244,9 +244,9 @@ files:
 - _sass/font-awesome/scss/v4-shims.scss
 - _sass/font-awesome/solid.scss
 - _sass/font-awesome/v4-shims.scss
-- _sass/leaflet/leaflet-easybutton.css
-- _sass/leaflet/leaflet-locatecontrol.css
-- _sass/leaflet/leaflet.css
+- _sass/leaflet/leaflet-easybutton.scss
+- _sass/leaflet/leaflet-locatecontrol.scss
+- _sass/leaflet/leaflet.scss
 - assets/css/main.scss
 - assets/icons/live.svg
 - assets/js/config.json
@@ -286,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Jekyll template for a conference website containing program, speaker, talks