Merge from 3.0 branch till 1103

6 files changed, 135 insertions, 13 deletions

diff --git a/demos/blog/protected/Pages/Admin/AdminMenu.php b/demos/blog/protected/Pages/Admin/AdminMenu.php
index 40f40b88..9e46acea 100644
--- a/demos/blog/protected/Pages/Admin/AdminMenu.php
+++ b/demos/blog/protected/Pages/Admin/AdminMenu.php
@@ -1,5 +1,22 @@
 <?php

+/**

+ * AdminMenu class file

+ *

+ * @author Qiang Xue <qiang.xue@gmail.com>

+ * @link http://www.pradosoft.com/

+ * @copyright Copyright &copy; 2006 PradoSoft

+ * @license http://www.pradosoft.com/license/

+ * @version $Revision: $  $Date: $

+ */

 

+/**

+ * AdminMenu class

+ *

+ * @author Qiang Xue <qiang.xue@gmail.com>

+ * @link http://www.pradosoft.com/

+ * @copyright Copyright &copy; 2006 PradoSoft

+ * @license http://www.pradosoft.com/license/

+ */

 class AdminMenu extends TTemplateControl

 {

 }

diff --git a/demos/blog/protected/Pages/Admin/ConfigMan.page b/demos/blog/protected/Pages/Admin/ConfigMan.page
index ad728284..69ee0899 100644
--- a/demos/blog/protected/Pages/Admin/ConfigMan.page
+++ b/demos/blog/protected/Pages/Admin/ConfigMan.page
@@ -4,16 +4,16 @@
 

 <com:Application.Pages.Admin.AdminMenu />

 

-<com:TPanel GroupingText="Site settings">

+<com:TPanel GroupingText="General settings">

 

 <span class="input-label">Title</span>

 <br/>

-<com:TTextBox ID="SiteTitle" />

+<com:TTextBox ID="SiteTitle" Columns="50"/>

 <br/>

 

 <span class="input-label">Subtitle</span>

 <br/>

-<com:TTextBox ID="SiteSubtitle" />

+<com:TTextBox ID="SiteSubtitle" Columns="50"/>

 <br/>

 

 <span class="input-label">Owner name</span>

@@ -28,7 +28,7 @@
 

 <span class="input-label">Site theme</span>

 <br/>

-<com:TDropDownList ID="ThemeList" />

+<com:TDropDownList ID="ThemeName" />

 <br/>

 

 </com:TPanel>

@@ -36,7 +36,7 @@
 

 <com:TPanel GroupingText="Account settings">

 

-<com:TCheckBox ID="MultipleUser" Text="Allow multiple users" />

+<com:TCheckBox ID="MultipleUser" Text="Allow creating new accounts" />

 <br/>

 

 <com:TCheckBox ID="AccountApproval" Text="New accounts need approval" />

@@ -46,11 +46,26 @@
 

 <com:TPanel GroupingText="Post settings">

 

+<span class="input-label">Number of posts per page</span>

+<com:TTextBox ID="PostPerPage" Columns="8"/>

+<com:TRegularExpressionValidator

+	ControlToValidate="PostPerPage"

+	ValidationGroup="settings"

+	Display="Dynamic"

+	RegularExpression="[1-9]\d*"

+	Text="Please enter a number." />

+<br/>

+

 <com:TCheckBox ID="PostApproval" Text="New posts need approval" />

 <br/>

 

 </com:TPanel>

-

-<com:TLinkButton Text="Save" OnClick="saveButtonClicked" />

+<br/>

+<com:TLinkButton

+	Text="Save"

+	ValidationGroup="settings"

+	CssClass="link-button"

+	OnClick="saveButtonClicked" />

+<com:TLabel ID="Result" Visible=<%= $this->IsPostBack && $this->IsValid %> Text="Your changes have been saved." />

 

 </com:TContent>
\ No newline at end of file
diff --git a/demos/blog/protected/Pages/Admin/ConfigMan.php b/demos/blog/protected/Pages/Admin/ConfigMan.php
index dcbe1537..6443e5a0 100644
--- a/demos/blog/protected/Pages/Admin/ConfigMan.php
+++ b/demos/blog/protected/Pages/Admin/ConfigMan.php
@@ -1,14 +1,74 @@
 <?php

+/**

+ * ConfigMan class file

+ *

+ * @author Qiang Xue <qiang.xue@gmail.com>

+ * @link http://www.pradosoft.com/

+ * @copyright Copyright &copy; 2006 PradoSoft

+ * @license http://www.pradosoft.com/license/

+ * @version $Revision: $  $Date: $

+ */

 

+/**

+ * ConfigMan class

+ *

+ * @author Qiang Xue <qiang.xue@gmail.com>

+ * @link http://www.pradosoft.com/

+ * @copyright Copyright &copy; 2006 PradoSoft

+ * @license http://www.pradosoft.com/license/

+ */

 class ConfigMan extends BlogPage

 {

+	const CONFIG_FILE='Application.Data.Settings';

+

 	public function onLoad($param)

 	{

 		parent::onLoad($param);

+		if(!$this->IsPostBack)

+		{

+			$parameters=$this->Application->Parameters;

+			$this->SiteTitle->Text=$parameters['SiteTitle'];

+			$this->SiteSubtitle->Text=$parameters['SiteSubtitle'];

+			$this->SiteOwner->Text=$parameters['SiteOwner'];

+			$this->AdminEmail->Text=$parameters['AdminEmail'];

+			$this->MultipleUser->Checked=TPropertyValue::ensureBoolean($parameters['MultipleUser']);

+			$this->AccountApproval->Checked=TPropertyValue::ensureBoolean($parameters['AccountApproval']);

+			$this->PostPerPage->Text=$parameters['PostPerPage'];

+			$this->PostApproval->Checked=TPropertyValue::ensureBoolean($parameters['PostApproval']);

+			$themes=$this->Service->ThemeManager->AvailableThemes;

+			$this->ThemeName->DataSource=$themes;

+			$this->ThemeName->dataBind();

+			$this->ThemeName->SelectedValue=array_search($parameters['ThemeName'],$themes);

+		}

 	}

 

 	public function saveButtonClicked($sender,$param)

 	{

+		$dom=new TXmlDocument;

+		$dom->Encoding='utf-8';

+		$dom->TagName='parameters';

+		$elements=$dom->Elements;

+		$elements[]=$this->createParameter('SiteTitle',$this->SiteTitle->Text);

+		$elements[]=$this->createParameter('SiteSubtitle',$this->SiteSubtitle->Text);

+		$elements[]=$this->createParameter('SiteOwner',$this->SiteOwner->Text);

+		$elements[]=$this->createParameter('AdminEmail',$this->AdminEmail->Text);

+		$elements[]=$this->createParameter('MultipleUser',$this->MultipleUser->Checked);

+		$elements[]=$this->createParameter('AccountApproval',$this->AccountApproval->Checked);

+		$elements[]=$this->createParameter('PostPerPage',$this->PostPerPage->Text);

+		$elements[]=$this->createParameter('PostApproval',$this->PostApproval->Checked);

+		$themeName=$this->ThemeName->SelectedItem->Text;

+		$elements[]=$this->createParameter('ThemeName',$themeName);

+		$dom->saveToFile(Prado::getPathOfNamespace(self::CONFIG_FILE,'.xml'));

+		if($themeName!==$this->Theme->Name)

+			$this->Response->reload();

+	}

+

+	private function createParameter($id,$value)

+	{

+		$element=new TXmlElement('parameter');

+		$element->Attributes['id']=$id;

+		$element->Attributes['value']=TPropertyValue::ensureString($value);

+		return $element;

 	}

 }

 

diff --git a/demos/blog/protected/Pages/Admin/PostMan.php b/demos/blog/protected/Pages/Admin/PostMan.php
index a99332eb..349278fc 100644
--- a/demos/blog/protected/Pages/Admin/PostMan.php
+++ b/demos/blog/protected/Pages/Admin/PostMan.php
@@ -1,13 +1,30 @@
 <?php

+/**

+ * PostMan class file

+ *

+ * @author Qiang Xue <qiang.xue@gmail.com>

+ * @link http://www.pradosoft.com/

+ * @copyright Copyright &copy; 2006 PradoSoft

+ * @license http://www.pradosoft.com/license/

+ * @version $Revision: $  $Date: $

+ */

 

+/**

+ * PostMan class

+ *

+ * @author Qiang Xue <qiang.xue@gmail.com>

+ * @link http://www.pradosoft.com/

+ * @copyright Copyright &copy; 2006 PradoSoft

+ * @license http://www.pradosoft.com/license/

+ */

 class PostMan extends BlogPage

 {

 	protected function bindData()

 	{

 		$offset=$this->PostGrid->CurrentPageIndex*$this->PostGrid->PageSize;

 		$limit=$this->PostGrid->PageSize;

-		$this->PostGrid->DataSource=$this->DataAccess->queryPosts('','','','ORDER BY a.status DESC, create_time DESC',"LIMIT $offset,$limit");

-		$this->PostGrid->VirtualItemCount=$this->DataAccess->queryPostCount('','','');

+		$this->PostGrid->DataSource=$this->DataAccess->queryPosts('','','ORDER BY a.status DESC, create_time DESC',"LIMIT $offset,$limit");

+		$this->PostGrid->VirtualItemCount=$this->DataAccess->queryPostCount('','');

 		$this->PostGrid->dataBind();

 	}

 

diff --git a/demos/blog/protected/Pages/Admin/Settings.page b/demos/blog/protected/Pages/Admin/Settings.page
deleted file mode 100644
index 48dfde96..00000000
--- a/demos/blog/protected/Pages/Admin/Settings.page
+++ /dev/null
@@ -1,4 +0,0 @@
-<com:TContent ID="main" >

-Welcome, <com:TLabel Text=<%= $this->User->Name %> />!

-This page contains site settings accessible only to site admin.

-</com:TContent>
\ No newline at end of file
diff --git a/demos/blog/protected/Pages/Admin/UserMan.php b/demos/blog/protected/Pages/Admin/UserMan.php
index 1cb62482..b13703a1 100644
--- a/demos/blog/protected/Pages/Admin/UserMan.php
+++ b/demos/blog/protected/Pages/Admin/UserMan.php
@@ -1,5 +1,22 @@
 <?php

+/**

+ * UserMan class file

+ *

+ * @author Qiang Xue <qiang.xue@gmail.com>

+ * @link http://www.pradosoft.com/

+ * @copyright Copyright &copy; 2006 PradoSoft

+ * @license http://www.pradosoft.com/license/

+ * @version $Revision: $  $Date: $

+ */

 

+/**

+ * UserMan class

+ *

+ * @author Qiang Xue <qiang.xue@gmail.com>

+ * @link http://www.pradosoft.com/

+ * @copyright Copyright &copy; 2006 PradoSoft

+ * @license http://www.pradosoft.com/license/

+ */

 class UserMan extends BlogPage

 {

 	protected function bindData()