From 93060c79715f74685a65381c548b2e6ac1870a28 Mon Sep 17 00:00:00 2001 From: Maliao Guo Date: Sun, 20 Sep 2020 16:12:31 +0800 Subject: [PATCH 1/4] Optimized structure --- src/static/pycontw-2020/assets/keynotes/mariatta-wijaya.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/static/pycontw-2020/assets/keynotes/mariatta-wijaya.json b/src/static/pycontw-2020/assets/keynotes/mariatta-wijaya.json index d1fac8f96..23afdff69 100644 --- a/src/static/pycontw-2020/assets/keynotes/mariatta-wijaya.json +++ b/src/static/pycontw-2020/assets/keynotes/mariatta-wijaya.json @@ -25,5 +25,6 @@ "twitter": "https://twitter.com/mariatta", "github": "https://github.com/mariatta" }, - "slido": "https://app.sli.do/event/vppisnh8" + "slido": "https://app.sli.do/event/vppisnh8", + "slides": "https://speakerdeck.com/mariatta/oops-i-became-an-open-source-maintainer" } From e78e82f9adec26c4129edd6fff8334f0bd82d60c Mon Sep 17 00:00:00 2001 From: Maliao Guo Date: Sun, 20 Sep 2020 16:12:31 +0800 Subject: [PATCH 2/4] Put keynote slides --- src/static/pycontw-2020/assets/keynotes/mariatta-wijaya.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/static/pycontw-2020/assets/keynotes/mariatta-wijaya.json b/src/static/pycontw-2020/assets/keynotes/mariatta-wijaya.json index d1fac8f96..23afdff69 100644 --- a/src/static/pycontw-2020/assets/keynotes/mariatta-wijaya.json +++ b/src/static/pycontw-2020/assets/keynotes/mariatta-wijaya.json @@ -25,5 +25,6 @@ "twitter": "https://twitter.com/mariatta", "github": "https://github.com/mariatta" }, - "slido": "https://app.sli.do/event/vppisnh8" + "slido": "https://app.sli.do/event/vppisnh8", + "slides": "https://speakerdeck.com/mariatta/oops-i-became-an-open-source-maintainer" } From 89a53969ad8dc3779e13c8a044d72c00eab072f8 Mon Sep 17 00:00:00 2001 From: Maliao Guo Date: Sun, 20 Sep 2020 16:12:31 +0800 Subject: [PATCH 3/4] add slides tab --- .../_default/conference/keynotes.html | 114 +++++++++--------- 1 file changed, 60 insertions(+), 54 deletions(-) diff --git a/src/templates/pycontw-2020/contents/_default/conference/keynotes.html b/src/templates/pycontw-2020/contents/_default/conference/keynotes.html index 2d33f093f..d8d39c049 100644 --- a/src/templates/pycontw-2020/contents/_default/conference/keynotes.html +++ b/src/templates/pycontw-2020/contents/_default/conference/keynotes.html @@ -10,7 +10,7 @@ {% block content %} - -
-

{% trans 'Keynotes' %}

-
+
+

{% trans 'Keynotes' %}

+
-{% get_keynote_events as keynote_events %} + {% get_keynote_events as keynote_events %} -{% for event in keynote_events %} + {% for event in keynote_events %} -{% with data=event.get_static_data_for_locale %} + {% with data=event.get_static_data_for_locale %} -
-
-
- -
{{ data.speaker.name }}
-
-

{{ data.session.title }}

-
-
-
    -
  • - {% trans 'Biography' %} -
    • -
  • - {% trans 'Speech' %} -
    • - {% if data.slido %} -
  • - {% trans 'Slido' %} -
    • - {% endif %} -
-
-
-

{% trans 'Biography' %}

- {{ data.speaker.bio|linebreaks }} - -
-
-{% endwith %} + {% endwith %} -{% endfor %} + {% endfor %} {% endblock content %} From deb112ed2a9fd69efcff29648cc7115b2342c9df Mon Sep 17 00:00:00 2001 From: Maliao Guo Date: Sat, 5 Dec 2020 17:31:27 +0800 Subject: [PATCH 4/4] Update the display of slide --- .../contents/_default/conference/keynotes.html | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/templates/pycontw-2020/contents/_default/conference/keynotes.html b/src/templates/pycontw-2020/contents/_default/conference/keynotes.html index d8d39c049..3dce277c1 100644 --- a/src/templates/pycontw-2020/contents/_default/conference/keynotes.html +++ b/src/templates/pycontw-2020/contents/_default/conference/keynotes.html @@ -50,6 +50,8 @@

{{ data.session.title }}

  • {% trans 'Slido' %}
    • + {% endif %} + {% if data.slides %}
  • {% trans 'Slides' %}
    • @@ -77,9 +79,11 @@

    {% trans 'Speech' %}

    {% endif %} - + {% if data.slides %} + + {% endif %}