From f7ac5047d795e83d63f70bec45422073627800bd Mon Sep 17 00:00:00 2001
From: "ctrlaltca@gmail.com" <>
Date: Wed, 8 Jun 2011 15:36:00 +0000
Subject: patch for #331

---
 framework/Data/ActiveRecord/Scaffold/TScaffoldView.php | 12 ++++++------
 framework/Data/ActiveRecord/Scaffold/TScaffoldView.tpl | 10 ++++++----
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'framework/Data/ActiveRecord')

diff --git a/framework/Data/ActiveRecord/Scaffold/TScaffoldView.php b/framework/Data/ActiveRecord/Scaffold/TScaffoldView.php
index 04420e9a..6201009f 100644
--- a/framework/Data/ActiveRecord/Scaffold/TScaffoldView.php
+++ b/framework/Data/ActiveRecord/Scaffold/TScaffoldView.php
@@ -4,7 +4,7 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id$
  * @package System.Data.ActiveRecord.Scaffold
@@ -113,8 +113,8 @@ class TScaffoldView extends TScaffoldBase
 	{
 		$this->getListView()->setVisible(false);
 		$this->getEditView()->setVisible(true);
-		$this->getAddButton()->setVisible(false);
-		$this->getSearchControl()->setVisible(false);
+		$this->_panForNewButton->setVisible(false);
+		$this->_panForSearch->setVisible(false);
 		$this->getEditView()->getCancelButton()->setVisible(true);
 		$this->getEditView()->getClearButton()->setVisible(false);
 	}
@@ -126,8 +126,8 @@ class TScaffoldView extends TScaffoldBase
 	{
 		$this->getListView()->setVisible(true);
 		$this->getEditView()->setVisible(false);
-		$this->getAddButton()->setVisible(true);
-		$this->getSearchControl()->setVisible(true);
+		$this->_panForNewButton->setVisible(true);
+		$this->_panForSearch->setVisible(true);
 	}
 
 	/**
@@ -140,4 +140,4 @@ class TScaffoldView extends TScaffoldBase
 		$this->showEditView($sender, $param);
 	}
 }
-
+
diff --git a/framework/Data/ActiveRecord/Scaffold/TScaffoldView.tpl b/framework/Data/ActiveRecord/Scaffold/TScaffoldView.tpl
index 01cceb07..eea39526 100644
--- a/framework/Data/ActiveRecord/Scaffold/TScaffoldView.tpl
+++ b/framework/Data/ActiveRecord/Scaffold/TScaffoldView.tpl
@@ -1,9 +1,11 @@
 <div class="scaffold_view">
-<com:TScaffoldSearch ID="_search" ListViewID="_listView" />
+<com:TPanel ID="_panForSearch">
+	<com:TScaffoldSearch ID="_search" ListViewID="_listView" />
+</com:TPanel>
 <com:TScaffoldListView ID="_listView" EditViewID="_editView" />
-<span class="auxilary-button buttons">
-<com:TButton ID="_newButton" Text="Add new record" CssClass="new-button" CommandName="new" />
-</span>
+<com:TPanel ID="_panForNewButton" CssClass="auxilary-button buttons">
+	<com:TButton ID="_newButton" Text="Add new record" CssClass="new-button" CommandName="new" />
+</com:TPanel>
 
 <com:TScaffoldEditView ID="_editView"  Visible="false"/>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3