From cba812d884bab26c34ba0865f616a4c08afa4e06 Mon Sep 17 00:00:00 2001
From: Michael Geers <michael@geers.tv>
Date: Wed, 26 Aug 2026 10:22:58 +0200
Subject: [PATCH] Vehicle settings: compact rows layout (#33169)

---
 .../js/components/Vehicles/SettingsModal.vue  | 161 +++++++++---------
 i18n/de.json                                  |   4 +-
 i18n/en.json                                  |   4 +-
 3 files changed, 87 insertions(+), 82 deletions(-)

diff --git a/assets/js/components/Vehicles/SettingsModal.vue b/assets/js/components/Vehicles/SettingsModal.vue
index 8230768be..d3d030d01 100644
--- a/assets/js/components/Vehicles/SettingsModal.vue
+++ b/assets/js/components/Vehicles/SettingsModal.vue
@@ -16,85 +16,91 @@
 				</a>
 			</p>
 			<div
-				v-for="(vehicle, index) in vehicles"
+				v-for="vehicle in vehicles"
 				:key="vehicle.name"
 				role="group"
 				:aria-label="vehicle.title"
-				:class="{ 'border-top pt-4': index > 0 }"
-				class="mb-4"
+				class="d-flex gap-2 mb-3"
 			>
-				<div class="d-flex flex-wrap align-items-center column-gap-2 row-gap-1 mb-3">
-					<VehicleIcon :name="vehicle.icon" class="flex-shrink-0" />
-					<strong class="text-truncate">{{ vehicle.title }}</strong>
-					<Badge v-if="connectedLoadpoint(vehicle)" class="flex-shrink-0">
-						{{
-							$t("main.vehicleSettings.connectedTo", [
-								connectedLoadpoint(vehicle)?.title ||
-									$t("main.loadpoint.fallbackName"),
-							])
-						}}
-					</Badge>
-					<Badge v-else variant="muted" class="flex-shrink-0">
-						{{ $t("main.vehicleSettings.notConnected") }}
-					</Badge>
+				<VehicleIcon :name="vehicle.icon" class="flex-shrink-0" />
+				<div class="flex-grow-1 overflow-hidden ring-space">
+					<div class="d-flex flex-wrap align-items-center column-gap-2 row-gap-1 mb-3">
+						<strong class="text-truncate">{{ vehicle.title }}</strong>
+						<Badge v-if="connectedLoadpoint(vehicle)" class="flex-shrink-0">
+							{{
+								$t("main.vehicleSettings.connectedTo", [
+									connectedLoadpoint(vehicle)?.title ||
+										$t("main.loadpoint.fallbackName"),
+								])
+							}}
+						</Badge>
+						<Badge v-else variant="muted" class="flex-shrink-0">
+							{{ $t("main.vehicleSettings.notConnected") }}
+						</Badge>
+					</div>
+					<div class="row">
+						<div class="col-6 col-lg-3 mb-3">
+							<div class="small text-uppercase evcc-gray text-truncate">
+								{{ $t("main.vehicleSettings.mode") }}
+							</div>
+							<CustomSelect
+								:id="fieldId(vehicle, 'mode')"
+								inline
+								:options="modeOptions"
+								:selected="vehicle.mode ?? ''"
+								:ariaLabel="$t('main.vehicleSettings.mode')"
+								@change="changeMode(vehicle, $event)"
+							>
+								<span class="text-decoration-underline text-primary">
+									{{ optionName(modeOptions, vehicle.mode ?? "") }}
+								</span>
+							</CustomSelect>
+						</div>
+						<template v-if="socSupported(vehicle)">
+							<div class="col-6 col-lg-3 mb-3">
+								<div class="small text-uppercase evcc-gray text-truncate">
+									{{ $t("main.vehicleSettings.minSoc") }}
+								</div>
+								<CustomSelect
+									:id="fieldId(vehicle, 'minSoc')"
+									inline
+									:options="socOptions(vehicle, true)"
+									:selected="vehicle.minSoc ?? 0"
+									:ariaLabel="$t('main.vehicleSettings.minSoc')"
+									@change="changeMinSoc(vehicle, $event)"
+								>
+									<span class="text-decoration-underline text-primary">
+										{{
+											optionName(
+												socOptions(vehicle, true),
+												vehicle.minSoc ?? 0
+											)
+										}}
+									</span>
+								</CustomSelect>
+							</div>
+							<div class="col-6 col-lg-3 mb-3">
+								<div class="small text-uppercase evcc-gray text-truncate">
+									{{ $t("main.vehicleSettings.limitSoc") }}
+								</div>
+								<CustomSelect
+									:id="fieldId(vehicle, 'limitSoc')"
+									inline
+									:options="socOptions(vehicle)"
+									:selected="vehicle.limitSoc || 100"
+									:ariaLabel="$t('main.vehicleSettings.limitSoc')"
+									@change="changeLimitSoc(vehicle, $event)"
+								>
+									<span class="text-decoration-underline text-primary">
+										{{
+											optionName(socOptions(vehicle), vehicle.limitSoc || 100)
+										}}
+									</span>
+								</CustomSelect>
+							</div>
+						</template>
+					</div>
 				</div>
-				<SettingsFormRow
-					:id="fieldId(vehicle, 'mode')"
-					:label="$t('main.vehicleSettings.mode')"
-				>
-					<select
-						:id="fieldId(vehicle, 'mode')"
-						class="form-select form-select-sm"
-						:value="vehicle.mode ?? ''"
-						@change="changeMode(vehicle, $event)"
-					>
-						<option v-for="opt in modeOptions" :key="opt.value" :value="opt.value">
-							{{ opt.name }}
-						</option>
-					</select>
-				</SettingsFormRow>
-				<template v-if="socSupported(vehicle)">
-					<SettingsFormRow
-						:id="fieldId(vehicle, 'limitSoc')"
-						:label="$t('main.vehicleSettings.limitSoc')"
-						:description="$t('main.vehicleSettings.limitSocDescription')"
-					>
-						<select
-							:id="fieldId(vehicle, 'limitSoc')"
-							class="form-select form-select-sm"
-							:value="vehicle.limitSoc || 100"
-							@change="changeLimitSoc(vehicle, $event)"
-						>
-							<option
-								v-for="opt in socOptions(vehicle)"
-								:key="opt.value"
-								:value="opt.value"
-							>
-								{{ opt.name }}
-							</option>
-						</select>
-					</SettingsFormRow>
-					<SettingsFormRow
-						:id="fieldId(vehicle, 'minSoc')"
-						:label="$t('main.vehicleSettings.minSoc')"
-						:description="$t('main.vehicleSettings.minSocDescription')"
-					>
-						<select
-							:id="fieldId(vehicle, 'minSoc')"
-							class="form-select form-select-sm"
-							:value="vehicle.minSoc ?? 0"
-							@change="changeMinSoc(vehicle, $event)"
-						>
-							<option
-								v-for="opt in socOptions(vehicle, true)"
-								:key="opt.value"
-								:value="opt.value"
-							>
-								{{ opt.name }}
-							</option>
-						</select>
-					</SettingsFormRow>
-				</template>
 			</div>
 			<p class="mb-0 border-top pt-4">
 				<i18n-t keypath="main.vehicleSettings.editHint" tag="span" scope="global">
@@ -110,7 +116,7 @@
 <script lang="ts">
 import Badge from "../Helper/Badge.vue";
 import GenericModal from "../Helper/GenericModal.vue";
-import SettingsFormRow from "../Helper/SettingsFormRow.vue";
+import CustomSelect from "../Helper/CustomSelect.vue";
 import VehicleIcon from "../VehicleIcon";
 import api from "@/api";
 import formatter from "@/mixins/formatter";
@@ -124,7 +130,7 @@ const { OFF, PV, MINPV, NOW } = CHARGE_MODE;
 
 export default defineComponent({
 	name: "VehicleSettingsModal",
-	components: { Badge, GenericModal, SettingsFormRow, VehicleIcon },
+	components: { Badge, CustomSelect, GenericModal, VehicleIcon },
 	mixins: [formatter],
 	props: {
 		vehicles: { type: Array as PropType<Vehicle[]>, default: () => [] },
@@ -188,6 +194,9 @@ export default defineComponent({
 					};
 				});
 		},
+		optionName(options: SelectOption<string | number>[], value: string | number): string {
+			return options.find((o) => o.value === value)?.name ?? String(value);
+		},
 		selectValue(event: Event): string {
 			return (event.target as HTMLSelectElement).value;
 		},
diff --git a/i18n/de.json b/i18n/de.json
index 8c0c6a556..aee01c433 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -1550,14 +1550,12 @@
     "vehicleSettings": {
       "connectedTo": "verbunden mit {0}",
       "description": "Diese Standardwerte werden angewendet, wenn das Fahrzeug an einem Ladepunkt angeschlossen wird.",
-      "editHint": "Fahrzeuge unter {0} hinzufügen oder bearbeiten.",
+      "editHint": "Fahrzeuge können in der {0} bearbeitet werden.",
       "keepAsIs": "Beibehalten",
       "learnMore": "Mehr erfahren.",
       "limitSoc": "Standardlimit",
-      "limitSocDescription": "Wird beim Anschließen des Fahrzeugs angewendet.",
       "menu": "Fahrzeuge",
       "minSoc": "Minimale Ladung",
-      "minSocDescription": "Wird im PV-Modus schnell bis zu diesem Wert geladen.",
       "mode": "Standardmodus",
       "notConnected": "nicht verbunden",
       "title": "Fahrzeugeinstellungen"
diff --git a/i18n/en.json b/i18n/en.json
index f001eb180..ab416a236 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1550,14 +1550,12 @@
     "vehicleSettings": {
       "connectedTo": "connected to {0}",
       "description": "These defaults are applied when the vehicle connects to a charging point.",
-      "editHint": "Add or edit vehicles in {0}.",
+      "editHint": "Vehicles can be edited in {0}.",
       "keepAsIs": "Keep as is",
       "learnMore": "Learn more.",
       "limitSoc": "Default limit",
-      "limitSocDescription": "Applied when the vehicle is connected.",
       "menu": "Vehicles",
       "minSoc": "Minimum charge",
-      "minSocDescription": "Fast charge to this level in solar mode.",
       "mode": "Default mode",
       "notConnected": "not connected",
       "title": "Vehicle Settings"