From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 21 Oct 2023 16:19:54 +0000 (+0000)
Subject: Merge remote-tracking branch 'rico/new-design' into new-design
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ad196e7402c4133fd5c90196432ba920f2cee58;p=ipfire.org.git

Merge remote-tracking branch 'rico/new-design' into new-design
---

0ad196e7402c4133fd5c90196432ba920f2cee58
diff --cc src/templates/donate/donate.html
index ab2d610f,2297d77c..86bb9f9b
--- a/src/templates/donate/donate.html
+++ b/src/templates/donate/donate.html
@@@ -166,48 -170,55 +170,62 @@@
  
  						<div class="columns">
  							<div class="column">
- 								<input type="text" class="input" name="first_name"
- 									placeholder="{{ _("First Name" )}}" required
- 									{% if current_user %}value="{{ current_user.first_name }}"{% end %}>
+ 								<div class="control">
+ 									<input type="text" class="input" name="first_name"
+ 										placeholder="{{ _("First Name" )}}" required
 -										{% if first_name %}value="{{ first_name }}"{% end %}>
++										{% if current_user %}value="{{ current_user.first_name }}"{% end %}>
+ 								</div>
  							</div>
  
  							<div class="column">
- 								<input type="text" class="input" name="last_name"
- 									placeholder="{{ _("Last Name" )}}" required
- 									{% if current_user %}value="{{ current_user.last_name }}"{% end %}>
+ 								<div class="control">
+ 									<input type="text" class="input" name="last_name"
+ 										placeholder="{{ _("Last Name" )}}" required
 -										{% if last_name %}value="{{ last_name }}"{% end %}>
++										{% if current_user %}value="{{ current_user.last_name }}"{% end %}>
+ 								</div>
  							</div>
  						</div>
  
  						<div class="block">
+ 							<div class="control">
  								<input type="email" class="input" name="email"
 -									placeholder="{{ _("Email Address") }}" required>
 +									placeholder="{{ _("Email Address") }}" required
 +									{% if current_user %}value="{{ current_user.email }}"{% end %}>
+ 							</div>
  						</div>
  
 +						{% set lines = current_user.street.splitlines() if current_user else [] %}
 +
  						<div class="block">
- 							<input type="text" class="input" name="street1"
- 								placeholder="{{ _("Address Line 1") }}" required
- 								{% if lines %}value="{{ lines[0] }}"{% end %}>
+ 							<div class="control">
+ 								<input type="text" class="input" name="street1"
 -									placeholder="{{ _("Address Line 1") }}" required>
++									placeholder="{{ _("Address Line 1") }}" required
++									{% if lines %}value="{{ lines[0] }}"{% end %}>
+ 							</div>
  						</div>
  
  						<div class="block">
- 							<input type="text" class="input" name="street2"
- 								placeholder="{{ _("Address Line 2") }}"
- 								{% if lines and len(lines) > 1 %}value="{{ lines[1] }}"{% end %}>
+ 							<div class="control">
+ 								<input type="text" class="input" name="street2"
 -									placeholder="{{ _("Address Line 2") }}">
++									placeholder="{{ _("Address Line 2") }}"
++									{% if lines and len(lines) > 1 %}value="{{ lines[1] }}"{% end %}>
+ 							</div>
  						</div>
  
  						<div class="columns">
  							<div class="column">
- 								<input type="text" class="input" name="city"
- 									placeholder="{{ _("City") }}" required
- 									{% if current_user %}value="{{ current_user.city }}"{% end %}>
+ 								<div class="control">
+ 									<input type="text" class="input" name="city"
 -										placeholder="{{ _("City") }}" required>
++										placeholder="{{ _("City") }}" required
++										{% if current_user %}value="{{ current_user.city }}"{% end %}>
+ 								</div>
  							</div>
  							<div class="column">
- 								<input type="text" class="input" name="post_code"
- 									placeholder="{{ _("Post Code") }}" required
- 									{% if current_user %}value="{{ current_user.postal_code }}"{% end %}>
+ 								<div class="control">
+ 									<input type="text" class="input" name="post_code"
 -										placeholder="{{ _("Post Code") }}" required>
++										placeholder="{{ _("Post Code") }}" required
++										{% if current_user %}value="{{ current_user.postal_code }}"{% end %}>
+ 								</div>
  							</div>
  						</div>