Merge pull request #70 from fredagscafeen/dev/minor-improvements

Dev/minor improvements

Author: AndersSeverinsen

bartenders/templates/barplan.html

@@ -461,10 +461,8 @@ <h2 id="deposit_shifts">
 
 <script>
 	// Enable tooltips
-	var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'))
-	var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {
-	return new bootstrap.Tooltip(tooltipTriggerEl)
-	})
+	const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]')
+	const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl))
 </script>
 
 {% endblock %}

events/admin.py

@@ -130,4 +130,5 @@ class CommonEventAdmin(admin.ModelAdmin):
     list_display = (
         "title",
         "date",
+        "url",
     )

items/templates/items.html

@@ -76,6 +76,9 @@ <h5 class="mt-1">
 											</span>
 										{% else %}
 											{{ shelf_item.item.name }}
+											{% if shelf_item.item.abv %}
+											<small class="text-muted text-decoration-underline">{{ shelf_item.item.abv }}%</small>
+											{% endif %}
 										{% endif %}
 									</div>
 									<div class="d-flex align-content-start flex-wrap ps-0 gap-1">
@@ -85,13 +88,13 @@ <h5 class="mt-1">
 										</div>
 										{% endif %}
 										{% if shelf_item.item.glutenFree %}
-										<div class="bg-warning-subtle rounded text-center px-1">
-											<small class="text-muted">GF</small>
+										<div class="bg-warning-subtle rounded text-center px-1" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="{% translate 'Glutenfri' %}">
+											<b><small class="text-muted">GF</small></b>
 										</div>
 										{% endif %}
 										{% if shelf_item.item.nonAlcoholic %}
-										<div class="bg-info-subtle rounded text-center px-1">
-											<small class="text-muted">NA</small>
+										<div class="bg-info-subtle rounded text-center px-1" data-bs-toggle="tooltip" data-bs-placement="top" data-bs-title="{% translate 'Alkoholfri' %}">
+											<b><small class="text-muted">NA</small></b>
 										</div>
 										{% endif %}
 									</div>
@@ -121,14 +124,6 @@ <h5 class="mt-1">
 		</div>
 	</div>
 	{% endfor %}
-	<div class="d-flex align-content-start flex-wrap gap-1">
-		<div class="bg-warning-subtle rounded text-center px-2">
-			<small class="text-muted">GF</small> {% translate "Glutenfri" %}
-		</div>
-		<div class="bg-info-subtle rounded text-center px-2">
-			<small class="text-muted">NA</small> {% translate "Alkoholfri" %}
-		</div>
-	</div>
 </div>
 {% endif %}
 
@@ -211,4 +206,10 @@ <h2 id="selection">
 	{% endif %}
 {% endif %}
 
+<script>
+	// Enable tooltips
+	const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]')
+	const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl))
+</script>
+
 {% endblock %}

web/templates/about.html

@@ -106,7 +106,7 @@ <h5 class="card-title">{% translate "CVR" %}</h5>
     </div>
     <div class="card-body">
         <p class="card-text">{% translate "Vores CVR-nr er" %}:
-            <a class="common" href="https://datacvr.virk.dk/data/visenhed?enhedstype=virksomhed&id=27973647" rel="external" target="_blank">27973647 {% bs_icon 'box-arrow-up-right' size='0.75em' %}</a>.
+            <a class="common" href="https://datacvr.virk.dk/enhed/virksomhed/27973647" rel="external" target="_blank">27973647 {% bs_icon 'box-arrow-up-right' size='0.75em' %}</a>.
         </p>
     </div>
 </div>