diff --git a/Cargo.lock b/Cargo.lock index 58f9b72..b3eece5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -578,7 +578,7 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "fabula_votes_server" -version = "1.4.0" +version = "1.4.1" dependencies = [ "argon2", "blake2", diff --git a/Cargo.toml b/Cargo.toml index ec70a8c..298d596 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "fabula_votes_server" license = "MPL-2.0" readme = "README.md" authors = ["trotFunky"] -version = "1.4.0" +version = "1.4.1" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/static_files/vote_chart.js b/static_files/vote_chart.js index f82b977..306a01d 100644 --- a/static_files/vote_chart.js +++ b/static_files/vote_chart.js @@ -1,7 +1,9 @@ const limit_ratio = 1.3 const colors = ['#b6b8fc', '#b6f4fc', '#fcb6cc', '#e0fcb6', '#fcdcb6', '#b6fcc8', '#f0b6fc'] async function main() { - const vote_response = await fetch(document.URL+"/votes"); + let current_url = new URL(document.URL) + current_url.hash = '' // Strip the local part of the URL, for example if we select a Truth + const vote_response = await fetch(current_url.toString()+"/votes"); if (!vote_response.ok) { return; } diff --git a/templates/tags/filtered_truths.html.tera b/templates/tags/filtered_truths.html.tera index ad2ffb9..cb94d54 100644 --- a/templates/tags/filtered_truths.html.tera +++ b/templates/tags/filtered_truths.html.tera @@ -21,7 +21,7 @@ {% for truth in truths %}
-

Semaine {{ truth.week }} - Vérité {{ truth.number }}

+

Semaine {{ truth.week }} - Vérité {{ truth.number }}

{{ truth.rendered_text | safe }}

{% endfor %} diff --git a/templates/weeks/editable_truth.tera b/templates/weeks/editable_truth.tera index 3c2c968..8d75882 100644 --- a/templates/weeks/editable_truth.tera +++ b/templates/weeks/editable_truth.tera @@ -1,5 +1,5 @@
-

Vérité {{ truth.number }}

+

Vérité {{ truth.number }}

{{ truth.rendered_text | safe }}

{% for tag in truth.tags %} @@ -15,16 +15,18 @@
{% include "weeks/truth_editor" %}
-
- - -
+ {% if tags | length > 0 and tags | length > truth.tags | length %} +
+ + +
+ {% endif %}
diff --git a/templates/weeks/truth.html.tera b/templates/weeks/truth.html.tera index 5a420e6..5eaa580 100644 --- a/templates/weeks/truth.html.tera +++ b/templates/weeks/truth.html.tera @@ -5,7 +5,7 @@ {%- endif -%}
-

Vérité {{ truth.number }}

+

Vérité {{ truth.number }}

{{ truth.rendered_text | safe }}