Skip to content

web: More consistent search boxes #1300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ancorgs merged 1 commit into from
Jun 10, 2024
Merged

web: More consistent search boxes #1300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 27 additions & 17 deletions web/src/components/l10n/KeyboardSelection.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,32 @@ export default function KeyboardSelection() {
navigate("..");
};

let keymapsList = filteredKeymaps.map((keymap) => {
return (
<Radio
key={keymap.id}
name="keymap"
id={keymap.id}
onChange={() => setSelected(keymap)}
label={
<>
<span className={`${textStyles.fontSizeLg}`}>
<b>{keymap.name}</b>
</span> <Text component="small">{keymap.id}</Text>
</>
}
value={JSON.stringify(keymap)}
defaultChecked={keymap === selected}
/>
);
});

if (keymapsList.length === 0) {
keymapsList = (
Copy link
Copy Markdown
Contributor

@dgdavid dgdavid Jun 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd just return "Whatever" instead of this.

Copy link
Copy Markdown
Contributor

@dgdavid dgdavid Jun 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've said nothing. Ignore my comment

<b>{_("None of the keymaps match the filter.")}</b>
);
}

return (
<>
<Page.Header>
Expand All @@ -70,23 +96,7 @@ export default function KeyboardSelection() {
<Page.CardSection>
<Form id="keymapSelection" onSubmit={onSubmit}>
<FormGroup isStack>
{filteredKeymaps.map((keymap) => (
<Radio
key={keymap.id}
name="keymap"
id={keymap.id}
onChange={() => setSelected(keymap)}
label={
<>
<span className={`${textStyles.fontSizeLg}`}>
<b>{keymap.name}</b>
</span> <Text component="small">{keymap.id}</Text>
</>
}
value={JSON.stringify(keymap)}
defaultChecked={keymap === selected}
/>
))}
{keymapsList}
</FormGroup>
</Form>
</Page.CardSection>
Expand Down
44 changes: 27 additions & 17 deletions web/src/components/l10n/LocaleSelection.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,32 @@ export default function LocaleSelection() {
navigate("..");
};

let localesList = filteredLocales.map((locale) => {
return (
<Radio
key={locale.id}
name="locale"
id={locale.id}
onChange={() => setSelected(locale)}
label={
<Flex gap={{ default: "gapSm" }}>
<span className={textStyles.fontSizeLg}><b>{locale.name}</b></span>
<span className={[textStyles.fontSizeMd, textStyles.color_100].join(" ")}>{locale.territory}</span>
<span className={[textStyles.fontSizeXs, textStyles.color_400].join(" ")}>{locale.id}</span>
</Flex>
}
value={JSON.stringify(locale)}
checked={locale === selected}
/>
);
});

if (localesList.length === 0) {
localesList = (
<b>{_("None of the locales match the filter.")}</b>
);
}

return (
<>
<Page.Header>
Expand All @@ -70,23 +96,7 @@ export default function LocaleSelection() {
<Page.CardSection>
<Form id="localeSelection" onSubmit={onSubmit}>
<FormGroup isStack>
{filteredLocales.map((locale) => (
<Radio
key={locale.id}
name="locale"
id={locale.id}
onChange={() => setSelected(locale)}
label={
<Flex gap={{ default: "gapSm" }}>
<span className={textStyles.fontSizeLg}><b>{locale.name}</b></span>
<span className={[textStyles.fontSizeMd, textStyles.color_100].join(" ")}>{locale.territory}</span>
<span className={[textStyles.fontSizeXs, textStyles.color_400].join(" ")}>{locale.id}</span>
</Flex>
}
value={JSON.stringify(locale)}
checked={locale === selected}
/>
))}
{localesList}
</FormGroup>
</Form>
</Page.CardSection>
Expand Down
58 changes: 34 additions & 24 deletions web/src/components/l10n/TimezoneSelection.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,39 @@ export default function TimezoneSelection() {
navigate("..");
};

let timezonesList = filteredTimezones.map((timezone) => {
return (
<Radio
key={timezone.id}
name="timezone"
id={timezone.id}
onChange={() => setSelected(timezone)}
label={
<>
<span className={`${textStyles.fontSizeLg}`}>
<b>{timezone.parts.join('-')}</b>
</span> <Text component="small">{timezone.country}</Text>
</>
}
description={
<Flex columnGap={{ default: "columnGapXs" }}>
<Text component="small">{timezoneTime(timezone.id, { date }) || ""}</Text>
<Divider orientation={{ default: "vertical" }} />
<div>{timezone.details}</div>
</Flex>
}
value={JSON.stringify(timezone)}
defaultChecked={timezone === selected}
/>
);
});

if (timezonesList.length === 0) {
timezonesList = (
<b>{_("None of the time zones match the filter.")}</b>
);
}

return (
<>
<Page.Header>
Expand All @@ -101,30 +134,7 @@ export default function TimezoneSelection() {
<Page.CardSection>
<Form id="timezoneSelection" onSubmit={onSubmit}>
<FormGroup isStack>
{filteredTimezones.map((timezone) => (
<Radio
key={timezone.id}
name="timezone"
id={timezone.id}
onChange={() => setSelected(timezone)}
label={
<>
<span className={`${textStyles.fontSizeLg}`}>
<b>{timezone.parts.join('-')}</b>
</span> <Text component="small">{timezone.country}</Text>
</>
}
description={
<Flex columnGap={{ default: "columnGapXs" }}>
<Text component="small">{timezoneTime(timezone.id, { date }) || ""}</Text>
<Divider orientation={{ default: "vertical" }} />
<div>{timezone.details}</div>
</Flex>
}
value={JSON.stringify(timezone)}
defaultChecked={timezone === selected}
/>
))}
{timezonesList}
</FormGroup>
</Form>
</Page.CardSection>
Expand Down
4 changes: 2 additions & 2 deletions web/src/components/software/SoftwarePatternsSelection.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@ function SoftwarePatternsSelection() {
<h2>{_("Software selection")}</h2>
<SearchInput
// TRANSLATORS: search field placeholder text
placeholder={_("Search")}
aria-label={_("Search")}
placeholder={_("Filter by pattern title or description")}
aria-label={_("Filter by pattern title or description")}
value={searchValue}
onChange={(_event, value) => setSearchValue(value)}
onClear={() => setSearchValue("")}
Expand Down