From 157f8faa6b054341df17611dea63fba4a3af413c Mon Sep 17 00:00:00 2001 From: Jermolene Date: Thu, 6 Nov 2014 20:57:31 +0000 Subject: [PATCH] Update advanced search standard to use search tabs We reuse the tabs introduced for the sidebar search results --- core/ui/AdvancedSearch/Standard.tid | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/core/ui/AdvancedSearch/Standard.tid b/core/ui/AdvancedSearch/Standard.tid index c951d6230..1650effe4 100644 --- a/core/ui/AdvancedSearch/Standard.tid +++ b/core/ui/AdvancedSearch/Standard.tid @@ -12,21 +12,13 @@ caption: {{$:/language/Search/Standard/Caption}} <$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> - -<$set name="resultCount" value="""<$count filter="[!is[system]search{$:/temp/advancedsearch}] -[[$:/temp/advancedsearch]]"/>"""> - -
- -<> - -<$list filter="[!is[system]search{$:/temp/advancedsearch}sort[title]limit[250]] -[[$:/temp/advancedsearch]]" template="$:/core/ui/ListItemTemplate"/> - -
- +<$set name="searchTiddler" value="$:/temp/advancedsearch"> +<$list filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]butfirst[]limit[1]]" emptyMessage=""" +<$list filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]"> +<$transclude/> + +"""> +<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]" default={{$:/config/SearchResults/Default}}/> + - - - -<$reveal state="$:/temp/advancedsearch" type="match" text=""> -