board-scheckbook #686

Merged
philipp merged 5 commits from board-scheckbook into staging 2024-08-19 12:13:02 +02:00
5 changed files with 41 additions and 38 deletions
Showing only changes of commit 116c7523d2 - Show all commits

View File

@ -2,7 +2,7 @@
secret_key = "/NtVGizglEoyoxBLzsRDWTy4oAG1qDw4J4O+CWJSv+fypD7W9sam8hUY4j90EZsbZk8wEradS5zBoWtWKi3k8w==" secret_key = "/NtVGizglEoyoxBLzsRDWTy4oAG1qDw4J4O+CWJSv+fypD7W9sam8hUY4j90EZsbZk8wEradS5zBoWtWKi3k8w=="
rss_key = "rss-key-for-ci" rss_key = "rss-key-for-ci"
limits = { file = "10 MiB", data-form = "10 MiB"} limits = { file = "10 MiB", data-form = "10 MiB"}
smtp_pw = "8kIjlLH79Ky6D3jQ" smtp_pw = "8kIjlLH79Ky6D3j"
usage_log_path = "./usage.txt" usage_log_path = "./usage.txt"
openweathermap_key = "c8dab8f91b5b815d76e9879cbaecd8d5" openweathermap_key = "c8dab8f91b5b815d76e9879cbaecd8d5"
wordpress_key = "pw-to-allow-sending-notifications" wordpress_key = "pw-to-allow-sending-notifications"

View File

@ -12,8 +12,12 @@
{% for user in schnupperanten %} {% for user in schnupperanten %}
<li class="py-1" <li class="py-1"
{% if "paid" in user.roles %}style="background-color: green;"{% endif %}> {% if "paid" in user.roles %}style="background-color: green;"{% endif %}>
{{ user.name }} ({{ user.mail }} {% if user.notes %} | {{ user.notes }}{% endif %}) {{ user.name }} ({{ user.mail }}
<a href="/admin/user/move/schnupperant/{{ user.id }}/to/scheckbuch">Zu Scheckbuch umwandeln</a> {%- if user.notes %} | {{ user.notes }}{% endif -%}
)
<a class="btn btn-primary"
href="/admin/user/move/schnupperant/{{ user.id }}/to/scheckbuch"
onclick="return confirm('Willst du wirklich ein Scheckbuch erstellen? Die Person erhält ein Mail mit allen Infos.')">Zu Scheckbuch umwandeln</a>
</li> </li>
{% endfor %} {% endfor %}
</ol> </ol>

View File

@ -4,34 +4,34 @@
{% block content %} {% block content %}
<div class="max-w-screen-lg w-full bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"> <div class="max-w-screen-lg w-full bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5">
<h1 class="h1">Scheckbücher</h1> <h1 class="h1">Scheckbücher</h1>
<form action="/admin/user/new/scheckbuch" <form action="/admin/user/new/scheckbuch"
method="post" method="post"
class="mt-4 bg-primary-900 rounded-md text-white px-3 pb-3 pt-2 sm:flex items-end justify-between"> class="mt-4 bg-primary-900 rounded-md text-white px-3 pb-3 pt-2 sm:flex items-end justify-between">
<div class="w-full"> <div class="w-full">
<h2 class="text-md font-bold mb-2 uppercase tracking-wide">Neues Scheckbuch hinzufügen</h2> <h2 class="text-md font-bold mb-2 uppercase tracking-wide">Neues Scheckbuch hinzufügen</h2>
<div class="grid md:grid-cols-3"> <div class="grid md:grid-cols-3">
<div> <div>
<label for="name" class="sr-only">Name</label> <label for="name" class="sr-only">Name</label>
<input type="text" <input type="text"
name="name" name="name"
class="relative block rounded-md border-0 py-1.5 px-2 text-gray-900 ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-primary-600 sm:text-sm sm:leading-6 mb-2 md:mb-0" class="relative block rounded-md border-0 py-1.5 px-2 text-gray-900 ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-primary-600 sm:text-sm sm:leading-6 mb-2 md:mb-0"
placeholder="Name" /> placeholder="Name" />
</div> </div>
<div> <div>
<label for="name" class="sr-only">Mail</label> <label for="name" class="sr-only">Mail</label>
<input type="mail" <input type="mail"
name="mail" name="mail"
class="relative block rounded-md border-0 py-1.5 px-2 text-gray-900 ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-primary-600 sm:text-sm sm:leading-6 mb-2 md:mb-0" class="relative block rounded-md border-0 py-1.5 px-2 text-gray-900 ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-primary-600 sm:text-sm sm:leading-6 mb-2 md:mb-0"
placeholder="Mail" /> placeholder="Mail" />
</div>
</div> </div>
</div> </div>
<div class="text-right"> </div>
<input value="Hinzufügen" <div class="text-right">
type="submit" <input value="Hinzufügen"
class="w-28 mt-2 sm:mt-0 rounded-md bg-primary-500 px-3 py-2 text-sm font-semibold text-white hover:bg-primary-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer" /> type="submit"
</div> class="w-28 mt-2 sm:mt-0 rounded-md bg-primary-500 px-3 py-2 text-sm font-semibold text-white hover:bg-primary-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer" />
</form> </div>
</form>
<!-- START filterBar --> <!-- START filterBar -->
<div class="search-wrapper"> <div class="search-wrapper">
<label for="name" class="sr-only">Suche</label> <label for="name" class="sr-only">Suche</label>

View File

@ -53,10 +53,13 @@
id="destination" id="destination"
name="destination" name="destination"
value="" value=""
data-relation="distance_in_km" data-relation="distance_in_km"
autocomplete="off" /> autocomplete="off" />
<datalist id="destinations"> <datalist id="destinations">
{% for distance in distances %}<option value="{{ distance.destination }}" distance="{{ distance.distance_in_km}}" />{% endfor %} {% for distance in distances %}
<option value="{{ distance.destination }}"
distance="{{ distance.distance_in_km }}" />
{% endfor %}
</datalist> </datalist>
</div> </div>
<div class="relative col-span-2"> <div class="relative col-span-2">

View File

@ -35,9 +35,7 @@
<div> <div>
{% if notification.link %} {% if notification.link %}
<a href="{{ notification.link }}" class="inline-block"> <a href="{{ notification.link }}" class="inline-block">
<button class="btn btn-primary" type="button"> <button class="btn btn-primary" type="button">🔗</button>
🔗
</button>
</a> </a>
{% endif %} {% endif %}
{% if not notification.read_at %} {% if not notification.read_at %}
@ -65,9 +63,7 @@
<div class="mt-1">{{ notification.message | safe }}</div> <div class="mt-1">{{ notification.message | safe }}</div>
{% if notification.link %} {% if notification.link %}
<a href="{{ notification.link }}" class="inline-block"> <a href="{{ notification.link }}" class="inline-block">
<button class="btn btn-primary" type="button"> <button class="btn btn-primary" type="button">🔗</button>
🔗
</button>
</a> </a>
{% endif %} {% endif %}
</div> </div>