Ticket #588

modules/boonex/english/data/langs/system/en.xml

@@ -440,7 +440,6 @@
 	<string name="_adm_block_cpt_modules_upload"><![CDATA[Add New Module]]></string>
 	<string name="_adm_block_cpt_purchases"><![CDATA[Purchases]]></string>
 	<string name="_adm_block_cpt_search"><![CDATA[Search]]></string>
-	<string name="_adm_block_cpt_search_results"><![CDATA[Search Results]]></string>
 	<string name="_adm_block_cpt_space"><![CDATA[Space Usage]]></string>
 	<string name="_adm_block_cpt_templates"><![CDATA[Templates]]></string>
 	<string name="_adm_block_cpt_updates"><![CDATA[Updates]]></string>

modules/boonex/russian/data/langs/system/ru.xml

@@ -440,7 +440,6 @@
 	<string name="_adm_block_cpt_modules_upload"><![CDATA[Добавить новый Модуль]]></string>
 	<string name="_adm_block_cpt_purchases"><![CDATA[Покупки]]></string>
 	<string name="_adm_block_cpt_search"><![CDATA[Поиск]]></string>
-	<string name="_adm_block_cpt_search_results"><![CDATA[Результаты поиска]]></string>
 	<string name="_adm_block_cpt_space"><![CDATA[Использовано места]]></string>
 	<string name="_adm_block_cpt_templates"><![CDATA[Темы]]></string>
 	<string name="_adm_block_cpt_updates"><![CDATA[Обновления]]></string>

studio/template/scripts/BxBaseStudioStore.php

@@ -247,19 +247,20 @@ class BxBaseStudioStore extends BxDolStudioStore
     	            'list' => $this->displayProducts($aProducts),
     	            'paginate' => ''
     	        ));
-            }
-    
-            $sContent = '';
-            $sContent .= $this->getBlockCode(array(
+            }         
+
+            $sContent = $this->getBlockCode(array(
     			'caption' => '_adm_block_cpt_search',
-    			'items' => $oForm->getCode()
+    			'items' => $oTemplate->parseHtmlByName('str_search.html', array(
+                    'form' => $oForm->getCode(),
+                    'bx_if:show_results' => array(
+                        'condition' => !empty($sResults),
+                        'content' => array(
+                            'results' => $sResults
+                        )
+                    )
+                ))
     		));
-    
-    		if(!empty($sResults))
-    		    $sContent .= $this->getBlockCode(array(
-    				'caption' => '_adm_block_cpt_search_results',
-    				'items' => $sResults
-    			));
         }
         else 
             $sContent = $this->getBlockCode(array(

studio/template/str_search.html

@@ -0,0 +1,4 @@
+__form__
+<bx_if:show_results>
+    <div class="bx-def-padding-sec-top">__results__</div>
+</bx_if:show_results>