Skip to content

Remove search provider dropdown when there's only a single provider #1524

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
KodeStar merged 2 commits into from
Nov 11, 2025
+55 −9
Merged

Remove search provider dropdown when there's only a single provider #1524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
130661b
Remove search provider dropdown when there's only a single provider
Nov 11, 2025
66dfe95
Fix lint issue
Nov 11, 2025
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
25 changes: 20 additions & 5 deletions app/Search.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,16 +111,31 @@ public static function form(): string
if ((bool) $user_search_provider) {
$name = 'app.options.'.$user_search_provider;
$provider = self::providerDetails($user_search_provider);
$providers = self::providers();
$providerCount = count($providers);

// If there's only one provider, use its key instead of the user's setting
if ($providerCount === 1) {
$user_search_provider = $providers->keys()->first();
}

$output .= '<div class="searchform">';
$output .= '<form action="'.url('search').'"'.getLinkTargetAttribute().' method="get">';
$output .= '<div id="search-container" class="input-container">';
$output .= '<select name="provider">';
foreach (self::providers() as $key => $searchprovider) {
$selected = ((string) $key === (string) $user_search_provider) ? ' selected="selected"' : '';
$output .= '<option value="'.$key.'"'.$selected.'>'.$searchprovider['name'].'</option>';

// Only show dropdown if there's more than one provider
if ($providerCount > 1) {
$output .= '<select name="provider">';
foreach ($providers as $key => $searchprovider) {
$selected = ((string) $key === (string) $user_search_provider) ? ' selected="selected"' : '';
$output .= '<option value="'.$key.'"'.$selected.'>'.$searchprovider['name'].'</option>';
}
$output .= '</select>';
} else {
// Hidden input for single provider
$output .= '<input type="hidden" name="provider" value="'.$user_search_provider.'" />';
}
$output .= '</select>';

$output .= '<input type="text" name="q" value="'.e(Input::get('q') ?? '').'" class="homesearch" autofocus placeholder="'.__('app.settings.search').'..." />';
$output .= '<button type="submit">'.ucwords(__('app.settings.search')).'</button>';
$output .= '</div>';
Expand Down
11 changes: 11 additions & 0 deletions public/css/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1130,6 +1130,9 @@ a.settinglink {
position: relative;
z-index: 4;
}
.searchform:has(input[name=provider][type=hidden]) {
max-width: 520px;
}
.searchform form {
width: 100%;
}
Expand All @@ -1147,6 +1150,10 @@ a.settinglink {
width: 100%;
background: transparent;
}
.searchform input[name=q]:first-child {
border-top-left-radius: 5px;
border-bottom-left-radius: 5px;
}
.searchform button {
position: absolute;
right: 0px;
Expand All @@ -1170,6 +1177,10 @@ a.settinglink {
border-top-left-radius: 5px;
border-bottom-left-radius: 5px;
}
.searchform select ~ input[name=q] {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}

#search-autocomplete {
position: absolute;
Expand Down
3 changes: 2 additions & 1 deletion public/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4166,7 +4166,8 @@ $.when($.ready).then(function () {
$("#search-container").on("input", "input[name=q]", function () {
var search = this.value;
var items = $("#sortable").find(".item-container");
var provider = $("#search-container select[name=provider]").val();
// Get provider from either select or hidden input
var provider = $("#search-container select[name=provider]").val() || $("#search-container input[name=provider]").val();
if (provider === "tiles") {
hideAutocomplete();
if (search.length > 0) {
Expand Down
4 changes: 2 additions & 2 deletions public/mix-manifest.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion resources/assets/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,10 @@ $.when($.ready).then(() => {
.on("input", "input[name=q]", function () {
const search = this.value;
const items = $("#sortable").find(".item-container");
const provider = $("#search-container select[name=provider]").val();
// Get provider from either select or hidden input
const provider =
$("#search-container select[name=provider]").val() ||
$("#search-container input[name=provider]").val();

if (provider === "tiles") {
hideAutocomplete();
Expand Down
16 changes: 16 additions & 0 deletions resources/assets/sass/_app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,6 +926,12 @@ div.create {
max-width: 620px;
position: relative;
z-index: 4;

// Reduce width when there's no select dropdown (only has hidden input)
&:has(input[name="provider"][type="hidden"]) {
max-width: 520px;
}

form {
width: 100%;
}
Expand All @@ -944,6 +950,11 @@ div.create {
width: 100%;
background: transparent;
}
// When there's no select dropdown, round the input's left corners
input[name="q"]:first-child {
border-top-left-radius: 5px;
border-bottom-left-radius: 5px;
}
button {
position: absolute;
right: 0px;
Expand All @@ -967,6 +978,11 @@ div.create {
border-top-left-radius: 5px;
border-bottom-left-radius: 5px;
}
// When select exists, remove input's left border radius
select ~ input[name="q"] {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
}

#search-autocomplete {
Expand Down