From 38b19a5254b432b6e62e5bc14dae7a4e9646779f Mon Sep 17 00:00:00 2001 From: MTRNord Date: Sun, 22 Sep 2024 07:33:34 +0000 Subject: [PATCH 1/2] Add config options for the conference information banner and disable it since conf is over --- config.toml | 11 +++++++++++ sass/_elections.scss | 7 ------- sass/_index.scss | 7 +++++++ templates/index.html | 41 +++++++++++++++++++++++++++++++++++------ 4 files changed, 53 insertions(+), 13 deletions(-) diff --git a/config.toml b/config.toml index db5b1b86d..14e3fece5 100644 --- a/config.toml +++ b/config.toml @@ -35,3 +35,14 @@ skip_anchor_prefixes = [ # Spec page does not have anchors in the html it seems. (Probably loading using js.) This causes a false positive "https://spec.matrix.org/v1.3/changelog/", ] + +[extra] +banner = false + +# Possible states: "cfp", "awaiting_schedule", "scheduled", "no_tickets", "live", "none" +# None is used when elections instead are used +conference_state = "none" + +conference_website = "https://2024.matrix.org" +conference_dates = "Sep 19-22" +conference_location = "Berlin, Germany" \ No newline at end of file diff --git a/sass/_elections.scss b/sass/_elections.scss index 3adb068e0..c36b6c1f8 100644 --- a/sass/_elections.scss +++ b/sass/_elections.scss @@ -30,10 +30,3 @@ } } } - -#elections-banner { - width: 100%; - padding: .4em 1em; - background-color: #ffcb006b; - text-align: center; -} diff --git a/sass/_index.scss b/sass/_index.scss index 6229e05b4..44c30752a 100644 --- a/sass/_index.scss +++ b/sass/_index.scss @@ -429,3 +429,10 @@ } } } + +#information-banner { + width: 100%; + padding: .4em 1em; + background-color: #ffcb006b; + text-align: center; +} \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index 325c8638a..ebcb75484 100644 --- a/templates/index.html +++ b/templates/index.html @@ -6,12 +6,41 @@ {% endblock head_extra %} {% block content %} {% set sponsors_data = load_data(path="content/sponsors.toml") %} -
-

We are happy to launch The Matrix Conference on Sep 19-22 in Berlin, - Germany. Learn more about it, buy a - ticket, or check the schedule!

+ +{% if config.extra.banner %} +
+ {% if config.extra.conference_state == "cfp" %} +

We are happy to launch The Matrix Conference on {{ + config.extra.conference_dates }} in + {{ config.extra.conference_location }}. Learn more about it, + or submit a + proposal!

+ {% elif config.extra.conference_state == "awaiting_schedule" %} +

We are happy to launch The Matrix Conference on {{ + config.extra.conference_dates }} in + {{ config.extra.conference_location }}. Learn more about it, + buy a + ticket! +

+ {% elif config.extra.conference_state == "scheduled" %} +

We are happy to launch The Matrix Conference on {{ + config.extra.conference_dates }} in + {{ config.extra.conference_location }}. Learn more about it, + buy a + ticket, or check the schedule! +

+ {% elif config.extra.conference_state == "no_tickets" %} +

We are happy to launch The Matrix Conference on {{ + config.extra.conference_dates }} in + {{ config.extra.conference_location }}. Learn more about it, + or check the schedule!

+ {% elif config.extra.conference_state == "live" %} +

The Matrix Conference is Live. + Check the livestreams! +

+ {% endif %}
+{% endif %}
@@ -73,4 +102,4 @@

Build on Matrix

-{% endblock content %} +{% endblock content %} \ No newline at end of file From 6eb802d48c9215bb320ef70fc09775d266755a50 Mon Sep 17 00:00:00 2001 From: MTRNord Date: Sun, 22 Sep 2024 07:37:53 +0000 Subject: [PATCH 2/2] Add governence election info banner --- config.toml | 5 ++++- templates/index.html | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/config.toml b/config.toml index 14e3fece5..550872487 100644 --- a/config.toml +++ b/config.toml @@ -45,4 +45,7 @@ conference_state = "none" conference_website = "https://2024.matrix.org" conference_dates = "Sep 19-22" -conference_location = "Berlin, Germany" \ No newline at end of file +conference_location = "Berlin, Germany" + +governence_board_elections = false +governence_board_elections_page = "/governing-board/elections/2024" \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index ebcb75484..a2210acb1 100644 --- a/templates/index.html +++ b/templates/index.html @@ -39,6 +39,10 @@ Check the livestreams!

{% endif %} + {% if config.extra.governence_board_elections %} +

We are holding our Governing Board elections. Find all the information on the elections page.

+ {% endif %}
{% endif %}