Merge commit 'e5088bddb0ab694abac5f6d2ab2d76a5042e52bb' into feature/frontend-triptype
# Conflicts: # templates/index.html.tera
This commit is contained in:
		| @@ -7,7 +7,7 @@ | ||||
|     {{ macros::input(label='Startzeit', name='planned_starting_time', type='time', required=true) }} | ||||
|     {{ macros::input(label='Anzahl Steuerleute', name='planned_amount_cox', type='number', required=true, min='0') }} | ||||
|     {{ macros::input(label='Anzahl Ruderer (ohne Steuerperson)', name='max_people', type='number', required=true, min='0') }} | ||||
|     {{ macros::checkbox(label='Gäste erlauben', name='max_allow_guestspeople') }} | ||||
|     {{ macros::checkbox(label='Gäste erlauben', name='allow_guests') }} | ||||
|     {{ macros::input(label='Anmerkungen', name='notes', type='input') }} | ||||
|     <select name="trip_type"> | ||||
| 	      <option selected value>Reguläre Ausfahrt</option> | ||||
|   | ||||
| @@ -5,6 +5,7 @@ | ||||
|         <input class="day-js" type="hidden" name="day" value="" /> | ||||
|         {{ macros::input(label='Startzeit (zB "10:00")', name='planned_starting_time', type='time', required=true) }} | ||||
|         {{ macros::input(label='Anzahl Ruderer (ohne Steuerperson)', name='max_people', type='number', required=true, min='0') }} | ||||
|     	{{ macros::checkbox(label='Gäste erlauben', name='allow_guests') }} | ||||
|         {{ macros::input(label='Anmerkungen', name='notes', type='input') }} | ||||
| 	    <select name="trip_type"> | ||||
| 		      <option selected value>Reguläre Ausfahrt</option> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Marie Birner
					Marie Birner