diff --git a/classes/actions/ActionSearch.class.php b/classes/actions/ActionSearch.class.php index b144b3ab..efff19b1 100644 --- a/classes/actions/ActionSearch.class.php +++ b/classes/actions/ActionSearch.class.php @@ -250,7 +250,7 @@ class ActionSearch extends Action { $this->Viewer_Assign('aPaging', $aPaging); } - $this->SetTemplateAction('results'); + $this->SetTemplateAction('index'); $this->Viewer_AddHtmlTitle($aReq['q']); $this->Viewer_Assign('bIsResults', $this->bIsResults); return $aRes; diff --git a/templates/skin/developer/actions/ActionSearch/index.tpl b/templates/skin/developer/actions/ActionSearch/index.tpl index 94d405c9..a18344f2 100644 --- a/templates/skin/developer/actions/ActionSearch/index.tpl +++ b/templates/skin/developer/actions/ActionSearch/index.tpl @@ -4,8 +4,42 @@ {extends file='layouts/layout.base.tpl'} +{block name='layout_options'} + {$bNoSidebar = true} +{/block} + {block name='layout_page_title'}{$aLang.search}{/block} {block name='layout_content'} {include file='forms/form.search.main.tpl'} + + {if $bIsResults} + + + {if $aReq.sType == 'topics'} + {include file='topics/topic_list.tpl'} + {elseif $aReq.sType == 'comments'} + {include file='comments/comment_list.tpl'} + {else} + {hook run='search_result' sType=$aReq.sType} + {/if} + {elseif $aReq.q} + {$aLang.search_results_empty} + {/if} {/block} \ No newline at end of file diff --git a/templates/skin/developer/actions/ActionSearch/results.tpl b/templates/skin/developer/actions/ActionSearch/results.tpl deleted file mode 100644 index abc80815..00000000 --- a/templates/skin/developer/actions/ActionSearch/results.tpl +++ /dev/null @@ -1,41 +0,0 @@ -{** - * Результаты поиска - *} - -{extends file='layouts/layout.base.tpl'} - -{block name='layout_page_title'}{$aLang.search_results}{/block} - -{block name='layout_content'} - {include file='forms/form.search.main.tpl'} - - {if $bIsResults} - - - {if $aReq.sType == 'topics'} - {include file='topics/topic_list.tpl'} - {elseif $aReq.sType == 'comments'} - {include file='comments/comment_list.tpl'} - {else} - {hook run='search_result' sType=$aReq.sType} - {/if} - {else} - {$aLang.search_results_empty} - {/if} -{/block} \ No newline at end of file diff --git a/templates/skin/synio/actions/ActionSearch/index.tpl b/templates/skin/synio/actions/ActionSearch/index.tpl index de4e003c..12f4c1f9 100644 --- a/templates/skin/synio/actions/ActionSearch/index.tpl +++ b/templates/skin/synio/actions/ActionSearch/index.tpl @@ -4,8 +4,42 @@ {extends file='layouts/layout.base.tpl'} +{block name='layout_options'} + {$bNoSidebar = true} +{/block} + {block name='layout_page_title'}{$aLang.search}{/block} {block name='layout_content'} {include file='forms/form.search.main.tpl'} + + {if $bIsResults} + + + {if $aReq.sType == 'topics'} + {include file='topics/topic_list.tpl'} + {elseif $aReq.sType == 'comments'} + {include file='comments/comment_list.tpl'} + {else} + {hook run='search_result' sType=$aReq.sType} + {/if} + {elseif $aReq.q} + {$aLang.search_results_empty} + {/if} {/block} \ No newline at end of file diff --git a/templates/skin/synio/actions/ActionSearch/results.tpl b/templates/skin/synio/actions/ActionSearch/results.tpl deleted file mode 100644 index 281e5639..00000000 --- a/templates/skin/synio/actions/ActionSearch/results.tpl +++ /dev/null @@ -1,41 +0,0 @@ -{** - * Результаты поиска - *} - -{extends file='layouts/layout.base.tpl'} - -{block name='layout_page_title'}{$aLang.search_results}{/block} - -{block name='layout_content'} - {include file='forms/form.search.main.tpl'} - - {if $bIsResults} - - - - {if $aReq.sType == 'topics'} - {include file='topics/topic_list.tpl'} - {elseif $aReq.sType == 'comments'} - {include file='comments/comment_list.tpl'} - {else} - {hook run='search_result' sType=$aReq.sType} - {/if} - {else} - {$aLang.search_results_empty} - {/if} -{/block} \ No newline at end of file