From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 27 Nov 2024 13:42:18 +0000 (+0000)
Subject: users: Add control wrappers around control elements
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a268113cf9c9404e352b6b437958ca6be8af639b;p=ipfire.org.git

users: Add control wrappers around control elements

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/templates/users/edit.html b/src/templates/users/edit.html
index 775f7faa..40c129a0 100644
--- a/src/templates/users/edit.html
+++ b/src/templates/users/edit.html
@@ -50,8 +50,10 @@
 								<div class="field">
 									<label class="label">{{ _("First Name") }}</label>
 
-									<input type="text" class="input" name="first_name"
-										placeholder="{{ _("First Name") }}" value="{{ account.first_name }}" required>
+									<div class="control">
+										<input type="text" class="input" name="first_name"
+											placeholder="{{ _("First Name") }}" value="{{ account.first_name }}" required>
+									</div>
 								</div>
 							</div>
 
@@ -59,8 +61,10 @@
 								<div class="field">
 									<label class="label">{{ _("Last Name") }}</label>
 
-									<input type="text" class="input" name="last_name"
-										placeholder="{{ _("Last Name") }}" value="{{ account.last_name }}" required>
+									<div class="control">
+										<input type="text" class="input" name="last_name"
+											placeholder="{{ _("Last Name") }}" value="{{ account.last_name }}" required>
+									</div>
 								</div>
 							</div>
 						</div>
@@ -69,8 +73,10 @@
 						<div class="field">
 							<label class="label">{{ _("Nickname") }}</label>
 
-							<input type="text" class="input" name="nickname"
-								placeholder="{{ _("Nickname") }}" value="{{ account.nickname or "" }}">
+							<div class="control">
+								<input type="text" class="input" name="nickname"
+									placeholder="{{ _("Nickname") }}" value="{{ account.nickname or "" }}">
+							</div>
 
 							<p class="help">
 								{{ _("If you don't to show your full name, you can enter a nickname which will be shown instead") }}
@@ -81,8 +87,10 @@
 						<div class="field">
 							<label class="label">{{ _("Address") }}</label>
 
-							<textarea type="text" class="textarea" name="street" rows="3"
-								placeholder="{{ _("Address") }}">{{ account.street or "" }}</textarea>
+							<div class="control">
+								<textarea type="text" class="textarea" name="street" rows="3"
+									placeholder="{{ _("Address") }}">{{ account.street or "" }}</textarea>
+							</div>
 						</div>
 
 						{# City & Post Code #}
@@ -91,8 +99,10 @@
 								<div class="field">
 									<label class="label">{{ _("City") }}</label>
 
-									<input type="text" class="input" name="city"
-										placeholder="{{ _("City") }}" value="{{ account.city }}">
+									<div class="control">
+										<input type="text" class="input" name="city"
+											placeholder="{{ _("City") }}" value="{{ account.city }}">
+									</div>
 								</div>
 							</div>
 
@@ -100,8 +110,10 @@
 								<div class="field">
 									<label class="label">{{ _("Postal Code") }}</label>
 
-									<input type="text" class="input" name="postal_code"
-										placeholder="{{ _("Postal Code") }}" value="{{ account.postal_code }}">
+									<div class="control">
+										<input type="text" class="input" name="postal_code"
+											placeholder="{{ _("Postal Code") }}" value="{{ account.postal_code }}">
+									</div>
 								</div>
 							</div>
 						</div>
@@ -110,23 +122,28 @@
 						<div class="field">
 							<label class="label">{{ _("Country") }}</label>
 
-							<div class="select is-fullwidth">
-								<select name="country_code" required>
-									<option>{{ _("- Please Select -") }}</option>
+							<div class="control">
+								<div class="select is-fullwidth">
+									<select name="country_code" required>
+										<option>{{ _("- Please Select -") }}</option>
 
-									{% for c in countries %}
-										<option value="{{ c.alpha2 }}" {% if account.country_code == c.alpha2 %}selected{% end %}>{{ c.name }}</option>
-									{% end %}
-								</select>
-							  </div>
+										{% for c in countries %}
+											<option value="{{ c.alpha2 }}" {% if account.country_code == c.alpha2 %}selected{% end %}>{{ c.name }}</option>
+										{% end %}
+									</select>
+								</div>
+							</div>
 						</div>
 
 						{# Telephone #}
 						<div class="field">
 							<label class="label">{{ _("Telephone") }}</label>
 
-							<textarea type="text" class="textarea" name="phone_numbers" rows="3"
-								placeholder="{{ _("Phone Numbers") }}">{{ "\n".join((format_phone_number_to_e164(n) for n in account.phone_numbers)) }}</textarea>
+							<div class="control">
+								<textarea type="text" class="textarea" name="phone_numbers" rows="3"
+									placeholder="{{ _("Phone Numbers") }}"
+									>{{ "\n".join((format_phone_number_to_e164(n) for n in account.phone_numbers)) }}</textarea>
+							</div>
 
 							<p class="help">
 								{{ _("Enter your landline and mobile phone numbers") }}
@@ -138,8 +155,10 @@
 							<div class="field">
 								<label class="label">{{ _("Forward Calls") }}</label>
 
-								<input type="text" class="input" name="sip_routing_address"
-									placeholder="{{ _("SIP URI or Phone Number") }}" value="{{ account.sip_routing_address or "" }}">
+								<div class="control">
+									<input type="text" class="input" name="sip_routing_address"
+										placeholder="{{ _("SIP URI or Phone Number") }}" value="{{ account.sip_routing_address or "" }}">
+								</div>
 
 								<p class="help">
 									{{ _("All calls will be forwarded to this phone number or SIP URI") }}
@@ -153,8 +172,10 @@
 								{{ _("Tell Us More About Yourself") }}
 							</label>
 
-							<textarea type="text" class="textarea" name="description" rows="5"
-								placeholder="{{ _("Tell Us More About Yourself") }}">{{ account.description or "" }}</textarea>
+							<div class="control">
+								<textarea type="text" class="textarea" name="description" rows="5"
+									placeholder="{{ _("Tell Us More About Yourself") }}">{{ account.description or "" }}</textarea>
+							</div>
 
 							<p class="help">
 								{{ _("This text will be shown on your profile for everyone to get to know you better.") }}
@@ -164,18 +185,20 @@
 
 						{# Avatar #}
 						<div class="field">
-							<div class="file">
-								<label class="file-label">
-									<input class="file-input" type="file" name="avatar">
-									<span class="file-cta">
-										<span class="file-icon">
-											<i class="fas fa-upload"></i>
-										</span>
-										<span class="file-label">
-											{{ _("Upload a new avatar") }}
+							<div class="control">
+								<div class="file">
+									<label class="file-label">
+										<input class="file-input" type="file" name="avatar">
+										<span class="file-cta">
+											<span class="file-icon">
+												<i class="fas fa-upload"></i>
+											</span>
+											<span class="file-label">
+												{{ _("Upload a new avatar") }}
+											</span>
 										</span>
-									</span>
-								</label>
+									</label>
+								</div>
 							</div>
 						</div>
 
@@ -195,17 +218,12 @@
 								</p>
 							</div>
 
-
 							<div class="field">
 								<label class="label">{{ _("Email") }}</label>
 
-								<div class="field-body">
-									<div class="field">
-										<p class="control">
-											<input type="mail" class="input" name="mail_routing_address"
-											placeholder="{{ _("Email Address") }}" value="{{ account.mail_routing_address or "" }}">
-										</p>
-									</div>
+								<div class="control">
+									<input type="mail" class="input" name="mail_routing_address"
+										placeholder="{{ _("Email Address") }}" value="{{ account.mail_routing_address or "" }}">
 								</div>
 
 								<p class="help">