lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Adding SearchForm widget

Browse Source 
--HG--
branch : dev
This commit is contained in:
Sebastien Ros
2010-10-12 18:16:54 -07:00
parent ce60c6d3a0
commit 5d7d0bde3e
9 changed files with 54 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs
View File

@@ -5,8 +5,6 @@ using Orchard.Search.Services;
using Orchard.Search.ViewModels;
using Orchard.Settings;
using Orchard.Search.Models;
using System.Linq;
using System;
using System.Collections.Generic;
using Orchard.Collections;
using Orchard.Themes;

13
src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchFormPartDriver.cs Normal file
View File

@@ -0,0 +1,13 @@
using Orchard.ContentManagement.Drivers;
using Orchard.Search.Models;
using Orchard.Search.ViewModels;
namespace Orchard.Search.Drivers {
public class SearchFormPartDriver : ContentPartDriver<SearchFormPart> {
protected override DriverResult Display(SearchFormPart part, string displayType, dynamic shapeHelper) {
var model = new SearchViewModel();
return ContentPartTemplate(model, "Parts/Search.SearchForm");
}
}
}

23
src/Orchard.Web/Modules/Orchard.Search/Filters/SearchFilter.cs
View File

@@ -1,23 +0,0 @@
using System.Web.Mvc;
using Orchard.Mvc.Filters;
namespace Orchard.Search.Filters {
public class SearchFilter : FilterProvider, IResultFilter {
private readonly IWorkContextAccessor _workContextAccessor;
public SearchFilter(IWorkContextAccessor workContextAccessor) {
_workContextAccessor = workContextAccessor;
}
public void OnResultExecuting(ResultExecutingContext filterContext) {
dynamic search = filterContext.Controller.ViewData.Model;
var workContext = _workContextAccessor.GetContext(filterContext);
if (search != null)
workContext.Layout.Search.Add(search);
}
public void OnResultExecuted(ResultExecutedContext filterContext) {
}
}
}

15
src/Orchard.Web/Modules/Orchard.Search/Migrations.cs
View File

@@ -1,4 +1,5 @@
using Orchard.Data.Migration;
using Orchard.ContentManagement.MetaData;
using Orchard.Data.Migration;
namespace Orchard.Search {
public class SearchDataMigration : DataMigrationImpl {
@@ -13,5 +14,17 @@ namespace Orchard.Search {
return 1;
}
public int UpdateFrom1() {
ContentDefinitionManager.AlterTypeDefinition("SearchForm",
cfg => cfg
.WithPart("SearchFormPart")
.WithPart("CommonPart")
.WithPart("WidgetPart")
.WithSetting("Stereotype", "Widget")
);
return 5;
}
}
}

9
src/Orchard.Web/Modules/Orchard.Search/Models/SearchFormPart.cs Normal file
View File

@@ -0,0 +1,9 @@
using Orchard.ContentManagement;
namespace Orchard.Search.Models {
/// <summary>
/// Cotnent part for the search form widget
/// </summary>
public class SearchFormPart : ContentPart {
}
}

8
src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
View File

@@ -67,11 +67,12 @@
<Reference Include="System.EnterpriseServices" />
</ItemGroup>
<ItemGroup>
<Compile Include="Drivers\SearchFormPartDriver.cs" />
<Compile Include="Models\SearchFormPart.cs" />
<Compile Include="ResourceManifest.cs" />
<Compile Include="Controllers\SearchController.cs" />
<Compile Include="Migrations.cs" />
<Compile Include="Drivers\SearchSettingsPartDriver.cs" />
<Compile Include="Filters\SearchFilter.cs" />
<Compile Include="Models\SearchSettingsPart.cs" />
<Compile Include="Models\SearchSettingsPartRecord.cs" />
<Compile Include="Routes.cs" />
@@ -100,9 +101,12 @@
</ItemGroup>
<ItemGroup>
<Content Include="Views\EditorTemplates\Parts\Search.SiteSettings.cshtml" />
<Content Include="Views\SearchForm.cshtml" />
<Content Include="Views\EditorTemplates\Parts\Search.SearchForm.cshtml" />
<Content Include="Views\Search\Index.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\DisplayTemplates\Parts\Search.SearchForm.cshtml" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

1
src/Orchard.Web/Modules/Orchard.Search/Views/SearchForm.cshtml → src/Orchard.Web/Modules/Orchard.Search/Views/DisplayTemplates/Parts/Search.SearchForm.cshtml
View File

@@ -1,5 +1,4 @@
@model Orchard.Search.ViewModels.SearchViewModel
@using Orchard.Search.ViewModels;
@using(Html.BeginForm("index", "search", new { area = "Orchard.Search" }, FormMethod.Get, new { @class = "search" })) {
<fieldset>

1
src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SearchForm.cshtml Normal file
View File

@@ -0,0 +1 @@


15
src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.cshtml
View File

@@ -2,15 +2,22 @@
@{ Style.Require("Search"); }
<h1>@Html.TitleForPage(T("Search").Text)</h1>
@Html.Zone("search")
@using(Html.BeginForm("index", "search", new { area = "Orchard.Search" }, FormMethod.Get, new { @class = "search" })) {
<fieldset>
@Html.TextBox("q", Model.Query)
<button type="submit">@T("Search")</button>
</fieldset>
}
@if (!string.IsNullOrWhiteSpace(Model.Query)) {
@if (Model.PageOfResults.Count() == 0) {
if (Model.PageOfResults.Count() == 0) {
<p class="search-summary">@T.Plural("the <em>one</em> result", "<em>zero</em> results", Model.PageOfResults.Count())</p>
} else {
<p class="search-summary">@T.Plural("the <em>one</em> result", "<em>{1} - {2}</em> of <em>{0}</em> results", Model.PageOfResults.TotalItemCount, Model.PageOfResults.StartPosition, Model.PageOfResults.EndPosition)</p>
}
}
@if (Model.PageOfResults != null && Model.PageOfResults.Count() > 0) {
@Html.UnorderedList(Model.PageOfResults.Where(hit => hit.Content != null), (r, i) => Html.DisplayForItem(r.Content), "search-results contentItems")
@Html.Pager(Model.PageOfResults, Model.PageOfResults.PageNumber, Model.DefaultPageSize, new {q = Model.Query})
@Html.UnorderedList(Model.PageOfResults.Where(hit => hit.Content != null), (r, i) => Display(r.Content), "search-results contentItems")
@Html.Pager(Model.PageOfResults, Model.PageOfResults.PageNumber, Model.DefaultPageSize, new {q = Model.Query})
}