diff --git a/bullet/bullet_admin/templates/bullet_admin/components/country.html b/bullet/bullet_admin/templates/bullet_admin/components/country.html index 8489ae61..a96826ae 100644 --- a/bullet/bullet_admin/templates/bullet_admin/components/country.html +++ b/bullet/bullet_admin/templates/bullet_admin/components/country.html @@ -1,6 +1,6 @@ {% load components %}
- {{ attributes.name }}
diff --git a/bullet/bullet_admin/templates/bullet_admin/generic/list_countries.html b/bullet/bullet_admin/templates/bullet_admin/generic/list_countries.html index 5c278519..bfd8d499 100644 --- a/bullet/bullet_admin/templates/bullet_admin/generic/list_countries.html +++ b/bullet/bullet_admin/templates/bullet_admin/generic/list_countries.html @@ -20,7 +20,7 @@ {% if request.GET.country == country %} {% anavitem url=url active=True %}
- {{ country_info.name }}
@@ -28,7 +28,7 @@ {% else %} {% anavitem url=url active=False %}
- {{ country_info.name }}
diff --git a/bullet/bullet_admin/templates/bullet_admin/results/announce.html b/bullet/bullet_admin/templates/bullet_admin/results/announce.html index c95438f8..0ae4ac31 100644 --- a/bullet/bullet_admin/templates/bullet_admin/results/announce.html +++ b/bullet/bullet_admin/templates/bullet_admin/results/announce.html @@ -39,17 +39,17 @@ {{ position }}. diff --git a/bullet/bullet_admin/templates/bullet_admin/venues/field__venue.html b/bullet/bullet_admin/templates/bullet_admin/venues/field__venue.html index 37438b83..7cbe54c7 100644 --- a/bullet/bullet_admin/templates/bullet_admin/venues/field__venue.html +++ b/bullet/bullet_admin/templates/bullet_admin/venues/field__venue.html @@ -1,5 +1,5 @@
-
{{ object.shortcode }} diff --git a/bullet/competitions/templates/teams/list.html b/bullet/competitions/templates/teams/list.html index cca9c6e4..43d03daa 100644 --- a/bullet/competitions/templates/teams/list.html +++ b/bullet/competitions/templates/teams/list.html @@ -25,7 +25,7 @@

{% for c in countries %} - {% get_country c as country_data %} {{ country_data.name }} diff --git a/bullet/gallery/templates/gallery/list.html b/bullet/gallery/templates/gallery/list.html index e1badad2..968dc6b9 100644 --- a/bullet/gallery/templates/gallery/list.html +++ b/bullet/gallery/templates/gallery/list.html @@ -15,7 +15,7 @@

{% translate "Albums" % {% for country in countries %}

- {{ country.grouper.name }}

diff --git a/bullet/problems/templates/problems/results.html b/bullet/problems/templates/problems/results.html index 08012a53..9b107245 100644 --- a/bullet/problems/templates/problems/results.html +++ b/bullet/problems/templates/problems/results.html @@ -35,7 +35,7 @@

{% for c in countries %} - + {{ c.name }} {% endfor %} diff --git a/bullet/users/templates/partials/team_name.html b/bullet/users/templates/partials/team_name.html index 8df099c8..a1385772 100644 --- a/bullet/users/templates/partials/team_name.html +++ b/bullet/users/templates/partials/team_name.html @@ -2,7 +2,7 @@ {% if team.school %}
{% if flag %} - + {% endif %}
diff --git a/bullet/web/static/js/live-results.js b/bullet/web/static/js/live-results.js index aff9af81..06ba9c0b 100644 --- a/bullet/web/static/js/live-results.js +++ b/bullet/web/static/js/live-results.js @@ -15,7 +15,11 @@ } document.getElementById("js-title-"+i).innerText = screens[i].title - htmx.ajax("GET", screens[i].url, "#js-screen-"+i) + try { + htmx.ajax("GET", screens[i].url, "#js-screen-"+i) + } catch (e) { + console.log(`Unable to load screen #${i}: ${e}`) + } } setTimeout(scrollMore, 5000) @@ -36,6 +40,11 @@ const oldScroll = document.scrollingElement.scrollTop const row = document.querySelector("#js-results-content tr") + if (!row) { + console.error("No results are loaded, trying to reload results in 1s") + setTimeout(nextScreen, 1000) + return; + } const offset = Math.max(Math.round(row.clientHeight / 40), 1) const divided = row.clientHeight / offset document.scrollingElement.scrollTop += offset diff --git a/tailwind.config.js b/tailwind.config.js index 6d1cc689..6450754d 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -8,6 +8,9 @@ module.exports = { ], theme: { extend: { + aspectRatio: { + '4/3': '4 / 3', + }, colors: { primary: "var(--primary)", "primary-light": "var(--primary-light)",