Skip to content
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

fix Search theme control so that it checks if search is enabled for site, and include AllowInput parameter to control input textbox #4566

Merged
merged 1 commit into from
Aug 26, 2024
Merged

fix Search theme control so that it checks if search is enabled for site, and include AllowInput parameter to control input textbox #4566

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
43 changes: 30 additions & 13 deletions Oqtane.Client/Themes/Controls/Theme/Search.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,39 @@
@using System.Net
@using Microsoft.AspNetCore.Http
@inherits ThemeControlBase
@inject ISettingService SettingService
@inject IStringLocalizer<Search> Localizer
@inject NavigationManager NavigationManager

@if (_searchResultsPage != null)
{
<span class="app-search @CssClass">
@if (AllowInput)
{
<span class="app-search @CssClass">
<form method="post" class="app-form-inline" @formname="@($"SearchForm")" @onsubmit="@PerformSearch" data-enhance>
<input type="hidden" name="@Constants.RequestVerificationToken" value="@SiteState.AntiForgeryToken" />
<input type="text" name="keywords" maxlength="50"
class="form-control d-inline-block pe-5 shadow-none"
@bind="_keywords"
placeholder="@Localizer["SearchPlaceHolder"]"
aria-label="Search" />
<button type="submit" class="btn btn-search">
<span class="oi oi-magnifying-glass align-middle"></span>
</button>
</form>
</span>
}
else
{
<form method="post" class="app-form-inline" @formname="@($"SearchForm")" @onsubmit="@PerformSearch" data-enhance>
<input type="hidden" name="@Constants.RequestVerificationToken" value="@SiteState.AntiForgeryToken" />
<input type="text" name="keywords" maxlength="50"
class="form-control d-inline-block pe-5 shadow-none"
@bind="_keywords"
placeholder="@Localizer["SearchPlaceHolder"]"
aria-label="Search" />
<button type="submit" class="btn btn-search">
<button type="submit" class="btn btn-primary">
<span class="oi oi-magnifying-glass align-middle"></span>
</button>
</form>
</span>
}
}



@code {
private Page _searchResultsPage;
private string _keywords = "";
Expand All @@ -32,7 +43,10 @@
public string CssClass { get; set; }

[Parameter]
public string SearchResultPagePath { get; set; } = "search";
public bool AllowInput { get; set; } = true; // setting to false will display only the search icon button - not the textbox

[Parameter]
public string SearchResultPagePath { get; set; } = "search"; // setting to "" will disable search

[CascadingParameter]
HttpContext HttpContext { get; set; }
Expand All @@ -42,9 +56,12 @@

protected override void OnInitialized()
{
if(!string.IsNullOrEmpty(SearchResultPagePath))
if (bool.Parse(SettingService.GetSetting(PageState.Site.Settings, "Search_Enabled", "True")))
{
_searchResultsPage = PageState.Pages.FirstOrDefault(i => i.Path == SearchResultPagePath);
if (!string.IsNullOrEmpty(SearchResultPagePath))
{
_searchResultsPage = PageState.Pages.FirstOrDefault(i => i.Path == SearchResultPagePath);
}
}
}

Expand Down