Skip to content

Commit ecd711c

Browse files
suhailnadaf509suhailnadaf509
authored
Merge branch 'enext' into anonymous-room-1
2 parents 503e73f + efc77aa commit ecd711c

File tree

5 files changed

+86
-76
lines changed

5 files changed

+86
-76
lines changed

‎app/eventyay/agenda/templates/agenda/schedule.html‎

Lines changed: 58 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -5,81 +5,73 @@
55
{% load static %}
66
{% load phrases %}
77

8-
{% block container_width %} {% if not show_talk_list %}main-schedule{% else %}list-schedule{% endif %}{% endblock container_width %}
8+
{% block container_width %}{% if not show_talk_list %}main-schedule{% else %}list-schedule{% endif %}{% endblock container_width %}
99

1010
{% block agenda_custom_header %}
11-
<script id="pretalx-messages" data-logged-in="{% if request.user.is_anonymous %}false{% else %}true{% endif %}" src="{{ request.event.urls.schedule }}widget/messages.js"></script>
11+
<script id="pretalx-messages" data-logged-in="{% if request.user.is_anonymous %}false{% else %}true{% endif %}" src="{{ request.event.urls.schedule }}widget/messages.js"></script>
1212
{% endblock agenda_custom_header %}
1313

1414
{% block header_right %}
15-
<details class="dropdown mr-2" aria-haspopup="menu" role="menu">
16-
<summary>
17-
<span>{{ phrases.schedule.version }} {{ schedule.version|default:'-' }}</span>
18-
<i class="fa fa-caret-down ml-1"></i>
19-
</summary>
20-
<div class="dropdown-content dropdown-content-s{% if rtl %}e{% else %}w{% endif %}">
21-
<a class="dropdown-item" href="{{ request.event.urls.changelog }}" role="menuitem" tabindex="-1">
22-
<i class="fa fa-book"></i>
23-
{% translate "Changelog" %}
24-
</a>
25-
<hr>
26-
{% for exporter in exporters %}
27-
<a class="dropdown-item" href="{{ exporter.urls.base }}" role="menuitem" tabindex="-1" target="_blank">
28-
{% if exporter.icon|slice:":3" == "fa-" %}
29-
<span class="fa {{ exporter.icon }} export-icon"></span>
30-
{% else %}
31-
<span class="export-icon">{{ exporter.icon }}</span>
32-
{% endif %}
33-
{{ exporter.verbose_name }}
34-
{% if exporter.show_qrcode %}
35-
<span class="export-qrcode">
36-
<i class="fa fa-qrcode"></i>
37-
<div class="export-qrcode-image">{{ exporter.get_qrcode }}</div>
38-
</span>
39-
{% endif %}
40-
</a>
41-
{% endfor %}
42-
</div>
43-
</details>
15+
<details class="dropdown mr-2" aria-haspopup="menu" role="menu">
16+
<summary>
17+
<span>{{ phrases.schedule.version }} {{ schedule.version|default:'-' }}</span>
18+
<i class="fa fa-caret-down ml-1"></i>
19+
</summary>
20+
<div class="dropdown-content dropdown-content-s{% if rtl %}e{% else %}w{% endif %}">
21+
<a class="dropdown-item" href="{{ request.event.urls.changelog }}" role="menuitem" tabindex="-1">
22+
<i class="fa fa-book"></i>
23+
{% translate "Changelog" %}
24+
</a>
25+
<hr>
26+
{% for exporter in exporters %}
27+
<a class="dropdown-item" href="{{ exporter.urls.base }}" role="menuitem" tabindex="-1" target="_blank">
28+
{% if exporter.icon|slice:":3" == "fa-" %}
29+
<span class="fa {{ exporter.icon }} export-icon"></span>
30+
{% else %}
31+
<span class="export-icon">{{ exporter.icon }}</span>
32+
{% endif %}
33+
{{ exporter.verbose_name }}
34+
{% if exporter.show_qrcode %}
35+
<span class="export-qrcode">
36+
<i class="fa fa-qrcode"></i>
37+
<div class="export-qrcode-image">{{ exporter.get_qrcode }}</div>
38+
</span>
39+
{% endif %}
40+
</a>
41+
{% endfor %}
42+
</div>
43+
</details>
4444
{% endblock header_right %}
4545

4646
{% block agenda_content %}
47-
<div id="fahrplan" class="{% if show_talk_list %}list{% else %}grid{% endif %}">
48-
{% if schedule != schedule.event.current_schedule %}
49-
<div class="alert alert-warning m-3">
50-
<span>
51-
{% if not schedule.version %}
52-
{{ phrases.schedule.wip_version }}
53-
{% else %}
54-
{{ phrases.schedule.old_version }}
55-
{% endif %}
56-
{% if request.event.current_schedule %}
57-
{% phrase "phrases.schedule.current_version" current_url=schedule.event.urls.schedule %}
58-
{% endif %}
59-
</span>
60-
</div>
61-
{% endif %}
47+
<div id="fahrplan" class="{% if show_talk_list %}list{% else %}grid{% endif %}">
48+
{% if schedule != schedule.event.current_schedule %}
49+
<div class="alert alert-warning m-3">
50+
<span>
51+
{% if not schedule.version %}
52+
{{ phrases.schedule.wip_version }}
53+
{% else %}
54+
{{ phrases.schedule.old_version }}
55+
{% endif %}
56+
{% if request.event.current_schedule %}
57+
{% phrase "phrases.schedule.current_version" current_url=schedule.event.urls.schedule %}
58+
{% endif %}
59+
</span>
60+
</div>
61+
{% endif %}
6262

63-
<script type="text/javascript" src="{{ request.event.urls.schedule_widget_script }}" async></script>
63+
<script type="text/javascript" src="{{ request.event.urls.schedule_widget_script }}" async></script>
6464

65-
<pretalx-schedule
66-
event-url="{{ request.event.urls.base }}"
67-
version="{{ schedule.url_version }}"
68-
locale="{{ request.LANGUAGE_CODE }}"
69-
timezone="{{ request.event.timezone }}"
70-
{% if show_talk_list %}format="list"{% endif %}
71-
style="--pretalx-clr-primary: {{ request.event.visible_primary_color }}"
72-
></pretalx-schedule>
73-
<noscript class="d-block">
74-
<div class="alert alert-info m-4">
75-
<div></div>
76-
<div>
77-
{% blocktranslate trimmed with href=request.event.urls.schedule_nojs %}
78-
To see our schedule, please either enable JavaScript or go <a href="{{ href }}">here</a> for our NoJS schedule.
79-
{% endblocktranslate %}
80-
</div>
65+
<pretalx-schedule event-url="{{ request.event.urls.base }}" version="{{ schedule.url_version }}" locale="{{ request.LANGUAGE_CODE }}" timezone="{{ request.event.timezone }}" {% if show_talk_list %}format="list"{% endif %} style="--pretalx-clr-primary: {{ request.event.visible_primary_color }}" disable-auto-scroll></pretalx-schedule>
66+
<noscript class="d-block">
67+
<div class="alert alert-info m-4">
68+
<div></div>
69+
<div>
70+
{% blocktranslate trimmed with href=request.event.urls.schedule_nojs %}
71+
To see our schedule, please either enable JavaScript or go <a href="{{ href }}">here</a> for our NoJS schedule.
72+
{% endblocktranslate %}
8173
</div>
82-
</noscript>
83-
</div>
84-
74+
</div>
75+
</noscript>
76+
</div>
8577
{% endblock agenda_content %}

‎app/eventyay/base/models/event.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,8 @@ def get_date_from_display(self, tz=None, show_times=True, short=False) -> str:
213213
to the current locale and to the ``show_times`` setting.
214214
"""
215215
tz = tz or self.timezone
216+
if isinstance(tz, str):
217+
tz = ZoneInfo(key=tz)
216218
return _date(
217219
self.date_from.astimezone(tz),
218220
('SHORT_' if short else '')
@@ -225,6 +227,8 @@ def get_time_from_display(self, tz=None) -> str:
225227
the ``show_times`` setting.
226228
"""
227229
tz = tz or self.timezone
230+
if isinstance(tz, str):
231+
tz = ZoneInfo(key=tz)
228232
return _date(self.date_from.astimezone(tz), 'TIME_FORMAT')
229233

230234
def get_date_to_display(self, tz=None, show_times=True, short=False) -> str:
@@ -234,6 +238,8 @@ def get_date_to_display(self, tz=None, show_times=True, short=False) -> str:
234238
if ``show_date_to`` is ``False``.
235239
"""
236240
tz = tz or self.timezone
241+
if isinstance(tz, str):
242+
tz = ZoneInfo(key=tz)
237243
if not self.settings.show_date_to or not self.date_to:
238244
return ''
239245
return _date(

‎app/eventyay/control/templates/pretixcontrol/items/question_delete.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ <h1>{% trans "Delete question" %}</h1>
99
<p>{% blocktrans %}Are you sure you want to delete the question <strong>{{ question }}</strong>?{% endblocktrans %}</p>
1010
{% if dependent|length > 0 %}
1111
<p>{% blocktrans %}All answers to the question given by the buyers of the following products will be <strong>lost</strong>.{% endblocktrans %}</p>
12-
{% for item in dependent %}
13-
<li><a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=item.pk %}">{{ item.name }}</a></li>
12+
{% for product in dependent %}
13+
<li><a href="{% url "control:event.product" organizer=request.event.organizer.slug event=request.event.slug product=product.pk %}">{{ product.name }}</a></li>
1414
{% endfor %}
1515
{% endif %}
1616
<div class="form-group submit-group">

‎app/eventyay/static/agenda/js/pretalx-schedule.min.js‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18594,7 +18594,8 @@ const T_ = ".c-linear-schedule{display:flex;flex-direction:column;min-height:0}.
1859418594
currentDay: String,
1859518595
now: Object,
1859618596
scrollParent: Element,
18597-
onHomeServer: Boolean
18597+
onHomeServer: Boolean,
18598+
disableAutoScroll: Boolean
1859818599
},
1859918600
data() {
1860018601
return {
@@ -18633,7 +18634,7 @@ const T_ = ".c-linear-schedule{display:flex;flex-direction:column;min-height:0}.
1863318634
}
1863418635
let t = !1;
1863518636
const n = window.location.hash.slice(1);
18636-
if (n && n.length === 10 && de.fromISO(n, { zone: this.timezone }) && (t = !0), t) return;
18637+
if (n && n.length === 10 && de.fromISO(n, { zone: this.timezone }) && (t = !0), t || this.disableAutoScroll) return;
1863718638
const r = this.sessionBuckets.findIndex((a) => this.now < a.date);
1863818639
if (r < 0) return;
1863918640
const i = this.sessionBuckets[Math.max(0, r - 1)], u = ((o = (s = this.$refs[this.getBucketName(i.date)]) == null ? void 0 : s[0]) == null ? void 0 : o.offsetTop) - 90;
@@ -18784,7 +18785,8 @@ const H_ = '.c-grid-schedule{flex:auto;background-color:#fafafa}.c-grid-schedule
1878418785
locale: String,
1878518786
hasAmPm: Boolean,
1878618787
scrollParent: Element,
18787-
onHomeServer: Boolean
18788+
onHomeServer: Boolean,
18789+
disableAutoScroll: Boolean
1878818790
},
1878918791
data() {
1879018792
return {
@@ -18898,7 +18900,7 @@ const H_ = '.c-grid-schedule{flex:auto;background-color:#fafafa}.c-grid-schedule
1889818900
await this.$nextTick();
1889918901
let e = !1;
1890018902
const t = window.location.hash.slice(1);
18901-
if (t && t.length === 10 && de.fromISO(t, { zone: this.timezone }) && (e = !0), e || !this.$refs.now) return;
18903+
if (t && t.length === 10 && de.fromISO(t, { zone: this.timezone }) && (e = !0), e || !this.$refs.now || this.disableAutoScroll) return;
1890218904
const n = this.$refs.now.offsetTop + this.getOffsetTop();
1890318905
this.scrollParent ? this.scrollParent.scrollTop = n : window.scroll({ top: n });
1890418906
},
@@ -18978,10 +18980,11 @@ function $_(e, t, n, r, i, u) {
1897818980
scrollParent: n.scrollParent,
1897918981
favs: n.favs,
1898018982
onHomeServer: n.onHomeServer,
18983+
disableAutoScroll: n.disableAutoScroll,
1898118984
onChangeDay: t[0] || (t[0] = (a) => e.$emit("changeDay", a)),
1898218985
onFav: t[1] || (t[1] = (a) => e.$emit("fav", a)),
1898318986
onUnfav: t[2] || (t[2] = (a) => e.$emit("unfav", a))
18984-
}, null, 8, ["sessions", "rooms", "currentDay", "now", "hasAmPm", "timezone", "locale", "scrollParent", "favs", "onHomeServer"]))), 128))
18987+
}, null, 8, ["sessions", "rooms", "currentDay", "now", "hasAmPm", "timezone", "locale", "scrollParent", "favs", "onHomeServer", "disableAutoScroll"]))), 128))
1898518988
]);
1898618989
}
1898718990
const Z_ = {
@@ -19002,7 +19005,8 @@ const Z_ = {
1900219005
locale: String,
1900319006
hasAmPm: Boolean,
1900419007
scrollParent: Element,
19005-
onHomeServer: Boolean
19008+
onHomeServer: Boolean,
19009+
disableAutoScroll: Boolean
1900619010
},
1900719011
computed: {
1900819012
gridGroups() {
@@ -19614,10 +19618,11 @@ function h6(e, t, n, r, i, u) {
1961419618
scrollParent: e.scrollParent,
1961519619
favs: i.favs,
1961619620
onHomeServer: i.onHomeServer,
19621+
disableAutoScroll: n.disableAutoScroll,
1961719622
onChangeDay: t[4] || (t[4] = (h) => u.setCurrentDay(h)),
1961819623
onFav: t[5] || (t[5] = (h) => u.fav(h)),
1961919624
onUnfav: t[6] || (t[6] = (h) => u.unfav(h))
19620-
}, null, 8, ["sessions", "rooms", "days", "currentDay", "now", "hasAmPm", "timezone", "locale", "scrollParent", "favs", "onHomeServer"])) : (N(), ct(l, {
19625+
}, null, 8, ["sessions", "rooms", "days", "currentDay", "now", "hasAmPm", "timezone", "locale", "scrollParent", "favs", "onHomeServer", "disableAutoScroll"])) : (N(), ct(l, {
1962119626
key: 2,
1962219627
sessions: u.sessions,
1962319628
rooms: u.rooms,
@@ -19629,10 +19634,11 @@ function h6(e, t, n, r, i, u) {
1962919634
scrollParent: e.scrollParent,
1963019635
favs: i.favs,
1963119636
onHomeServer: i.onHomeServer,
19637+
disableAutoScroll: n.disableAutoScroll,
1963219638
onChangeDay: t[7] || (t[7] = (h) => u.setCurrentDay(h)),
1963319639
onFav: t[8] || (t[8] = (h) => u.fav(h)),
1963419640
onUnfav: t[9] || (t[9] = (h) => u.unfav(h))
19635-
}, null, 8, ["sessions", "rooms", "currentDay", "now", "hasAmPm", "timezone", "locale", "scrollParent", "favs", "onHomeServer"]))
19641+
}, null, 8, ["sessions", "rooms", "currentDay", "now", "hasAmPm", "timezone", "locale", "scrollParent", "favs", "onHomeServer", "disableAutoScroll"]))
1963619642
], 64)) : (N(), ct(f, {
1963719643
key: 2,
1963819644
size: "huge",
@@ -19703,6 +19709,11 @@ const p6 = 'html{font-size:14px;font-size:87.5%}body{font-family:Roboto,Helvetic
1970319709
dateFilter: {
1970419710
type: String,
1970519711
default: ""
19712+
},
19713+
// Disable auto-scroll to current time on page load
19714+
disableAutoScroll: {
19715+
type: Boolean,
19716+
default: !1
1970619717
}
1970719718
},
1970819719
provide() {

‎deployment/docker-compose.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ services:
4343
container_name: eventyay-next-worker
4444
entrypoint: celery -A eventyay worker -l info
4545
volumes:
46+
- ./data/static:/home/app/web/eventyay/static.dist
4647
- ./eventyay.cfg:/etc/eventyay.cfg:ro
4748
env_file:
4849
- ./.env

0 commit comments

Comments
 (0)