From 10ae6ed6ee263644d3d7780153520af76215d178 Mon Sep 17 00:00:00 2001 From: xue <> Date: Tue, 6 Dec 2005 15:47:03 +0000 Subject: --- demos/controls/protected/pages/HomePage.tpl | 4 +++- demos/controls/protected/pages/LoginPage.tpl | 7 ++++++- demos/controls/protected/pages/PlainPage.tpl | 7 ++++++- demos/controls/protected/pages/master/MasterPage.tpl | 18 ++++++++++++++---- demos/controls/protected/pages/private/MemberPage.tpl | 7 ++++++- framework/Web/THttpRequest.php | 4 ++-- framework/Web/UI/TClientScriptManager.php | 4 ++-- framework/Web/UI/TForm.php | 4 ++-- 8 files changed, 41 insertions(+), 14 deletions(-) diff --git a/demos/controls/protected/pages/HomePage.tpl b/demos/controls/protected/pages/HomePage.tpl index 58f5505b..9cb24d3f 100644 --- a/demos/controls/protected/pages/HomePage.tpl +++ b/demos/controls/protected/pages/HomePage.tpl @@ -1,6 +1,7 @@ <%@ MasterClass="Pages.master.MasterPage" %> - + +

Welcome! <%=$this->User->Name %>

@@ -13,5 +14,6 @@ | +

\ No newline at end of file diff --git a/demos/controls/protected/pages/LoginPage.tpl b/demos/controls/protected/pages/LoginPage.tpl index 04edae1c..db687e00 100644 --- a/demos/controls/protected/pages/LoginPage.tpl +++ b/demos/controls/protected/pages/LoginPage.tpl @@ -1,4 +1,7 @@ +<%@ MasterClass="Pages.master.MasterPage" %> + +

@@ -7,4 +10,6 @@ - \ No newline at end of file +

+ + \ No newline at end of file diff --git a/demos/controls/protected/pages/PlainPage.tpl b/demos/controls/protected/pages/PlainPage.tpl index 7591d700..1238a5fb 100644 --- a/demos/controls/protected/pages/PlainPage.tpl +++ b/demos/controls/protected/pages/PlainPage.tpl @@ -1 +1,6 @@ -This is a page without explicitly defined page class. \ No newline at end of file +<%@ MasterClass="Pages.master.MasterPage" %> + +

+This is a page without explicitly defined page class. +

+ \ No newline at end of file diff --git a/demos/controls/protected/pages/master/MasterPage.tpl b/demos/controls/protected/pages/master/MasterPage.tpl index 6bead633..fcca7230 100644 --- a/demos/controls/protected/pages/master/MasterPage.tpl +++ b/demos/controls/protected/pages/master/MasterPage.tpl @@ -1,8 +1,18 @@ - -test - + + - + +test + + + +

+ +

+ \ No newline at end of file diff --git a/demos/controls/protected/pages/private/MemberPage.tpl b/demos/controls/protected/pages/private/MemberPage.tpl index a19c934c..6582aec6 100644 --- a/demos/controls/protected/pages/private/MemberPage.tpl +++ b/demos/controls/protected/pages/private/MemberPage.tpl @@ -1,8 +1,13 @@ +<%@ MasterClass="Pages.master.MasterPage" %> + +

Congratulations, User->Name%> />!
<%= $this->Application->User->Name; %> You have reached this member-only area. - \ No newline at end of file +

+ + \ No newline at end of file diff --git a/framework/Web/THttpRequest.php b/framework/Web/THttpRequest.php index bd61765c..80e87d15 100644 --- a/framework/Web/THttpRequest.php +++ b/framework/Web/THttpRequest.php @@ -369,10 +369,10 @@ class THttpRequest extends TComponent implements IModule if(is_array($getItems) || $getItems instanceof Traversable) { foreach($getItems as $name=>$value) - $url.='&'.urlencode($name).'='.urlencode($value); + $url.='&'.urlencode($name).'='.urlencode($value); } if(defined('SID') && SID != '') - $url.='&'.SID; + $url.='&'.SID; return $url; } diff --git a/framework/Web/UI/TClientScriptManager.php b/framework/Web/UI/TClientScriptManager.php index bb8c44a3..03ac8479 100644 --- a/framework/Web/UI/TClientScriptManager.php +++ b/framework/Web/UI/TClientScriptManager.php @@ -97,7 +97,7 @@ class TClientScriptManager extends TComponent if(!$options || (!$options->getPerformValidation() && !$options->getTrackFocus() && $options->getClientSubmit() && $options->getActionUrl()=='')) { $this->registerPostBackScript(); - $formID=$this->_page->getForm()->getUniqueID(); + $formID=$this->_page->getForm()->getClientID(); $postback=self::POSTBACK_FUNC.'(\''.$formID.'\',\''.$control->getUniqueID().'\',\''.THttpUtility::quoteJavaScriptString($parameter).'\')'; if($options && $options->getAutoPostBack()) $postback='setTimeout(\''.THttpUtility::quoteJavaScriptString($postback).'\',0)'; @@ -308,7 +308,7 @@ class TClientScriptManager extends TComponent $str.="\n"; } if($str!=='') - $writer->write($str); + $writer->write("

\n".$str."

\n"); } public function renderExpandoAttributes($writer) diff --git a/framework/Web/UI/TForm.php b/framework/Web/UI/TForm.php index 4c619299..72eb2e10 100644 --- a/framework/Web/UI/TForm.php +++ b/framework/Web/UI/TForm.php @@ -11,7 +11,7 @@ class TForm extends TControl protected function addAttributesToRender($writer) { $attributes=$this->getAttributes(); - $writer->addAttribute('name',$this->getName()); +// $writer->addAttribute('name',$this->getName()); $writer->addAttribute('method',$this->getMethod()); $writer->addAttribute('action',$this->getApplication()->getRequest()->getRequestURI()); $attributes->remove('name'); @@ -41,7 +41,7 @@ class TForm extends TControl else throw new Exception('Only IButtonControl can be default button.'); } - $writer->addAttribute('id',$this->getUniqueID()); + $writer->addAttribute('id',$this->getClientID()); foreach($attributes as $name=>$value) $writer->addAttribute($name,$value); } -- cgit v1.2.3