Merge commit 'db3cf59d21a14ed87b6226484a1d7adb19322f64'
# Conflicts: # templates/includes/forms/log.html.tera # templates/kiosk.html.tera
| @@ -1,16 +1,16 @@ | ||||
| {% if loggedin_user.is_cox %} | ||||
| <div class="sm:col-span-2 lg:col-span-3 grid md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-5 gap-3"> | ||||
|   <button type="button" title="Toggle View" class="group btn btn-primary filter-trips-js" data-action="filter-days" id="filterdays-js" aria-pressed="false"> | ||||
|     {% include "includes/funnel-icon" %} | ||||
|     Tage mit Ausfahrten | ||||
|   </button> | ||||
|   <button type="button" title="Toggle View" class="group btn btn-primary filter-trips-js" data-action="filter-coxs" id="filtertrips-js" aria-pressed="false"> | ||||
|     {% include "includes/funnel-icon" %} | ||||
|     Steuerleute gesucht | ||||
|   </button> | ||||
|   <button type="button" title="Toggle View" class="group btn btn-primary filter-trips-js" data-action="filter-months" id="filtermonth-js" aria-pressed="false" data-month="{{ now() | date(format='%m') }}"> | ||||
|     {% include "includes/funnel-icon" %} | ||||
|     Aktuellen Monat anzeigen | ||||
|   </button> | ||||
| </div> | ||||
| {% endif %} | ||||
| 	<div class="sm:col-span-2 lg:col-span-3 grid md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-5 gap-3"> | ||||
| 		<button type="button" title="Toggle View" class="group btn btn-primary filter-trips-js" data-action="filter-days" id="filterdays-js" aria-pressed="false"> | ||||
| 			{% include "includes/funnel-icon" %} | ||||
| 			Tage mit Ausfahrten | ||||
| 		</button> | ||||
| 		<button type="button" title="Toggle View" class="group btn btn-primary filter-trips-js" data-action="filter-coxs" id="filtertrips-js" aria-pressed="false"> | ||||
| 			{% include "includes/funnel-icon" %} | ||||
| 			Steuerleute gesucht | ||||
| 		</button> | ||||
| 		<button type="button" title="Toggle View" class="group btn btn-primary filter-trips-js" data-action="filter-months" id="filtermonth-js" aria-pressed="false" data-month="{{ now() | date(format='%m') }}"> | ||||
| 			{% include "includes/funnel-icon" %} | ||||
| 			Aktuellen Monat anzeigen | ||||
| 		</button> | ||||
| 	</div> | ||||
| {% endif %} | ||||
|   | ||||
| @@ -1,4 +1,3 @@ | ||||
| <svg width="16" height="16" fill="currentColor" class="inline-block mr-1 h-3 w-3" viewBox="0 0 16 16" style="margin-top: -0.2rem;"> | ||||
|   <path | ||||
|     d="M2 2a2 2 0 0 1 2-2h8a2 2 0 0 1 2 2v13.5a.5.5 0 0 1-.777.416L8 13.101l-5.223 2.815A.5.5 0 0 1 2 15.5V2zm2-1a1 1 0 0 0-1 1v12.566l4.723-2.482a.5.5 0 0 1 .554 0L13 14.566V2a1 1 0 0 0-1-1H4z" /> | ||||
| </svg> | ||||
| <svg width="16" height="16" fill="currentColor" class="inline-block mr-1 h-3 w-3" viewbox="0 0 16 16" style="margin-top: -0.2rem;"> | ||||
| 	<path d="M2 2a2 2 0 0 1 2-2h8a2 2 0 0 1 2 2v13.5a.5.5 0 0 1-.777.416L8 13.101l-5.223 2.815A.5.5 0 0 1 2 15.5V2zm2-1a1 1 0 0 0-1 1v12.566l4.723-2.482a.5.5 0 0 1 .554 0L13 14.566V2a1 1 0 0 0-1-1H4z"/> | ||||
| </svg> | ||||
|   | ||||
| Before Width: | Height: | Size: 344 B After Width: | Height: | Size: 339 B | 
| @@ -1,6 +1,4 @@ | ||||
| <svg width="16" height="16" fill="currentColor" class="inline h-4 w-4" viewBox="0 0 16 16"> | ||||
|   <path | ||||
|     d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6z" /> | ||||
|   <path fill-rule="evenodd" | ||||
|     d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1zM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118zM2.5 3V2h11v1h-11z" /> | ||||
| </svg> | ||||
| <svg width="16" height="16" fill="currentColor" class="inline h-4 w-4" viewbox="0 0 16 16"> | ||||
| 	<path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6z"/> | ||||
| 	<path fill-rule="evenodd" d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1zM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118zM2.5 3V2h11v1h-11z"/> | ||||
| </svg> | ||||
|   | ||||
| Before Width: | Height: | Size: 551 B After Width: | Height: | Size: 540 B | 
| @@ -1,10 +1,12 @@ | ||||
| <footer class="bg-primary-950 text-white w-full flex justify-center p-3"> | ||||
|   <div class="max-w-screen-xl w-full flex justify-between"> | ||||
|     <div> | ||||
|       <span class="text-[#ff0000]">♥</span> ASKÖ Ruderverein Donau Linz | ||||
|     </div> | ||||
|     <div> | ||||
|       © {{ now() | date(format="%Y") }} | ||||
|     </div> | ||||
|   </div> | ||||
| 	<div class="max-w-screen-xl w-full flex justify-between"> | ||||
| 		<div> | ||||
| 			<span class="text-[#ff0000]">♥</span> | ||||
| 			ASKÖ Ruderverein Donau Linz | ||||
| 		</div> | ||||
| 		<div> | ||||
| 			© | ||||
| 			{{ now() | date(format="%Y") }} | ||||
| 		</div> | ||||
| 	</div> | ||||
| </footer> | ||||
|   | ||||
| @@ -1,65 +1,49 @@ | ||||
| {% macro new() %} | ||||
|   <form | ||||
|     action="/admin/boat/new" | ||||
|     method="post" | ||||
|     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"> | ||||
|       <h2 class="text-md font-bold mb-2 uppercase tracking-wide"> | ||||
|         Neues Boot hinzufügen | ||||
|       </h2> | ||||
|       {{ macros::input(label="Name", name="name", type="text", required=true) }} | ||||
|       {{ macros::input(label="Anzahl Sitze", name="amount_seats", type="number", required=true, min=1) }} | ||||
|       {{ macros::input(label="Baujahr", name="year_built", type="number", min=1950, max=2050) }} | ||||
|       {{ macros::input(label="Bootsbauer", name="boatbuilder", type="text") }} | ||||
|       {{ macros::select(data=locations, label='location', select_name='location_id', selected_id=1) }} | ||||
|       {{ macros::select(data=users, label='users', select_name='owner', default="Vereinsboot") }} | ||||
|       {{ macros::checkbox(label="Steuerperson steuert nur", name="default_shipmaster_only_steering")}} | ||||
|       {{ macros::checkbox(label="Skull", name="skull", checked=true)}} | ||||
|       {{ macros::checkbox(label="Externes Boot (anderer Verein)", name="external")}} | ||||
|     </div> | ||||
|     <div class="text-right"> | ||||
|       <input | ||||
|         value="Hinzufügen" | ||||
|         type="submit" | ||||
|         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" | ||||
|       /> | ||||
|     </div> | ||||
|   </form> | ||||
| 	<form action="/admin/boat/new" method="post" 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"> | ||||
| 			<h2 class="text-md font-bold mb-2 uppercase tracking-wide"> | ||||
| 				Neues Boot hinzufügen | ||||
| 			</h2> | ||||
| 			{{ macros::input(label="Name", name="name", type="text", required=true) }} | ||||
| 			{{ macros::input(label="Anzahl Sitze", name="amount_seats", type="number", required=true, min=1) }} | ||||
| 			{{ macros::input(label="Baujahr", name="year_built", type="number", min=1950, max=2050) }} | ||||
| 			{{ macros::input(label="Bootsbauer", name="boatbuilder", type="text") }} | ||||
| 			{{ macros::select(data=locations, label='location', select_name='location_id', selected_id=1) }} | ||||
| 			{{ macros::select(data=users, label='users', select_name='owner', default="Vereinsboot") }} | ||||
| 			{{ macros::checkbox(label="Steuerperson steuert nur", name="default_shipmaster_only_steering")}} | ||||
| 			{{ macros::checkbox(label="Skull", name="skull", checked=true)}} | ||||
| 			{{ macros::checkbox(label="Externes Boot (anderer Verein)", name="external")}} | ||||
| 		</div> | ||||
| 		<div class="text-right"> | ||||
| 			<input value="Hinzufügen" type="submit" 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"/> | ||||
| 		</div> | ||||
| 	</form> | ||||
| {% endmacro new %} | ||||
|  | ||||
|  | ||||
| {% macro edit(boat, uuid) %} | ||||
|   <form | ||||
|       action="/admin/boat" | ||||
|       data-filterable="true" | ||||
|       method="post" | ||||
|       class="bg-white p-3 rounded-md flex items-end md:items-center justify-between" | ||||
|     > | ||||
|       <div class="w-full"> | ||||
|         <input type="hidden" name="id" value="{{ boat.id }}" /> | ||||
|         <div class="font-bold mb-1">{{ boat.name }}<br /></div> | ||||
|         <div class="grid md:grid-cols-3"> | ||||
|           {{ macros::input(label='Name', name='name', type='text', value=boat.name) }} | ||||
|           {{ macros::input(label='Amount Seats', name='amount_seats', type='number', min=0, value=boat.amount_seats) }} | ||||
|           {{ macros::select(data=locations, label='location', select_name='location_id', selected_id=boat.location_id) }} | ||||
|           {{ macros::select(data=users, label='users', select_name='owner', selected_id=boat.owner, default="Vereinsboot") }} | ||||
|           {{ macros::input(label='Baujahr', name='year_built', type='number', min=1950, value=boat.year_built) }} | ||||
|           {{ macros::input(label='Bootsbauer', name='boatbuilder', type='text', value=boat.boatbuilder) }} | ||||
|           {{ macros::checkbox(label='default_shipmaster_only_steering', name='default_shipmaster_only_steering', id=uuid , checked=boat.default_shipmaster_only_steering) }} | ||||
|           {{ macros::checkbox(label='skull', name='skull', id=uuid , checked=boat.skull) }} | ||||
|           {{ macros::checkbox(label='external', name='external', id=uuid , checked=boat.external) }} | ||||
|         </div> | ||||
|       </div> | ||||
|       <div class="grid gap-3"> | ||||
|         <a | ||||
|           href="/admin/boat/{{ boat.id }}/delete" | ||||
|           class="inline-block btn btn-alert" | ||||
|           onclick="return confirm('Wirklich löschen?');" | ||||
|         > | ||||
|           {% include "includes/delete-icon" %} Löschen | ||||
|         </a> | ||||
|         <input value="Ändern" type="submit" class="w-28 btn btn-primary" /> | ||||
|       </div> | ||||
|     </form> | ||||
| 	<form action="/admin/boat" data-filterable="true" method="post" class="bg-white p-3 rounded-md flex items-end md:items-center justify-between"> | ||||
| 		<div class="w-full"> | ||||
| 			<input type="hidden" name="id" value="{{ boat.id }}"/> | ||||
| 			<div class="font-bold mb-1">{{ boat.name }}<br/></div> | ||||
| 			<div class="grid md:grid-cols-3"> | ||||
| 				{{ macros::input(label='Name', name='name', type='text', value=boat.name) }} | ||||
| 				{{ macros::input(label='Amount Seats', name='amount_seats', type='number', min=0, value=boat.amount_seats) }} | ||||
| 				{{ macros::select(data=locations, label='location', select_name='location_id', selected_id=boat.location_id) }} | ||||
| 				{{ macros::select(data=users, label='users', select_name='owner', selected_id=boat.owner, default="Vereinsboot") }} | ||||
| 				{{ macros::input(label='Baujahr', name='year_built', type='number', min=1950, value=boat.year_built) }} | ||||
| 				{{ macros::input(label='Bootsbauer', name='boatbuilder', type='text', value=boat.boatbuilder) }} | ||||
| 				{{ macros::checkbox(label='default_shipmaster_only_steering', name='default_shipmaster_only_steering', id=uuid , checked=boat.default_shipmaster_only_steering) }} | ||||
| 				{{ macros::checkbox(label='skull', name='skull', id=uuid , checked=boat.skull) }} | ||||
| 				{{ macros::checkbox(label='external', name='external', id=uuid , checked=boat.external) }} | ||||
| 			</div> | ||||
| 		</div> | ||||
| 		<div class="grid gap-3"> | ||||
| 			<a href="/admin/boat/{{ boat.id }}/delete" class="inline-block btn btn-alert" onclick="return confirm('Wirklich löschen?');"> | ||||
| 				{% include "includes/delete-icon" %} | ||||
| 				Löschen | ||||
| 			</a> | ||||
| 			<input value="Ändern" type="submit" class="w-28 btn btn-primary"/> | ||||
| 		</div> | ||||
| 	</form> | ||||
| {% endmacro edit %} | ||||
|   | ||||
| @@ -1,3 +1,3 @@ | ||||
| <svg width="16" height="16" fill="currentColor" class="inline h-4 w-4 text-primary-300 group-hover:text-primary-400 mr-2"  viewBox="0 0 16 16" style="margin-top: -0.2rem">  | ||||
|   <path d="M1.5 1.5A.5.5 0 0 1 2 1h12a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-.128.334L10 8.692V13.5a.5.5 0 0 1-.342.474l-3 1A.5.5 0 0 1 6 14.5V8.692L1.628 3.834A.5.5 0 0 1 1.5 3.5v-2z"/>  | ||||
| </svg> | ||||
| <svg width="16" height="16" fill="currentColor" class="inline h-4 w-4 text-primary-300 group-hover:text-primary-400 mr-2" viewbox="0 0 16 16" style="margin-top: -0.2rem"> | ||||
| 	<path d="M1.5 1.5A.5.5 0 0 1 2 1h12a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-.128.334L10 8.692V13.5a.5.5 0 0 1-.342.474l-3 1A.5.5 0 0 1 6 14.5V8.692L1.628 3.834A.5.5 0 0 1 1.5 3.5v-2z"/> | ||||
| </svg> | ||||
|   | ||||
| Before Width: | Height: | Size: 357 B After Width: | Height: | Size: 354 B | 
| @@ -1,3 +1,3 @@ | ||||
| <svg class="h-5 w-5 text-primary-300 group-hover:text-primary-400" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true"> | ||||
|   <path fill-rule="evenodd" d="M10 1a4.5 4.5 0 00-4.5 4.5V9H5a2 2 0 00-2 2v6a2 2 0 002 2h10a2 2 0 002-2v-6a2 2 0 00-2-2h-.5V5.5A4.5 4.5 0 0010 1zm3 8V5.5a3 3 0 10-6 0V9h6z" clip-rule="evenodd" /> | ||||
| <svg class="h-5 w-5 text-primary-300 group-hover:text-primary-400" viewbox="0 0 20 20" fill="currentColor" aria-hidden="true"> | ||||
| 	<path fill-rule="evenodd" d="M10 1a4.5 4.5 0 00-4.5 4.5V9H5a2 2 0 00-2 2v6a2 2 0 002 2h10a2 2 0 002-2v-6a2 2 0 00-2-2h-.5V5.5A4.5 4.5 0 0010 1zm3 8V5.5a3 3 0 10-6 0V9h6z" clip-rule="evenodd"/> | ||||
| </svg> | ||||
|   | ||||
| Before Width: | Height: | Size: 330 B After Width: | Height: | Size: 328 B | 
| @@ -1,112 +1,125 @@ | ||||
| {% macro header(loggedin_user) %} | ||||
|     <header class="bg-primary-900 text-white flex justify-center p-3 fixed w-full z-10"> | ||||
|       <div class="max-w-screen-xl w-full flex justify-between items-center"> | ||||
|         <div> | ||||
|           <a href="/"> | ||||
|             Hü {{ loggedin_user.name }} | ||||
|           </a> | ||||
|         </div> | ||||
| 	<header class="bg-primary-900 text-white flex justify-center p-3 fixed w-full z-10"> | ||||
| 		<div class="max-w-screen-xl w-full flex justify-between items-center"> | ||||
| 			<div> | ||||
| 				<a href="/"> | ||||
| 					Hü | ||||
| 					{{ loggedin_user.name }} | ||||
| 				</a> | ||||
| 			</div> | ||||
|  | ||||
|         <div> | ||||
|             <a href="/faq" class="inline-flex justify-center rounded-md bg-primary-600 mx-1 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"> | ||||
|               {% include "includes/question-icon" %} | ||||
|               <span class="sr-only">FAQs</span> | ||||
|             </a> | ||||
|             {% if loggedin_user.is_admin %} | ||||
|             <a href="/stat" class="inline-flex justify-center rounded-md bg-primary-600 mx-1 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"> | ||||
| 	  	STATS  | ||||
|               <span class="sr-only">Logbuch</span> | ||||
|             </a> | ||||
|             <a href="/log/show" class="inline-flex justify-center rounded-md bg-primary-600 mx-1 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"> | ||||
| 	  	LOGBUCH HISTORY | ||||
|               <span class="sr-only">Logbuch History</span> | ||||
|             </a> | ||||
|             <a href="/log" class="inline-flex justify-center rounded-md bg-primary-600 mx-1 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"> | ||||
| 	   LOGBUCH  | ||||
|               <span class="sr-only">Logbuch</span> | ||||
|             </a> | ||||
|             <a href="/admin/boat" class="inline-flex justify-center rounded-md bg-primary-600 mx-1 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"> | ||||
| 	    BOATS | ||||
|               <span class="sr-only">Bootsverwaltung</span> | ||||
|             </a> | ||||
| 			<div> | ||||
| 				<a href="/faq" class="inline-flex justify-center rounded-md bg-primary-600 mx-1 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"> | ||||
| 					{% include "includes/question-icon" %} | ||||
| 					<span class="sr-only">FAQs</span> | ||||
| 				</a> | ||||
| 				{% if loggedin_user.is_admin %} | ||||
| 					<a href="/stat" class="inline-flex justify-center rounded-md bg-primary-600 mx-1 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"> | ||||
| 						STATS | ||||
| 						<span class="sr-only">Logbuch</span> | ||||
| 					</a> | ||||
| 					<a href="/log/show" class="inline-flex justify-center rounded-md bg-primary-600 mx-1 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"> | ||||
| 						LOGBUCH HISTORY | ||||
| 						<span class="sr-only">Logbuch History</span> | ||||
| 					</a> | ||||
| 					<a href="/log" class="inline-flex justify-center rounded-md bg-primary-600 mx-1 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"> | ||||
| 						LOGBUCH | ||||
| 						<span class="sr-only">Logbuch</span> | ||||
| 					</a> | ||||
| 					<a href="/admin/boat" class="inline-flex justify-center rounded-md bg-primary-600 mx-1 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"> | ||||
| 						BOATS | ||||
| 						<span class="sr-only">Bootsverwaltung</span> | ||||
| 					</a> | ||||
|  | ||||
|  | ||||
|             <a href="/admin/user" class="inline-flex justify-center rounded-md bg-primary-600 mx-1 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"> | ||||
|               <svg class="inline h-4" width="16" height="16" fill="currentColor" class="bi bi-person-lines-fill" viewBox="0 0 16 16"> <path d="M6 8a3 3 0 1 0 0-6 3 3 0 0 0 0 6zm-5 6s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H1zM11 3.5a.5.5 0 0 1 .5-.5h4a.5.5 0 0 1 0 1h-4a.5.5 0 0 1-.5-.5zm.5 2.5a.5.5 0 0 0 0 1h4a.5.5 0 0 0 0-1h-4zm2 3a.5.5 0 0 0 0 1h2a.5.5 0 0 0 0-1h-2zm0 3a.5.5 0 0 0 0 1h2a.5.5 0 0 0 0-1h-2z"/> </svg> | ||||
|               <span class="sr-only">Userverwaltung</span> | ||||
|             </a> | ||||
|           {% endif %} | ||||
|           <a href="/auth/logout" class="inline-flex justify-center rounded-md bg-primary-600 ml-1 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"> | ||||
|             <svg class="inline h-4" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-log-out"><path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"></path><polyline points="16 17 21 12 16 7"></polyline><line x1="21" y1="12" x2="9" y2="12"></line></svg> | ||||
|             <span class="sr-only">Ausloggen</span> | ||||
|           </a> | ||||
|         </div> | ||||
|       </div> | ||||
|     </header> | ||||
|     <div class="h-8"></div> | ||||
| 					<a href="/admin/user" class="inline-flex justify-center rounded-md bg-primary-600 mx-1 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"> | ||||
| 						<svg class="inline h-4" width="16" height="16" fill="currentColor" class="bi bi-person-lines-fill" viewbox="0 0 16 16"> | ||||
| 							<path d="M6 8a3 3 0 1 0 0-6 3 3 0 0 0 0 6zm-5 6s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H1zM11 3.5a.5.5 0 0 1 .5-.5h4a.5.5 0 0 1 0 1h-4a.5.5 0 0 1-.5-.5zm.5 2.5a.5.5 0 0 0 0 1h4a.5.5 0 0 0 0-1h-4zm2 3a.5.5 0 0 0 0 1h2a.5.5 0 0 0 0-1h-2zm0 3a.5.5 0 0 0 0 1h2a.5.5 0 0 0 0-1h-2z"/> | ||||
| 						</svg> | ||||
| 						<span class="sr-only">Userverwaltung</span> | ||||
| 					</a> | ||||
| 				{% endif %} | ||||
| 				<a href="/auth/logout" class="inline-flex justify-center rounded-md bg-primary-600 ml-1 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"> | ||||
| 					<svg class="inline h-4" width="24" height="24" viewbox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-log-out"> | ||||
| 						<path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"></path> | ||||
| 						<polyline points="16 17 21 12 16 7"></polyline> | ||||
| 						<line x1="21" y1="12" x2="9" y2="12"></line> | ||||
| 					</svg> | ||||
| 					<span class="sr-only">Ausloggen</span> | ||||
| 				</a> | ||||
| 			</div> | ||||
| 		</div> | ||||
| 	</header> | ||||
| 	<div class="h-8"></div> | ||||
| {% endmacro header %} | ||||
|  | ||||
| {% macro input(label, name, type, required=false, class='rounded-md', value='', min='', hide_label=false, id='', autofocus=false, wrapper_class='') %} | ||||
| <div class="{{wrapper_class}}"> | ||||
|   <label for="{{ name }}" class="{% if hide_label %} sr-only {% else %} small text-gray-600 {% endif %}">{{ label }}</label> | ||||
|   <input {% if id %} id="{{ id }}" {% else %} id="{{ name }}" {% endif %} name="{{ name }}" type="{{ type }}" {% if required %} required {% endif %} value="{{ value }}" class="input {{ class }}" placeholder="{% if hide_label %}{{ label }}{% endif %}" {% if min %} min="{{ min }}" {% endif %}{% if autofocus %}autofocus {% endif %}> | ||||
| </div> | ||||
| 	<div class="{{wrapper_class}}"> | ||||
| 		<label for="{{ name }}" class="{% if hide_label %} sr-only {% else %} small text-gray-600 {% endif %}">{{ label }}</label> | ||||
| 		<input {% if id %} id="{{ id }}" {% else %} id="{{ name }}" {% endif %} name="{{ name }}" type="{{ type }}" {% if required %} required {% endif %} value="{{ value }}" class="input {{ class }}" placeholder="{% if hide_label %}{{ label }}{% endif %}" {% if min %} min="{{ min }}" {% endif %} {% if autofocus %} autofocus {% endif %}> | ||||
| 	</div> | ||||
| {% endmacro input %} | ||||
|  | ||||
| {% macro checkbox(label, name, id='', checked=false, class='') %} | ||||
|   <label for="{{ name }}{{ id }}" class="flex items-center cursor-pointer hover:text-gray-900 {{ class }}"> | ||||
|     <input type="checkbox" id="{{ name }}{{ id }}" name="{{ name }}"  {% if checked %} checked {% endif %}  class="h-4 w-4 accent-primary-600 mr-2"/> {{ label }} | ||||
|   </label> | ||||
| 	<label for="{{ name }}{{ id }}" class="flex items-center cursor-pointer hover:text-gray-900 {{ class }}"> | ||||
| 		<input type="checkbox" id="{{ name }}{{ id }}" name="{{ name }}" {% if checked %} checked {% endif %} class="h-4 w-4 accent-primary-600 mr-2"/> | ||||
| 		{{ label }} | ||||
| 	</label> | ||||
| {% endmacro checkbox %} | ||||
|  | ||||
| {% macro select(data, select_name='trip_type', default='', selected_id='', display='', extras='', class='') %} | ||||
|   {% if display == '' %} | ||||
|     {% set display = ["name"] %} | ||||
|   {% endif %} | ||||
|   <select name="{{ select_name }}" id="{{ select_name }}" class="input rounded-md h-10 {{ class }}"> | ||||
|     {% if default %} | ||||
| 	    <option selected value>{{ default }}</option> | ||||
|     {% endif %} | ||||
|     {% for d in data %} | ||||
|           <option value="{{ d.id }}" {% if d.id == selected_id %} selected {% endif %}{% if extras != '' %}{% for extra in extras %} extra-{{extra}}={{d[extra]}} {% endfor %}{% endif %}> | ||||
|           {% for displa in display -%} | ||||
|               {%- if d[displa] -%} | ||||
|                   {{- d[displa] -}} | ||||
|               {%- else -%} | ||||
|                   {{- displa -}} | ||||
|               {%- endif -%} | ||||
|           {%- endfor %} | ||||
| 	</option> | ||||
|     {% endfor %} | ||||
|   </select> | ||||
| 	{% if display == '' %} | ||||
| 		{% set display = ["name"] %} | ||||
| 	{% endif %} | ||||
| 	<select name="{{ select_name }}" id="{{ select_name }}" class="input rounded-md h-10 {{ class }}"> | ||||
| 		{% if default %} | ||||
| 			<option selected value>{{ default }}</option> | ||||
| 		{% endif %} | ||||
| 		{% for d in data %} | ||||
| 			<option value="{{ d.id }}" {% if d.id == selected_id %} selected {% endif %} {% if extras != '' %} {% for extra in extras %} extra- {{extra}}={{d[extra]}} {% endfor %} {% endif %}> | ||||
| 				{% for displa in display -%} | ||||
| 					{%- if d[displa] -%} | ||||
| 						{{- d[displa] -}} | ||||
| 					{%- else -%} | ||||
| 						{{- displa -}} | ||||
| 					{%- endif -%} | ||||
| 				{%- endfor %} | ||||
| 			</option> | ||||
| 		{% endfor %} | ||||
| 	</select> | ||||
| {% endmacro select %} | ||||
|  | ||||
|  | ||||
|  | ||||
| {% macro alert(message, type, class='') %} | ||||
| <div class="{{ class }} alert-{{ type }} text-white px-3 py-1 rounded-md text-center"> | ||||
|   {{ message }} | ||||
| </div> | ||||
| 	<div class="{{ class }} alert-{{ type }} text-white px-3 py-1 rounded-md text-center"> | ||||
| 		{{ message }} | ||||
| 	</div> | ||||
| {% endmacro alert %} | ||||
|  | ||||
| {% macro box(participants, empty_seats='', header='Freie Plätze:', text='Keine Ruderer angemeldet', bg='primary-600', color='white') %} | ||||
| <div class="text-{{ color }} bg-{{ bg }} text-center p-1 mt-1 rounded-t-md">{{ header }} {{ empty_seats }}</div> | ||||
| <div class="p-2 border border-t-0 border-{{ bg }} mb-4 rounded-b-md"> | ||||
|   {% if participants | length > 0 %} | ||||
|     {% for rower in participants %} | ||||
|       {{ rower.name }} {% if rower.is_guest %} <small class="text-gray-600">(Gast)</small> {% endif %}<span class="hidden">(angemeldet seit {{ rower.registered_at }})</span><br /> | ||||
|     {% endfor %} | ||||
|   {% else %} | ||||
|     {{ text }} | ||||
|   {% endif %} | ||||
| </div> | ||||
| 	<div class="text-{{ color }} bg-{{ bg }} text-center p-1 mt-1 rounded-t-md">{{ header }} | ||||
| 		{{ empty_seats }}</div> | ||||
| 	<div class="p-2 border border-t-0 border-{{ bg }} mb-4 rounded-b-md"> | ||||
| 		{% if participants | length > 0 %} | ||||
| 			{% for rower in participants %} | ||||
| 				{{ rower.name }} | ||||
| 				{% if rower.is_guest %} | ||||
| 					<small class="text-gray-600">(Gast)</small> | ||||
| 				{% endif %} | ||||
| 				<span class="hidden">(angemeldet seit | ||||
| 					{{ rower.registered_at }})</span><br/> | ||||
| 			{% endfor %} | ||||
| 		{% else %} | ||||
| 			{{ text }} | ||||
| 		{% endif %} | ||||
| 	</div> | ||||
| {% endmacro box %} | ||||
|  | ||||
| {% macro faq(question, answer) %} | ||||
| <div> | ||||
|   <h2 class="flex mb-4 text-lg font-bold text-primary-900"> | ||||
|     {{ question }} | ||||
|   </h2> | ||||
|   <p class="text-primary-950">{{ answer | safe }}</p> | ||||
| </div> | ||||
| 	<div> | ||||
| 		<h2 class="flex mb-4 text-lg font-bold text-primary-900"> | ||||
| 			{{ question }} | ||||
| 		</h2> | ||||
| 		<p class="text-primary-950">{{ answer | safe }}</p> | ||||
| 	</div> | ||||
| {% endmacro faq %} | ||||
|   | ||||
| @@ -1,3 +1,3 @@ | ||||
| <svg class="inline h-5 w-5" width="16" height="16" fill="currentColor" class="bi bi-plus" viewBox="0 0 16 16">  | ||||
|   <path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z"/>  | ||||
| <svg class="inline h-5 w-5" width="16" height="16" fill="currentColor" class="bi bi-plus" viewbox="0 0 16 16"> | ||||
| 	<path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z"/> | ||||
| </svg> | ||||
|   | ||||
| Before Width: | Height: | Size: 236 B After Width: | Height: | Size: 233 B | 
| @@ -1 +1,3 @@ | ||||
| <svg class="flex-shrink-0 w-4 h-4 inline-block" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-8-3a1 1 0 00-.867.5 1 1 0 11-1.731-1A3 3 0 0113 8a3.001 3.001 0 01-2 2.83V11a1 1 0 11-2 0v-1a1 1 0 011-1 1 1 0 100-2zm0 8a1 1 0 100-2 1 1 0 000 2z" clip-rule="evenodd"></path></svg> | ||||
| <svg class="flex-shrink-0 w-4 h-4 inline-block" fill="currentColor" viewbox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"> | ||||
| 	<path fill-rule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-8-3a1 1 0 00-.867.5 1 1 0 11-1.731-1A3 3 0 0113 8a3.001 3.001 0 01-2 2.83V11a1 1 0 11-2 0v-1a1 1 0 011-1 1 1 0 100-2zm0 8a1 1 0 100-2 1 1 0 000 2z" clip-rule="evenodd"></path> | ||||
| </svg> | ||||
|   | ||||
| Before Width: | Height: | Size: 370 B After Width: | Height: | Size: 373 B | 
 Marie Birner
					Marie Birner