From e2149e3d8b87b382563a9def6f376a5f289754d3 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Fri, 12 May 2006 12:38:32 +0000
Subject: Merge from 3.0 branch till 1054.

---
 .../Samples/LabeledTextBox2/LabeledTextBox.php     |  2 +-
 demos/quickstart/protected/pages/Search.page       | 29 ++++++++++++++++++----
 demos/quickstart/protected/pages/Search.php        | 14 ++++++++---
 3 files changed, 36 insertions(+), 9 deletions(-)

(limited to 'demos/quickstart/protected/pages')

diff --git a/demos/quickstart/protected/pages/Controls/Samples/LabeledTextBox2/LabeledTextBox.php b/demos/quickstart/protected/pages/Controls/Samples/LabeledTextBox2/LabeledTextBox.php
index 5bbf4ce2..fc912003 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/LabeledTextBox2/LabeledTextBox.php
+++ b/demos/quickstart/protected/pages/Controls/Samples/LabeledTextBox2/LabeledTextBox.php
@@ -5,7 +5,7 @@ class LabeledTextBox extends TCompositeControl
 	private $_label;
 	private $_textbox;
 
-	protected function createChildControls()
+	public function createChildControls()
 	{
 		$this->_label=new TLabel;
 		$this->_label->setID('Label');
diff --git a/demos/quickstart/protected/pages/Search.page b/demos/quickstart/protected/pages/Search.page
index d2aee66e..d3391222 100644
--- a/demos/quickstart/protected/pages/Search.page
+++ b/demos/quickstart/protected/pages/Search.page
@@ -3,10 +3,29 @@
 	<div class="search">
 	<com:SearchBox ID="search"  />
 	</div>
-	<com:TRepeater id="results">
+
+	<com:TRepeater id="api_results">
 	<prop:HeaderTemplate>
 	<div class="searchHeader">
-		Found <%# $this->Parent->Data->Count %> results.
+		Found <%# $this->Parent->Data->Count %> classes in API documentation.
+	</div>
+	</prop:HeaderTemplate>
+	<prop:ItemTemplate>
+	<div class="searchAPIItem">		
+		<div class="searchItemLink">
+		<%# $this->ItemIndex + 1 %>.
+		<a href="http://www.pradosoft.com/docs/manual/<%# $this->DataItem->link %>">
+			<%# $this->DataItem->title %>
+		</a>
+		</div>
+	</div>
+	</prop:ItemTemplate>
+	</com:TRepeater>
+
+	<com:TRepeater id="quickstart_results">
+	<prop:HeaderTemplate>
+	<div class="searchHeader">
+		Found <%# $this->Parent->Data->Count %> results in quickstart tutorial.
 	</div>
 	</prop:HeaderTemplate>
 	<prop:ItemTemplate>
@@ -20,9 +39,9 @@
 		<p class="searchItemBody"><%# $this->Page->HighlightSearch($this->DataItem->text) %></p>
 	</div>
 	</prop:ItemTemplate>
-	<prop:EmptyTemplate>
-		Unable to find "<%= htmlentities($this->Page->search->Text) %>".
-	</prop:EmptyTemplate>
 	</com:TRepeater>
+	<com:TPanel id="emptyResult" CssClass="empty_search_result" Visible="false">
+	No results available for "<%= htmlentities($this->Page->search->Text) %>".
+	</com:TPanel>
 </div>	
 </com:TContent>
\ No newline at end of file
diff --git a/demos/quickstart/protected/pages/Search.php b/demos/quickstart/protected/pages/Search.php
index c7bdce89..297d2f50 100644
--- a/demos/quickstart/protected/pages/Search.php
+++ b/demos/quickstart/protected/pages/Search.php
@@ -9,9 +9,17 @@ class Search extends TPage
 	{
 		if(!$this->IsPostBack && strlen($text = $this->search->getText()) > 0)
 		{
-			$search = $this->getApplication()->getModule("search");
-			$this->results->setDataSource($search->find($text));
-			$this->results->dataBind();
+			$quickstart = $this->getApplication()->getModule("quickstart_search");
+			$hits_1 =  $quickstart->find($text);
+			$this->quickstart_results->setDataSource($hits_1);
+			$this->quickstart_results->dataBind();
+
+			$api = $this->getApplication()->getModule("api_search");
+			$hits_2 = $api->find($text);
+			$this->api_results->setDataSource($hits_2);
+			$this->api_results->dataBind();
+			
+			$this->emptyResult->setVisible(count($hits_1)+count($hits_2) == 0);
 		}
 	}
 	
-- 
cgit v1.2.3