infrastructure/conference-website
1
1
Fork 1
Code Issues 14 Pull Requests Releases Activity

UI: Conference website web-assets v2 upgrade #103970

Merged
Márton Lente merged 50 commits from ui/web-assets-v2-update into main 2024-09-23 12:34:43 +02:00
Conversation 20 Commits 50 Files Changed 47 +125 -129
2 changed files with 125 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 806641abe3 - Show all commits

158
conference_main/templates/conference_main/presentations/detail.pug
View File

@ -38,92 +38,90 @@ meta(name='twitter:image', content='{{request.scheme}}://{{request.META.HTTP_HOS
} }
.row .row
.col .col
.card.mb-3 .box.mb-3.p-3
.card-body | {% if permissions.can_change %}
| {% if permissions.can_change %} .event-detail-header
.event-detail-header .row
.row .col-sm-6
.col-sm-6 .d-flex
.d-flex div
div small.text-muted.d-block Submitted on
small.text-muted.d-block Submitted on span(title="{{ object.created_at | date:'D d M, Y @ H:i' }}")
span(title="{{ object.created_at | date:'D d M, Y @ H:i' }}") | {{ object.created_at | date:'l d M, Y' }}
| {{ object.created_at | date:'l d M, Y' }} div.ml-4
div.ml-4 small.text-muted.d-block Status
small.text-muted.d-block Status span.badge.badge-primary(class="status-{{ object.status }}")
span.badge.badge-primary(class="status-{{ object.status }}") | {% if object.status == 'rejected' %}NOT ACCEPTED{% else %}{{ object.status|upper|replace:'_| ' }}{% endif %}
| {% if object.status == 'rejected' %}NOT ACCEPTED{% else %}{{ object.status|upper|replace:'_| ' }}{% endif %}
.col-sm-6 .col-sm-6
.d-flex .d-flex
.ml-auto .ml-auto
.btn-row.justify-content-end .btn-row.justify-content-end
a.btn( a.btn(
href="{% url 'presentation_update' edition_path=object.edition.path pk=object.pk %}") href="{% url 'presentation_update' edition_path=object.edition.path pk=object.pk %}")
i.i-edit i.i-edit
span Edit Presentation span Edit Presentation
a.btn( a.btn(
href="{% url 'presentation_review' edition_path=object.edition.path pk=object.pk %}") href="{% url 'presentation_review' edition_path=object.edition.path pk=object.pk %}")
i.i-comment i.i-comment
span Review span Review
| {% if request.user.is_superuser %} | {% if request.user.is_superuser %}
a.btn.btn-admin( a.btn.btn-admin(
href="{% url 'admin:conference_main_event_change' object.pk %}") href="{% url 'admin:conference_main_event_change' object.pk %}")
| Admin | Admin
| {% endif %} | {% endif %}
| {% endif %}
| {% if object.recording %}
.video-container
| {{ object.recording | oembed }}
| {% endif %}
.row.mb-3
| {% if object.picture and not object.recording %}
.col-md-4
| {% thumbnail object.picture "480x270" crop="50%" format="JPEG" as picture %}
a(href="{{ picture.url }}", target="_blank")
img.rounded.img-fluid(src='{{ picture.url }}', alt="{{ object.name }}")
| {% endthumbnail %}
| {% endif %} | {% endif %}
.p-3 div(class="col-md-{% if object.picture and not object.recording %}8{% else %}12{% endif %}")
| {% if object.recording %} | {% if object.day and object.time %}
.video-container .event-header.mb-3
| {{ object.recording | oembed }} ul.event-description
| {% if object.location.slug %}
li.event-location(
style="color: hsl(var(--location-hue-{{ object.location.slug }}), 80%, 35%);")
| {{ object.location.slug | upper }}
| {% endif %}
| {% if object.category %}
li.event-category
| {{ object.category | upper }}
| {% endif %}
| {% if object.duration_minutes %}
li.event-duration
| {{ object.duration_minutes }} min
| {% endif %}
| {% if object.day.date and object.time %}
li.event-date
a(href="{% url 'schedule' edition_path=edition.path %}#event-{{ object.id }}")
| {{ object.day.date | date:'l dS M' }} {{ object.time | time:'H:i' }}
| {% endif %}
li.divider
| {% include "conference_main/components/event_buttons.pug" with event=object show_favorite=True %}
| {% endif %} | {% endif %}
.row.mb-3 h2 {{ object.name }}
| {% if object.picture and not object.recording %}
.col-md-4
| {% thumbnail object.picture "480x270" crop="50%" format="JPEG" as picture %}
a(href="{{ picture.url }}", target="_blank")
img.rounded.img-fluid(src='{{ picture.url }}', alt="{{ object.name }}")
| {% endthumbnail %}
| {% endif %}
div(class="col-md-{% if object.picture and not object.recording %}8{% else %}12{% endif %}") | {% if object.description %}
| {% if object.day and object.time %} div {{ object.description | urlizetrunc:40 | linebreaks }}
.event-header.mb-3 | {% endif %}
ul.event-description
| {% if object.location.slug %}
li.event-location(
style="color: hsl(var(--location-hue-{{ object.location.slug }}), 80%, 35%);")
| {{ object.location.slug | upper }}
| {% endif %}
| {% if object.category %}
li.event-category
| {{ object.category | upper }}
| {% endif %}
| {% if object.duration_minutes %}
li.event-duration
| {{ object.duration_minutes }} min
| {% endif %}
| {% if object.day.date and object.time %}
li.event-date
a(href="{% url 'schedule' edition_path=edition.path %}#event-{{ object.id }}")
| {{ object.day.date | date:'l dS M' }} {{ object.time | time:'H:i' }}
| {% endif %}
li.divider
| {% include "conference_main/components/event_buttons.pug" with event=object show_favorite=True %}
| {% endif %}
h2 {{ object.name }}
| {% if object.description %}
div {{ object.description | urlizetrunc:40 | linebreaks }}
| {% endif %}
.row.mb-4 .row.mb-4
.col-md-12 .col-md-12

96
conference_main/templates/conference_main/presentations/review.pug
View File

@ -67,58 +67,56 @@ meta(name='twitter:image', content='{{request.scheme}}://{{request.META.HTTP_HOS
.col-lg-6 .col-lg-6
h5.text-uppercase.text-muted h5.text-uppercase.text-muted
| Description | Description
.card.mb-3 .box.mb-3.p-3
.card-body | {% if object.recording %}
.p-3 .video-container
| {% if object.recording %} | {{ object.recording | oembed }}
.video-container | {% endif %}
| {{ object.recording | oembed }}
.row.mb-3
| {% if object.picture and not object.recording %}
.col-md-3
| {% thumbnail object.picture "480x270" crop="50%" format="JPEG" as picture %}
a(href="{{ picture.url }}")
img.rounded.img-fluid(src='{{ picture.url }}', alt="{{ object.name }}")
| {% endthumbnail %}
| {% endif %}
div(class="col-md-{% if object.picture and not object.recording %}9{% else %}12{% endif %}")
| {% if object.day and object.time %}
.event-header.mb-3
ul.event-description
| {% if object.location.slug %}
li.event-location
| {{ object.location.slug | upper }}
| {% endif %}
| {% if object.category %}
li.event-category
| {{ object.category | upper }}
| {% endif %}
| {% if object.duration_minutes %}
li.event-duration
| {{ object.duration_minutes }} min
| {% endif %}
| {% if object.day.date and object.time %}
li.event-date
a(href="{% url 'schedule' edition_path=edition.path %}#event-{{ object.id }}")
| {{ object.day.date | date:'l dS M' }} {{ object.time | time:'H:i' }}
| {% endif %}
li.divider
| {% include "conference_main/components/event_buttons.pug" with event=object %}
| {% endif %} | {% endif %}
.row.mb-3 h3.mb-3 {{ object.name }}
| {% if object.picture and not object.recording %}
.col-md-3
| {% thumbnail object.picture "480x270" crop="50%" format="JPEG" as picture %}
a(href="{{ picture.url }}")
img.rounded.img-fluid(src='{{ picture.url }}', alt="{{ object.name }}")
| {% endthumbnail %}
| {% endif %}
div(class="col-md-{% if object.picture and not object.recording %}9{% else %}12{% endif %}") | {% if object.description %}
| {% if object.day and object.time %} div {{ object.description | urlizetrunc:40 | linebreaks }}
.event-header.mb-3 | {% endif %}
ul.event-description
| {% if object.location.slug %}
li.event-location
| {{ object.location.slug | upper }}
| {% endif %}
| {% if object.category %}
li.event-category
| {{ object.category | upper }}
| {% endif %}
| {% if object.duration_minutes %}
li.event-duration
| {{ object.duration_minutes }} min
| {% endif %}
| {% if object.day.date and object.time %}
li.event-date
a(href="{% url 'schedule' edition_path=edition.path %}#event-{{ object.id }}")
| {{ object.day.date | date:'l dS M' }} {{ object.time | time:'H:i' }}
| {% endif %}
li.divider
| {% include "conference_main/components/event_buttons.pug" with event=object %}
| {% endif %}
h3.mb-3 {{ object.name }}
| {% if object.description %}
div {{ object.description | urlizetrunc:40 | linebreaks }}
| {% endif %}
| {% if object.proposal %} | {% if object.proposal %}
.row.mb-4 .row.mb-4