diff --git a/pinaxcon/templates/symposion/schedule/presentation_detail.html b/pinaxcon/templates/symposion/schedule/presentation_detail.html index d3c75a8c..4a990cfa 100644 --- a/pinaxcon/templates/symposion/schedule/presentation_detail.html +++ b/pinaxcon/templates/symposion/schedule/presentation_detail.html @@ -1,78 +1,57 @@ {% extends "site_base.html" %} {% load lca2018_tags %} +{% load lca2019_tags %} {% load sitetree %} {% load staticfiles %} {% load thumbnail %} {% block head_title %}Presentation: {{ presentation.title }}{% endblock %} {% block body_class %}text-primary{% endblock body_class %} -{% block header_paragraph %} -

- Presented by - {% for speaker in presentation.speakers %} - {{ speaker }}{% if not forloop.last %}, {% endif %} - {% endfor %} -
- {% if presentation.slot %} - {{ presentation.slot.day.date|date:"l" }} - {{ presentation.slot.start}}–{{ presentation.slot.end }} in {{ presentation.slot.rooms.0 }} -
- {% endif %} - {% if presentation.proposal.get_target_audience_display %} - Target audience: - {{ presentation.proposal.get_target_audience_display }} - {% endif %} -{% endblock %} + +{% block main_class %}container-fluid{% endblock %} {% block content %}

-
-
-

{{ presentation.title }}

-

Abstract

-

{{ presentation.abstract_html|urlize|safe }}

+
+

{{ presentation.title }}

+

+ {{ presentation.slot.rooms.0 }} | {{ presentation.slot.day.date|date:"D d M" }} | {{ presentation.slot.start}}–{{ presentation.slot.end }} +

+
+
-

Presented by

+
+

Presented by

    - {% for speaker in presentation.speakers %} - {# {% speaker_photo speaker 512 as speaker_photo_url %} #} - {# {% include "_right_floating_image.html" with image_url=speaker_photo_url %} #} - {#

    {{ speaker }}
    #} -

    {{ speaker }}
    -

    {{ speaker.biography_html|safe}}

    - {% endfor %} + + {% for speaker in presentation.speakers %} +
  • + {% speaker_photo speaker 120 as speaker_photo_url %} + +

    + {{ speaker }}
    + {% if speaker.twitter_username %} + {{ speaker.twitter_username }}
    + {% endif %} + {% if speaker.homepage %} + {{ speaker.homepage }} + {% endif %} +

    +
    {{ speaker.biography_html|safe}}
    +

    +
  • + {% endfor %} +
+ +
+

Abstract

+

{{ presentation.abstract_html|clean_text|urlize|safe }}

+
{% if presentation.unpublish %}

Presentation not published.

{% endif %} - - -{% comment %} -... leave here for later -
-

- - - {% if speaker.homepage or speaker.twitter_username %} -
- {% if speaker.homepage %} - - {% include "cms_pages/home_page_blocks/btn_generic_link.html" %} - - {% endif %} - {% if speaker.twitter_username %} - - {% include "cms_pages/home_page_blocks/btn_twitter.html" %} - - {% endif %} -
- {% endif %} -

- - {% endfor %} -
-{% endcomment %} {% endblock %} diff --git a/pinaxcon/templatetags/lca2018_tags.py b/pinaxcon/templatetags/lca2018_tags.py index be27e8ed..c2e27d99 100644 --- a/pinaxcon/templatetags/lca2018_tags.py +++ b/pinaxcon/templatetags/lca2018_tags.py @@ -54,7 +54,7 @@ def speaker_photo(context, speaker, size): md5sum = hashlib.md5(email.strip().lower()).hexdigest() fallback_image = ("https://linux.conf.au/site_media/static/lca2017" "/images/speaker-fallback-devil.jpg") - url = "https://secure.gravatar.com/avatar/%s?s=%d&d=%s" % (md5sum, size, fallback_image) + url = "https://secure.gravatar.com/avatar/%s?s=%d&d=%s" % (md5sum, size, "mp") return url diff --git a/pinaxcon/templatetags/lca2019_tags.py b/pinaxcon/templatetags/lca2019_tags.py index 10363159..9bad403d 100644 --- a/pinaxcon/templatetags/lca2019_tags.py +++ b/pinaxcon/templatetags/lca2019_tags.py @@ -1,5 +1,6 @@ from django import template from django.forms import Form +import re register = template.Library() @@ -29,4 +30,10 @@ def listlookup(lookup, target): try: return lookup[target] except IndexError: - return '' \ No newline at end of file + return '' + + +@register.filter +def clean_text(txt): + # Remove double/triple/+ spaces from `txt` and replace with single space + return re.sub(r' {2,}' , ' ', txt) \ No newline at end of file diff --git a/static/src/scss/app.scss b/static/src/scss/app.scss index b5e96cb5..ad0f8f9f 100644 --- a/static/src/scss/app.scss +++ b/static/src/scss/app.scss @@ -415,7 +415,7 @@ hr { } } -.schedule-header { +.schedule-header, .sponsor-header { h1 { text-transform: uppercase; margin-bottom: 3rem; @@ -666,4 +666,16 @@ hr { .subtitle { font-weight: 600; font-size: 1.5rem; -} \ No newline at end of file +} + +hr.green { + border-color: $primary; + background-color: $primary; + color: $primary; +} + +div.talk-abstract { + @include media-breakpoint-up(lg) { + border-left: 1px solid #0F7C11 !important; + } +}