mirror of
https://github.com/lennart-k/rustical.git
synced 2025-12-13 19:22:26 +00:00
Merge branch 'main' into feature/birthday-calendar
This commit is contained in:
@@ -8,9 +8,9 @@
|
||||
<span class="title">
|
||||
{%- if calendar.principal != user.id -%}{{ calendar.principal }}/{%- endif -%}
|
||||
{{ calendar.meta.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
|
||||
<div class="comps">
|
||||
<div class="component-chips">
|
||||
{% for comp in calendar.components %}
|
||||
<span>{{ comp }}</span>
|
||||
<span class="chip">{{ comp }}</span>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</span>
|
||||
@@ -56,9 +56,9 @@
|
||||
<span class="title">
|
||||
{%- if calendar.principal != user.id -%}{{ calendar.principal }}/{%- endif -%}
|
||||
{{ calendar.meta.displayname.to_owned().unwrap_or(calendar.id.to_owned()) }}
|
||||
<div class="comps">
|
||||
<div class="component-chips">
|
||||
{% for comp in calendar.components %}
|
||||
<span>{{ comp }}</span>
|
||||
<span class="chip">{{ comp }}</span>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</span>
|
||||
@@ -83,4 +83,3 @@
|
||||
{% endif %}
|
||||
<create-calendar-form user="{{ user.id }}"></create-calendar-form>
|
||||
<import-calendar-form user="{{ user.id }}"></import-calendar-form>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user