From f88dcb6ae6e186386ca3006f108e4d35aff52b0a Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Sun, 11 Aug 2024 19:05:46 +0200
Subject: [PATCH] Fix spacing in substitutions print

---
 .../templates/chronos/partials/subject.html       |  4 +---
 .../templates/chronos/partials/subs/groups.html   | 10 +++-------
 .../templates/chronos/partials/subs/period.html   |  2 +-
 .../templates/chronos/partials/subs/room.html     | 15 ---------------
 .../templates/chronos/partials/subs/rooms.html    | 10 +++-------
 .../templates/chronos/partials/subs/subject.html  |  2 +-
 6 files changed, 9 insertions(+), 34 deletions(-)
 delete mode 100644 aleksis/apps/chronos/templates/chronos/partials/subs/room.html

diff --git a/aleksis/apps/chronos/templates/chronos/partials/subject.html b/aleksis/apps/chronos/templates/chronos/partials/subject.html
index c6f305ab..efed1172 100644
--- a/aleksis/apps/chronos/templates/chronos/partials/subject.html
+++ b/aleksis/apps/chronos/templates/chronos/partials/subject.html
@@ -1,3 +1 @@
-<strong>
-  {{ subject.short_name|default:subject.name }}
-</strong>
+{{ subject.short_name|default:subject.name }}
diff --git a/aleksis/apps/chronos/templates/chronos/partials/subs/groups.html b/aleksis/apps/chronos/templates/chronos/partials/subs/groups.html
index 079e0f03..44705438 100644
--- a/aleksis/apps/chronos/templates/chronos/partials/subs/groups.html
+++ b/aleksis/apps/chronos/templates/chronos/partials/subs/groups.html
@@ -1,13 +1,9 @@
 {% if el.cancelled and el.amends.groups.all %}
   {% include "chronos/partials/groups.html" with groups=el.amends.groups.all %}
 {% elif el.groups.all and el.amends.groups.all %}
-  <s>
-    {% include "chronos/partials/groups.html" with groups=el.amends.groups.all %}
-  </s>
-  →
-  <strong>
-    {% include "chronos/partials/groups.html" with groups=el.groups.all %}
-  </strong>
+  <s>{% include "chronos/partials/groups.html" with groups=el.amends.groups.all %}</s>
+  &nbsp;→&nbsp;
+  <strong>{% include "chronos/partials/groups.html" with groups=el.groups.all %}</strong>
 {% elif el.groups.all and not el.amends.groups.all %}
   {% include "chronos/partials/groups.html" with groups=el.groups.all %}
 {% elif el.amends.groups.all %}
diff --git a/aleksis/apps/chronos/templates/chronos/partials/subs/period.html b/aleksis/apps/chronos/templates/chronos/partials/subs/period.html
index 874631a7..c2af91a1 100644
--- a/aleksis/apps/chronos/templates/chronos/partials/subs/period.html
+++ b/aleksis/apps/chronos/templates/chronos/partials/subs/period.html
@@ -7,7 +7,7 @@
       {{ el.REFERENCE_OBJECT.slot_number_start }}.–{{ el.REFERENCE_OBJECT.slot_number_end }}.
     {% endif %}
   {% elif el.DTSTART.dt.time %}
-    {{ el.DTSTART.dt.time }} - {{ el.DTSTART.dt.time }}
+    {{ el.DTSTART.dt.time }}–{{ el.DTSTART.dt.time }}
   {% else %}
     {% trans "all day" %}
   {% endif %}
diff --git a/aleksis/apps/chronos/templates/chronos/partials/subs/room.html b/aleksis/apps/chronos/templates/chronos/partials/subs/room.html
deleted file mode 100644
index 123faba6..00000000
--- a/aleksis/apps/chronos/templates/chronos/partials/subs/room.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% if el.cancelled and el.amends.rooms.all %}
-  {% include "chronos/partials/rooms.html" with rooms=el.amends.rooms.all %}
-{% elif el.rooms.all and el.amends.rooms.all %}
-  <s>
-    {% include "chronos/partials/rooms.html" with rooms=el.amends.rooms.all %}
-  </s>
-  →
-  <strong>
-    {% include "chronos/partials/rooms.html" with rooms=el.rooms.all %}
-  </strong>
-{% elif el.rooms.all and not el.amends.rooms.all %}
-  {% include "chronos/partials/rooms.html" with rooms=el.rooms.all %}
-{% elif el.amends.rooms.all %}
-  {% include "chronos/partials/rooms.html" with rooms=el.amends.rooms.all %}
-{% endif %}
diff --git a/aleksis/apps/chronos/templates/chronos/partials/subs/rooms.html b/aleksis/apps/chronos/templates/chronos/partials/subs/rooms.html
index 123faba6..6a1ad0de 100644
--- a/aleksis/apps/chronos/templates/chronos/partials/subs/rooms.html
+++ b/aleksis/apps/chronos/templates/chronos/partials/subs/rooms.html
@@ -1,13 +1,9 @@
 {% if el.cancelled and el.amends.rooms.all %}
   {% include "chronos/partials/rooms.html" with rooms=el.amends.rooms.all %}
 {% elif el.rooms.all and el.amends.rooms.all %}
-  <s>
-    {% include "chronos/partials/rooms.html" with rooms=el.amends.rooms.all %}
-  </s>
-  →
-  <strong>
-    {% include "chronos/partials/rooms.html" with rooms=el.rooms.all %}
-  </strong>
+  <s>{% include "chronos/partials/rooms.html" with rooms=el.amends.rooms.all %}</s>
+  &nbsp;→&nbsp;
+  <strong>{% include "chronos/partials/rooms.html" with rooms=el.rooms.all %}</strong>
 {% elif el.rooms.all and not el.amends.rooms.all %}
   {% include "chronos/partials/rooms.html" with rooms=el.rooms.all %}
 {% elif el.amends.rooms.all %}
diff --git a/aleksis/apps/chronos/templates/chronos/partials/subs/subject.html b/aleksis/apps/chronos/templates/chronos/partials/subs/subject.html
index 3e907e1f..eaa70ff7 100644
--- a/aleksis/apps/chronos/templates/chronos/partials/subs/subject.html
+++ b/aleksis/apps/chronos/templates/chronos/partials/subs/subject.html
@@ -11,7 +11,7 @@
   <s>{% include "chronos/partials/subject.html" with subject=el.amends.subject %}</s>
 {% elif el.subject and el.amends.subject %}
   <s>{% include "chronos/partials/subject.html" with subject=el.amends.subject %}</s>
-  →
+  &nbsp;→&nbsp;
   <strong>{% include "chronos/partials/subject.html" with subject=el.subject %}</strong>
 {% elif el.subject and not el.amends.subject %}
   {% include "chronos/partials/subject.html" with subject=el.subject %}
-- 
GitLab