Merge branch 'main' into feature/birthday-calendar

This commit is contained in:
Lennart
2025-11-04 16:28:08 +01:00
26 changed files with 589 additions and 727 deletions

View File

@@ -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>

View File

@@ -14,9 +14,11 @@
<header>
<a class="logo" href="/frontend/user">RustiCal</a>
{% block header_center %}{% endblock %}
<form method="POST" action="/frontend/logout" class="logout_form">
<button type="submit">Log out</button>
</form>
{% if self.get_user().is_some() %}
<form method="POST" action="/frontend/logout" class="logout_form">
<button type="submit">Log out</button>
</form>
{% endif %}
</header>
{% endblock %}
<div id="app">

View File

@@ -8,6 +8,7 @@
<h1>{{ name }}</h1>
{% if let Some(description) = addressbook.description %}<p>{{ description }}</p>{% endif%}
<pre>{{ addressbook|json }}</pre>
<h2>Debug information</h2>
<pre>{{ addressbook|json(2) }}</pre>
{% endblock %}

View File

@@ -5,7 +5,15 @@
{% block content %}
{% let name = calendar.meta.displayname.to_owned().unwrap_or(calendar.id.to_owned()) %}
<h1>{{ calendar.principal }}/{{ name }}</h1>
<h1>
{{ calendar.principal }}/{{ name }}
<div class="component-chips">
{% for comp in calendar.components %}
<span class="chip">{{ comp }}</span>
{% endfor %}
</div>
</h1>
{% if let Some(description) = calendar.meta.description %}<p>{{ description }}</p>{% endif%}
{% if let Some(subscription_url) = calendar.subscription_url %}
@@ -13,19 +21,7 @@
<a href="{{ subscription_url }}">{{ subscription_url }}</a>
{% endif %}
<h2>Components</h2>
<ul>
{% for comp in calendar.components %}
<li>{{ comp.as_str() }}</li>
{% endfor %}
</ul>
<h2>Timezone</h2>
{% if let Some(timezone_id) = calendar.timezone_id %}
<p>{{ timezone_id }}</p>
{% endif %}
<pre>{{ calendar|json }}</pre>
<h2>Debug information</h2>
<pre>{{ calendar|json(2) }}</pre>
{%endblock %}