jekyll-theme-conference 3.6.1 → 3.6.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +10 -5
- data/_includes/js/conference.js +19 -6
- data/_includes/js/init.js +4 -2
- data/_includes/js/map.js +8 -3
- data/_includes/partials/checks.html +2 -2
- data/_sass/bootstrap/_variables.scss +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 3a8a764ea9cd83ec595e33843bfc153ed9771d50fc7913b27be142c48ec911ad
|
4
|
+
data.tar.gz: ed274c9834c5a2f832300d78260ddbd740471f59d53767ba34667fd4a7f2b762
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 73c23afdd2af6befe4d2986ba6c8d00f6c10173a5e6ed65da2440480b8664cbfb9986457d120dc91e6386fec3f41fac4ff548d634b2f3f54186cf90385894680
|
7
|
+
data.tar.gz: dddb4b961103052da89c38d721411a9e853ee317ebf0c5c30bc163f307e6bfac1e1b2b65a2f966b5c349ffce42805f3ff44251930f5b8002abb1632b8ba8e482
|
data/README.md
CHANGED
@@ -493,9 +493,14 @@ conference:
|
|
493
493
|
map: true
|
494
494
|
```
|
495
495
|
|
496
|
-
The map is based on the
|
496
|
+
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`:
|
497
497
|
|
498
|
-
|
498
|
+
1. Import the JavaScript library of the theme (via Jekyll `include` command)
|
499
|
+
2. Await the initialization of the theme's object
|
500
|
+
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)
|
501
|
+
4. Modify the map.
|
502
|
+
|
503
|
+
Following an example is given adding a simple marker to the map:
|
499
504
|
|
500
505
|
```javascript
|
501
506
|
---
|
@@ -503,8 +508,8 @@ Example:
|
|
503
508
|
|
504
509
|
{% include js/conference.js %}
|
505
510
|
|
506
|
-
(() => {
|
507
|
-
const map = window.conference.map;
|
511
|
+
window.conference.awaitReady().then(() => {
|
512
|
+
const map = window.conference.map.getMap();
|
508
513
|
|
509
514
|
if (typeof map !== 'undefined') {
|
510
515
|
let main_station = L.marker([47.37785, 8.54035], {
|
@@ -515,7 +520,7 @@ Example:
|
|
515
520
|
})
|
516
521
|
}).addTo(map);
|
517
522
|
}
|
518
|
-
})
|
523
|
+
});
|
519
524
|
|
520
525
|
```
|
521
526
|
|
data/_includes/js/conference.js
CHANGED
@@ -11,6 +11,19 @@
|
|
11
11
|
window.conference = {
|
12
12
|
config: {
|
13
13
|
baseurl: '{{ site.baseurl }}'
|
14
|
+
},
|
15
|
+
|
16
|
+
ready: false,
|
17
|
+
awaitReady: () => {
|
18
|
+
const poll = (resolve) => {
|
19
|
+
if(window.conference.ready === true) {
|
20
|
+
resolve();
|
21
|
+
}
|
22
|
+
else {
|
23
|
+
setTimeout(() => poll(resolve), 500);
|
24
|
+
}
|
25
|
+
}
|
26
|
+
return new Promise(poll);
|
14
27
|
}
|
15
28
|
};
|
16
29
|
|
@@ -22,12 +35,12 @@ window.conference = {
|
|
22
35
|
// Leaflet (Map Display)
|
23
36
|
{% include partials/get_enable_map.html %}
|
24
37
|
{% if enable_map %}
|
25
|
-
{
|
26
|
-
{
|
27
|
-
{
|
28
|
-
{
|
38
|
+
{%- include js/lib/leaflet.js %}
|
39
|
+
{%- include js/lib/leaflet-easybutton.js %}
|
40
|
+
{%- include js/lib/leaflet-locatecontrol.js %}
|
41
|
+
{%- include js/lib/leaflet-providers.js %}
|
29
42
|
|
30
|
-
{
|
43
|
+
{%- include js/map.js %}
|
31
44
|
{% endif %}
|
32
45
|
|
33
46
|
// Modals ("Popups")
|
@@ -35,7 +48,7 @@ window.conference = {
|
|
35
48
|
|
36
49
|
// Live and Streaming
|
37
50
|
{% if site.conference.live %}
|
38
|
-
{
|
51
|
+
{%- include js/live.js %}
|
39
52
|
{% endif %}
|
40
53
|
|
41
54
|
// Load configuration and start initialization
|
data/_includes/js/init.js
CHANGED
@@ -12,7 +12,7 @@ const init = () => {
|
|
12
12
|
|
13
13
|
// Execute initialization functions
|
14
14
|
for (const [name, module] of Object.entries(window.conference)) {
|
15
|
-
if (
|
15
|
+
if (['config','ready','awaitReady'].includes(name)) {
|
16
16
|
continue;
|
17
17
|
}
|
18
18
|
|
@@ -25,9 +25,11 @@ const init = () => {
|
|
25
25
|
l = config.lang[name];
|
26
26
|
}
|
27
27
|
|
28
|
-
module.init(c, l)
|
28
|
+
module.init(c, l);
|
29
29
|
}
|
30
30
|
|
31
|
+
}).then(() => {
|
32
|
+
window.conference.ready = true;
|
31
33
|
})
|
32
34
|
.catch((error) => {
|
33
35
|
console.log(error);
|
data/_includes/js/map.js
CHANGED
@@ -11,12 +11,12 @@ window.conference.map = (() => {
|
|
11
11
|
|
12
12
|
L.easyButton('far fa-star', () => {
|
13
13
|
map.flyTo(config.home_coord, config.default_zoom);
|
14
|
-
}, lang.
|
14
|
+
}, lang.focus_conf).addTo(map);
|
15
15
|
|
16
16
|
L.control.locate({
|
17
17
|
flyTo: true,
|
18
18
|
strings: {
|
19
|
-
title: lang.
|
19
|
+
title: lang.focus_me
|
20
20
|
}
|
21
21
|
}).addTo(map);
|
22
22
|
};
|
@@ -32,7 +32,12 @@ window.conference.map = (() => {
|
|
32
32
|
}
|
33
33
|
};
|
34
34
|
|
35
|
+
const getMap = () => {
|
36
|
+
return map
|
37
|
+
};
|
38
|
+
|
35
39
|
return {
|
36
|
-
init: init
|
40
|
+
init: init,
|
41
|
+
getMap: getMap
|
37
42
|
};
|
38
43
|
})();
|
@@ -2,10 +2,10 @@
|
|
2
2
|
|
3
3
|
{%- unless site.data.lang.version -%}
|
4
4
|
{%- unless site.conference.lang == "en" -%}
|
5
|
-
{%- 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/
|
5
|
+
{%- 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?" -%}
|
6
6
|
{%- endunless -%}
|
7
7
|
{%- elsif site.data.lang.version != 8 -%}
|
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/
|
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/main/_data/lang.yml)." -%}
|
9
9
|
{%- endunless -%}
|
10
10
|
{%- unless site.conference.lang == "en" or site.conference.lang == "de" or site.conference.lang == "fr" or site.conference.lang == "pt" -%}
|
11
11
|
{%- assign errors = errors | push : "Unknown language selected for `site.conference.lang` parameter. Supported are `en`, `de`, `fr`, and `pt`." -%}
|
@@ -677,7 +677,7 @@ $form-validation-states: map-merge(
|
|
677
677
|
$form-validation-states
|
678
678
|
);
|
679
679
|
|
680
|
-
// Z-index
|
680
|
+
// Z-index main list
|
681
681
|
//
|
682
682
|
// Warning: Avoid customizing these values. They're used for a bird's eye view
|
683
683
|
// of components dependent on the z-axis and are designed to all work together.
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: jekyll-theme-conference
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.6.
|
4
|
+
version: 3.6.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Lorenz Schmid
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2023-02-10 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: jekyll
|
@@ -286,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
286
286
|
- !ruby/object:Gem::Version
|
287
287
|
version: '0'
|
288
288
|
requirements: []
|
289
|
-
rubygems_version: 3.3.
|
289
|
+
rubygems_version: 3.3.26
|
290
290
|
signing_key:
|
291
291
|
specification_version: 4
|
292
292
|
summary: Jekyll template for a conference website containing program, speaker, talks
|