commit 66ede155aa30c3700aa9505371b2e90395d208d2
parent 6a82840d6459acfdeee5b28b42adf0bc68f84261
Author: Katja (ctucx) <git@ctu.cx>
Date: Thu, 17 Apr 2025 11:48:58 +0200
parent 6a82840d6459acfdeee5b28b42adf0bc68f84261
Author: Katja (ctucx) <git@ctu.cx>
Date: Thu, 17 Apr 2025 11:48:58 +0200
searchView: move accessibility setting to settingsView
4 files changed, 22 insertions(+), 38 deletions(-)
diff --git a/src/languages.js b/src/languages.js @@ -24,10 +24,10 @@ export const t = (key, ...params) => { const languages = { 'de': { - 'access_full': 'Barrierefrei', - 'access_none': 'Keine Einschränkungen', - 'access_partial': 'Bedingt barrierefrei', - 'accessibility': 'Barrierefreiheit', + 'accessibility': 'Barrierefreiheit', + 'accessibilityNone': 'Keine Einschränkungen', + 'accessibilityPartial': 'Bedingt barrierefrei', + 'accessibilityComplete': 'Barrierefrei', 'arrival': 'Ankunft', 'bus': 'Bus', 'cancelled-ride': 'Fahrt entfällt!', @@ -112,10 +112,10 @@ const languages = { }, 'nl': { - 'access_full': 'Toegankelijk', - 'access_none': 'Geen beperkingen', - 'access_partial': 'Beperkt toegankelijk', - 'accessibility': 'Toegankelijkheid', + 'accessibility': 'Toegankelijkheid', + 'accessibilityNone': 'Geen beperkingen', + 'accessibilityPartial': 'Beperkt toegankelijk', + 'accessibilityComplete': 'Toegankelijk', 'arrival': 'Aankomst', 'bus': 'Bus', 'cancelled-ride': 'Rit geannuleerd', @@ -177,10 +177,10 @@ const languages = { }, 'en': { - 'access_full': 'full', - 'access_none': 'none', - 'access_partial': 'partial', - 'accessibility': 'Accessibillity', + 'accessibility': 'Accessibillity', + 'accessibilityNone': 'none', + 'accessibilityPartial': 'partial', + 'accessibilityComplete': 'full', 'arrival': 'Arrival', 'bus': 'Bus', 'cancelled-ride': 'Cancelled!',
diff --git a/src/searchView.js b/src/searchView.js @@ -174,20 +174,6 @@ class SearchView extends LitOverlay { `)} </div> - <div class="selector rectangular ${settings.profile === 'db' ? 'hidden' : ''}"> - <input type="radio" id="accessibilityNone" name="accessibility" value="none" - @change=${this.changeHandler} .checked=${this.settingsState.accessibility === 'none'}> - <label class="icon-walk-fast" for="accessibilityNone" title="${t('accessibility')}: ${t('access_none')}"></label> - - <input type="radio" id="accessibilityPartial" name="accessibility" value="partial" - @change=${this.changeHandler} .checked=${this.settingsState.accessibility === 'partial'}> - <label class="icon-walk" for="accessibilityPartial" title="${t('accessibility')}: ${t('access_partial')}"></label> - - <input type="radio" id="accessibilityComplete" name="accessibility" value="complete" - @change=${this.changeHandler} .checked=${this.settingsState.accessibility === 'complete'}> - <label class="icon-weelchair" for="accessibilityComplete" title="${t('accessibility')}: ${t('access_full')}"></label> - </div> - <div class="selector rectangular"> <input type="checkbox" id="bikeFriendly" name="bikeFriendly" @change=${this.settingsState.toggleBikeFriendly} .checked=${this.settingsState.bikeFriendly}> <label class="icon-bike" for="bikeFriendly" title="${t('titleBikeFriendly')}"></label>
diff --git a/src/settingsView.js b/src/settingsView.js @@ -62,6 +62,15 @@ class SettingsView extends LitElement { </div> <div class="flex-row ${this.viewState.profile !== 'db' ? '' : 'hidden'}"> + <label for="accessibility">${t('accessibility')}:</label> + <select id="accessibility" @change=${this.changeHandler}> + <option value="none" ?selected=${this.viewState.accessibility === 'none'}>${t('accessibilityNone')}</option> + <option value="partial" ?selected=${this.viewState.accessibility === 'partial'}>${t('accessibilityPartial')}</option> + <option value="complete" ?selected=${this.viewState.accessibility === 'complete'}>${t('accessibilityComplete')}</option> + </select> + </div> + + <div class="flex-row ${this.viewState.profile !== 'db' ? '' : 'hidden'}"> <label for="walkingSpeed">${t('walkingSpeed')}:</label> <select id="walkingSpeed" @change=${this.changeHandler}> <option value="slow" ?selected=${this.viewState.walkingSpeed === 'slow'}>${t('walkingSpeedSlow')}</option> @@ -119,6 +128,7 @@ class SettingsView extends LitElement { if (id === 'language') this.viewState.setLanguage(value); if (id === 'walkingSpeed') this.viewState.setWalkingSpeed(value); + if (id === 'accessibility') this.viewState.setAccessibility(value); if (id === 'transferTime') this.viewState.setTransferTime(parseInt(value)); if (id === 'ageGroup') this.viewState.setAgeGroup(value); if (id === 'loyaltyCard') this.viewState.setLoyaltyCard(value);
diff --git a/src/styles/searchView.css b/src/styles/searchView.css @@ -179,18 +179,6 @@ form { content: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" height="24" width="24"><path d="M12 20a8 8 0 0 0 8-8 8 8 0 0 0-8-8 8 8 0 0 0-8 8 8 8 0 0 0 8 8m0-18a10 10 0 0 1 10 10 10 10 0 0 1-10 10C6.47 22 2 17.5 2 12A10 10 0 0 1 12 2m.5 5v5.25l4.5 2.67-.75 1.23L11 13V7z"/></svg>'); } -.icon-walk-fast { - content: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" height="24" width="24"><path d="M13.49 5.48c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2m-3.6 13.9 1-4.4 2.1 2v6h2v-7.5l-2.1-2 .6-3c1.3 1.5 3.3 2.5 5.5 2.5v-2c-1.9 0-3.5-1-4.3-2.4l-1-1.6c-.4-.6-1-1-1.7-1-.3 0-.5.1-.8.1l-5.2 2.2v4.7h2v-3.4l1.8-.7-1.6 8.1-4.9-1-.4 2z"/></svg>'); -} - -.icon-walk { - content: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" height="24" width="24"><path d="M13.5 5.5c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2M9.8 8.9 7 23h2.1l1.8-8 2.1 2v6h2v-7.5l-2.1-2 .6-3C14.8 12 16.8 13 19 13v-2c-1.9 0-3.5-1-4.3-2.4l-1-1.6c-.4-.6-1-1-1.7-1-.3 0-.5.1-.8.1L6 8.3V13h2V9.6z"/></svg>'); -} - -.icon-weelchair { - content: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" height="24" width="24"><circle cx="12" cy="4" r="2"/><path d="M19 13v-2c-1.54.02-3.09-.75-4.07-1.83l-1.29-1.43c-.17-.19-.38-.34-.61-.45-.01 0-.01-.01-.02-.01H13c-.35-.2-.75-.3-1.19-.26C10.76 7.11 10 8.04 10 9.09V15c0 1.1.9 2 2 2h5v5h2v-5.5c0-1.1-.9-2-2-2h-3v-3.45c1.29 1.07 3.25 1.94 5 1.95m-6.17 5c-.41 1.16-1.52 2-2.83 2-1.66 0-3-1.34-3-3 0-1.31.84-2.41 2-2.83V12.1a5 5 0 1 0 5.9 5.9z"/></svg>'); -} - .icon-bike { content: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" height="24" width="24"><path d="M5 20.5A3.5 3.5 0 0 1 1.5 17 3.5 3.5 0 0 1 5 13.5 3.5 3.5 0 0 1 8.5 17 3.5 3.5 0 0 1 5 20.5M5 12a5 5 0 0 0-5 5 5 5 0 0 0 5 5 5 5 0 0 0 5-5 5 5 0 0 0-5-5m9.8-2H19V8.2h-3.2l-1.94-3.27c-.29-.5-.86-.83-1.46-.83-.47 0-.9.19-1.2.5L7.5 8.29C7.19 8.6 7 9 7 9.5c0 .63.33 1.16.85 1.47L11.2 13v5H13v-6.5l-2.25-1.65 2.32-2.35m5.93 13a3.5 3.5 0 0 1-3.5-3.5 3.5 3.5 0 0 1 3.5-3.5 3.5 3.5 0 0 1 3.5 3.5 3.5 3.5 0 0 1-3.5 3.5m0-8.5a5 5 0 0 0-5 5 5 5 0 0 0 5 5 5 5 0 0 0 5-5 5 5 0 0 0-5-5m-3-7.2c1 0 1.8-.8 1.8-1.8S17 1.2 16 1.2 14.2 2 14.2 3 15 4.8 16 4.8"/></svg>'); }