fix: minor ui issues
This commit is contained in:
parent
44c6cddf52
commit
4d1ffa206c
@ -8,7 +8,7 @@ snapshot_kind: text
|
|||||||
|
|
||||||
<form hx-post="/availability/new" hx-target="body"
|
<form hx-post="/availability/new" hx-target="body"
|
||||||
hx-target-422="#error">
|
hx-target-422="#error">
|
||||||
<h1 class="title">Neue Vefügbarkeit für Mittwoch, 01.01.2025</h1>
|
<h1 class="title">Neue Verfügbarkeit für Mittwoch, 01.01.2025</h1>
|
||||||
|
|
||||||
<input type="hidden" name="startdate" value="2025-01-01">
|
<input type="hidden" name="startdate" value="2025-01-01">
|
||||||
<input type="hidden" name="enddate" value="2025-01-01" id="enddate">
|
<input type="hidden" name="enddate" value="2025-01-01" id="enddate">
|
||||||
|
@ -10,7 +10,7 @@ use crate::{
|
|||||||
mail::Mailer,
|
mail::Mailer,
|
||||||
utils::{
|
utils::{
|
||||||
ApplicationError,
|
ApplicationError,
|
||||||
DateTimeFormat::{DayMonthYear, WeekdayDayMonthYear},
|
DateTimeFormat::{DayMonthYear, HourMinute, WeekdayDayMonthYear},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -24,8 +24,8 @@ du wurdest soeben f=C3=BCr die Veranstaltung Wave Gotik Treffen am Sonntag,=
|
|||||||
Hier die Infos zur Veranstaltung:
|
Hier die Infos zur Veranstaltung:
|
||||||
- Name: Wave Gotik Treffen
|
- Name: Wave Gotik Treffen
|
||||||
- Ort: agra Messe Leipzig
|
- Ort: agra Messe Leipzig
|
||||||
- Beginn: 2025-06-01 18:30:00
|
- Beginn: 18:30 Uhr
|
||||||
- Ende: 2025-06-02 04:00:00
|
- Ende: 04:00 Uhr
|
||||||
- Kleidungsordnung: komplette PSA
|
- Kleidungsordnung: komplette PSA
|
||||||
- Anmerkungen: Anfahrt Bereitstellungsraum =C3=BCber xyz...
|
- Anmerkungen: Anfahrt Bereitstellungsraum =C3=BCber xyz...
|
||||||
|
|
||||||
@ -45,9 +45,9 @@ ag, 01.06.2025 als Posten eingeteilt.</p>
|
|||||||
|
|
||||||
<ul>
|
<ul>
|
||||||
<li>Name: Wave Gotik Treffen</li>
|
<li>Name: Wave Gotik Treffen</li>
|
||||||
<li>- Ort: agra Messe Leipzig</li>
|
<li>Ort: agra Messe Leipzig</li>
|
||||||
<li>Beginn: 2025-06-01 18:30:00</li>
|
<li>Beginn: 18:30 Uhr</li>
|
||||||
<li>Ende: 2025-06-02 04:00:00</li>
|
<li>Ende: 04:00 Uhr</li>
|
||||||
<li>Kleidungsordnung: komplette PSA</li>
|
<li>Kleidungsordnung: komplette PSA</li>
|
||||||
<li>Anmerkungen: Anfahrt Bereitstellungsraum =C3=BCber xyz...</li>
|
<li>Anmerkungen: Anfahrt Bereitstellungsraum =C3=BCber xyz...</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
{% let is_edit = id.is_some() %}
|
{% let is_edit = id.is_some() %}
|
||||||
<form hx-post="/availability/{% if is_edit %}edit/{{ id.unwrap() }}{% else %}new{% endif %}" hx-target="body"
|
<form hx-post="/availability/{% if is_edit %}edit/{{ id.unwrap() }}{% else %}new{% endif %}" hx-target="body"
|
||||||
hx-target-422="#error">
|
hx-target-422="#error">
|
||||||
<h1 class="title">{% if is_edit %}Bearbeite{% else %}Neue{% endif %} Vefügbarkeit für {{
|
<h1 class="title">{% if is_edit %}Bearbeite{% else %}Neue{% endif %} Verfügbarkeit für {{
|
||||||
date|fmt_date(WeekdayDayMonthYear) }}</h1>
|
date|fmt_date(WeekdayDayMonthYear) }}</h1>
|
||||||
|
|
||||||
<input type="hidden" name="startdate" value="{{ date }}">
|
<input type="hidden" name="startdate" value="{{ date }}">
|
||||||
|
@ -274,12 +274,14 @@
|
|||||||
</div>
|
</div>
|
||||||
{% if selected_area.is_none() || selected_area.unwrap() == user.area_id %}
|
{% if selected_area.is_none() || selected_area.unwrap() == user.area_id %}
|
||||||
<div class="level-right">
|
<div class="level-right">
|
||||||
|
{% if user.role == Role::Admin || user.role == Role::AreaManager %}
|
||||||
<a class="button is-link is-outlined" href="/availability/new-other?date={{ date }}">
|
<a class="button is-link is-outlined" href="/availability/new-other?date={{ date }}">
|
||||||
<svg class="icon">
|
<svg class="icon">
|
||||||
<use href="/static/feather-sprite.svg#plus-circle" />
|
<use href="/static/feather-sprite.svg#plus-circle" />
|
||||||
</svg>
|
</svg>
|
||||||
<span>Neue Verfügbarkeit für anderen Nutzer</span>
|
<span>Neue Verfügbarkeit für anderen Nutzer</span>
|
||||||
</a>
|
</a>
|
||||||
|
{% endif %}
|
||||||
{% let btn_disabled = !user_can_create_availability %}
|
{% let btn_disabled = !user_can_create_availability %}
|
||||||
<a class="button is-link is-light" href="/availability/new?date={{ date }}" {{
|
<a class="button is-link is-light" href="/availability/new?date={{ date }}" {{
|
||||||
btn_disabled|cond_show("disabled") }}>
|
btn_disabled|cond_show("disabled") }}>
|
||||||
|
@ -7,8 +7,8 @@
|
|||||||
<ul>
|
<ul>
|
||||||
<li>Name: {{ event.name }}</li>
|
<li>Name: {{ event.name }}</li>
|
||||||
<li>Ort: {{ event.location.as_ref().unwrap().name }}</li>
|
<li>Ort: {{ event.location.as_ref().unwrap().name }}</li>
|
||||||
<li>Beginn: {{ event.start }}</li>
|
<li>Beginn: {{ event.start|fmt_datetime(HourMinute) }} Uhr</li>
|
||||||
<li>Ende: {{ event.end }}</li>
|
<li>Ende: {{ event.end|fmt_datetime(HourMinute) }} Uhr</li>
|
||||||
<li>Kleidungsordnung: {{ event.clothing.name }}</li>
|
<li>Kleidungsordnung: {{ event.clothing.name }}</li>
|
||||||
{% if let Some(note) = event.note %}<li>Anmerkungen: {{ note }}</li>{% endif %}
|
{% if let Some(note) = event.note %}<li>Anmerkungen: {{ note }}</li>{% endif %}
|
||||||
</ul>
|
</ul>
|
||||||
|
@ -5,8 +5,8 @@ du wurdest soeben für die Veranstaltung {{ event.name }} am {{ event.start|fmt_
|
|||||||
Hier die Infos zur Veranstaltung:
|
Hier die Infos zur Veranstaltung:
|
||||||
- Name: {{ event.name }}
|
- Name: {{ event.name }}
|
||||||
- Ort: {{ event.location.as_ref().unwrap().name }}
|
- Ort: {{ event.location.as_ref().unwrap().name }}
|
||||||
- Beginn: {{ event.start }}
|
- Beginn: {{ event.start|fmt_datetime(HourMinute) }} Uhr
|
||||||
- Ende: {{ event.end }}
|
- Ende: {{ event.end|fmt_datetime(HourMinute) }} Uhr
|
||||||
- Kleidungsordnung: {{ event.clothing.name }}
|
- Kleidungsordnung: {{ event.clothing.name }}
|
||||||
{% if let Some(note) = event.note %}- Anmerkungen: {{ note }}{% endif %}
|
{% if let Some(note) = event.note %}- Anmerkungen: {{ note }}{% endif %}
|
||||||
|
|
||||||
|
@ -40,6 +40,7 @@
|
|||||||
<h5 class="title is-5">Bereich {{ gl.0.name }}</h5>
|
<h5 class="title is-5">Bereich {{ gl.0.name }}</h5>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{% if user.role == Role::Admin %}
|
||||||
<div class="level-item buttons are-small">
|
<div class="level-item buttons are-small">
|
||||||
<a class="button is-primary is-light" hx-boost="true" href="/area/edit/{{ gl.0.id }}">
|
<a class="button is-primary is-light" hx-boost="true" href="/area/edit/{{ gl.0.id }}">
|
||||||
<svg class="icon">
|
<svg class="icon">
|
||||||
@ -53,6 +54,7 @@
|
|||||||
</svg>
|
</svg>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user