Skip to content
Snippets Groups Projects
Commit 1cc1fd5a authored by smtw's avatar smtw
Browse files

Merge branch 'develop' into feature/theme_switcher

parents 24a703a7 ae439ea3
No related branches found
No related tags found
No related merge requests found
......@@ -11,7 +11,7 @@
<div class="rc3-fahrplan__timeline">
<h2 class="m-0 text-white rc3-fahrplan__timeline-title">&nbsp;</h2>
{% for step in time_steps %}
<figure class="m-0 px-2" style="height: {{ h(step_minutes) }}">{{step.ts.strftime('%d.%m.%Y %H:%M') if step.newdate else step.ts | strftimehm}}</figure>
<figure class="m-0 px-2" {{ step.ts.strftime('id=day-%d') if (step.newdate or loop.first) }} style="height: {{ h(step_minutes) }}">{{step.ts.strftime('%d.%m.%Y %H:%M') if step.newdate else step.ts | strftimehm}}</figure>
{% endfor %}
</div>
{% for room, room_events in events.rooms_with_events %}
......@@ -31,6 +31,7 @@
<a class="text-decoration-none rc3-fahrplan__link" {% if public %}data-eventid="{{entry.event.id}}" href="#{{ entry.event.id }}"{% else %}href="{{ url('plainui:event', event_slug=entry.event.slug) }}"{% endif %} title="{{entry.event.name}}">
{%- if public %}
{{ json_script({
'id': entry.event.id,
'title': entry.event.name | escape,
'abstract': entry.event.abstract | escape,
'description_html': entry.event.description_html,
......
......@@ -36,7 +36,9 @@
<div class="row justify-content-md-left">
<button type="submit" name="set" value="fmy" class="m-2 btn btn-transparent {{ 'active' if my_fahrplan else ''}}">{{ _("My Fahrplan") }}</button>
<button type="submit" name="set" value="fday" class="m-2 btn btn-transparent {{ 'active' if show_day_filters else ''}}">{{ _("by day") }}</button>
<!-- no tracks at rc3 2021
<button type="submit" name="set" value="ftrack" class="m-2 btn btn-transparent {{ 'active' if show_track_filters else ''}}">{{ _("by track") }}</button>
-->
<button type="submit" name="set" value="kofficial" class="m-2 btn btn-transparent {{ 'active' if kind == 'official' else ''}}">{{ _("curated only") }}</button>
<button type="submit" name="set" value="kassembly" class="m-2 btn btn-transparent {{ 'active' if kind == 'assembly' else ''}}">{{ _("assembly only") }}</button>
<button type="submit" name="set" value="ksos" class="m-2 btn btn-transparent {{ 'active' if kind == 'sos' else ''}}">{{ _("selforganized only") }}</button>
......
......@@ -27,6 +27,16 @@
{{ _("platform") }}
</a>
</div>
<div class="text-center m-3">
<a
href="{{ url('plainui:public_fahrplan' ) }}"
title="{{ _("fahrplan") }}"
class="rc3-header-link p-2"
target="_blank"
>
{{ _("fahrplan") }}
</a>
</div>
<div class="text-center m-3">
<a
href="{{ url('plainui:static_page', page_slug='start' ) }}"
......
......@@ -28,6 +28,10 @@
<a class="a" href="https://streaming.media.ccc.de/rc3/" target="_blank" title="{{ _("streams") }}">{{ _("streams") }}</a>
<a class="a" href="https://streaming.media.ccc.de/rc3/relive" target="_blank" title="{{ _("relive") }}">{{ _("relive") }}</a>
<a class="a" href="https://media.ccc.de/c/rc3-2021" target="_blank" title="{{ _("recordings") }}">{{ _("recordings") }}</a>
<a class="a" href="#day-27" title="Day 1">Day-1</a>
<a class="a" href="#day-28" title="Day 2">Day-2</a>
<a class="a" href="#day-29" title="Day 3">Day-3</a>
<a class="a" href="#day-30" title="Day 4">Day-4</a>
</div>
{% if timezone_warning %}
<div class="text-warning">{{ _("Your timezone is configured to %(user_timezone)s, conference timezone is %(conf_timezone)s, showing times in your timezone", user_timezone=current_timezone, conf_timezone=conference_timezone) }}</div>
......
......@@ -778,13 +778,13 @@ msgid "Welcome to rC3 now/here"
msgstr "Willkommen bei der rC3 now/here"
msgid "What's Official?"
msgstr "Was ist der Fahr&shy;plan?"
msgstr "Was ist los?"
msgid "official description"
msgstr "Das Hauptprogramm besteht dieses Jahr aus den freien Streams der 12 Community Bühnen, die unabhängig kuratiert zur dezentralisierten remote Chaos Experience beitragen. Natürlich darf die \"rc3 Lounge\" nicht fehlen, die durch das \"Abchillgleis\" komplementiert wird. "
msgstr "Das Hauptprogramm besteht dieses Jahr aus den freien Streams der 12 Community Bühnen, die unabhängig kuratiert zur dezentralisierten remote Chaos Experience beitragen. Natürlich darf die \"rc3 Lounge\" nicht fehlen, die durch das \"Abchillgleis\" komplementiert wird. Self-organized Sessions findest du in der Community-Content Box ganz rechts."
msgid "Explore Curated Events Button"
msgstr "Haupt&shy;pro&shy;gramm entdecken"
msgstr "Channels entdecken"
msgid "Congress Platform Title"
msgstr "Platt&shy;form & 2D-Welt"
......
......@@ -774,13 +774,13 @@ msgid "Welcome to rC3 now/here"
msgstr ""
msgid "What's Official?"
msgstr "What's the Fahrplan?"
msgstr "What's up?"
msgid "official description"
msgstr "This year the main programm consists of 12 community streams contributing their independently curated program to the decentralized Remote Chaos Experience, accompanied by c3lounge and abchillgleis."
msgstr "This year the main programm consists of 12 community streams contributing their independently curated program to the decentralized Remote Chaos Experience, accompanied by c3lounge and abchillgleis. For self-organzied sessions, see the community content box on the left."
msgid "Explore Curated Events Button"
msgstr "Explore Fahrplan"
msgstr "Explore channels"
msgid "Congress Platform Title"
msgstr "This is the platform"
......
......@@ -71,8 +71,9 @@ function eventContent(data) {
<dt>Room:</dt>
<dd class="">${data.room_name}</dd>
` + (data.track_name && data.track_name != 'None' ? `
<dt>Track:</dt>
<dd class="">${data.track_name}</dd>
<dd class="">${data.track_name}</dd>` : '') + `
<dt>Language:</dt>
<dd class="">${data.language}</dd>
......@@ -80,12 +81,16 @@ function eventContent(data) {
<dt>Speakers:</dt>
<dd class="">${data.speakers}</dd>
<dt>Streams:</dt>
<dd class=""><a class="a" href="https://streaming.media.ccc.de/rc3/" title="streams" target="_blank">streams</a></dd>
<dt>Video:</dt>
<dd class="">
<a class="a" href="https://streaming.media.ccc.de/rc3/" title="streams" target="_blank">live</a>
<a class="a" href="https://streaming.media.ccc.de/rc3/relive/${data.id}" title="relive" target="_blank">relive</a>
<a class="a" href="https://media.ccc.de/v/${data.id}" title="recording" target="_blank">recording</a>
</dd>
`;
if (data.link != null) {
content += `
<dt>Details:</dt>
<dt>Origin:</dt>
<dd class=""><a class="a" href="${data.link}" alt="Details" target="_blank">${data.link}</a></dd>`;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment