Merge from 3.0 branch till 1099.

10 files changed, 391 insertions, 0 deletions

diff --git a/demos/blog/protected/Pages/Admin/AdminMenu.php b/demos/blog/protected/Pages/Admin/AdminMenu.php
new file mode 100644
index 00000000..40f40b88
--- /dev/null
+++ b/demos/blog/protected/Pages/Admin/AdminMenu.php
@@ -0,0 +1,7 @@
+<?php

+

+class AdminMenu extends TTemplateControl

+{

+}

+

+?>
\ No newline at end of file
diff --git a/demos/blog/protected/Pages/Admin/AdminMenu.tpl b/demos/blog/protected/Pages/Admin/AdminMenu.tpl
new file mode 100644
index 00000000..596f3ed2
--- /dev/null
+++ b/demos/blog/protected/Pages/Admin/AdminMenu.tpl
@@ -0,0 +1,16 @@
+<div class="submenu">

+<com:XListMenu ActiveCssClass="submenu-active" InactiveCssClass="submenu-inactive">

+	<com:XListMenuItem

+		Text="Posts"

+		PagePath="Admin.PostMan"

+		NavigateUrl=<%= $this->Service->constructUrl('Admin.PostMan') %> />

+	<com:XListMenuItem

+		Text="Users"

+		PagePath="Admin.UserMan"

+		NavigateUrl=<%= $this->Service->constructUrl('Admin.UserMan') %> />

+	<com:XListMenuItem

+		Text="Configurations"

+		PagePath="Admin.ConfigMan"

+		NavigateUrl=<%= $this->Service->constructUrl('Admin.ConfigMan') %> />

+</com:XListMenu>

+</div>
\ No newline at end of file
diff --git a/demos/blog/protected/Pages/Admin/ConfigMan.page b/demos/blog/protected/Pages/Admin/ConfigMan.page
new file mode 100644
index 00000000..ad728284
--- /dev/null
+++ b/demos/blog/protected/Pages/Admin/ConfigMan.page
@@ -0,0 +1,56 @@
+<com:TContent ID="Main">

+

+<h2>Administration Center</h2>

+

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

+

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

+

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

+<br/>

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

+<br/>

+

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

+<br/>

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

+<br/>

+

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

+<br/>

+<com:TTextBox ID="SiteOwner" />

+<br/>

+

+<span class="input-label">Owner email</span>

+<br/>

+<com:TTextBox ID="AdminEmail" />

+<br/>

+

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

+<br/>

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

+<br/>

+

+</com:TPanel>

+

+

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

+

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

+<br/>

+

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

+<br/>

+

+</com:TPanel>

+

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

+

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

+<br/>

+

+</com:TPanel>

+

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

+

+</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
new file mode 100644
index 00000000..dcbe1537
--- /dev/null
+++ b/demos/blog/protected/Pages/Admin/ConfigMan.php
@@ -0,0 +1,15 @@
+<?php

+

+class ConfigMan extends BlogPage

+{

+	public function onLoad($param)

+	{

+		parent::onLoad($param);

+	}

+

+	public function saveButtonClicked($sender,$param)

+	{

+	}

+}

+

+?>
\ No newline at end of file
diff --git a/demos/blog/protected/Pages/Admin/PostMan.page b/demos/blog/protected/Pages/Admin/PostMan.page
new file mode 100644
index 00000000..8ba8ef29
--- /dev/null
+++ b/demos/blog/protected/Pages/Admin/PostMan.page
@@ -0,0 +1,76 @@
+<com:TContent ID="Main">

+

+<h2>Administration Center</h2>

+

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

+

+<com:TDataGrid ID="PostGrid"

+	AutoGenerateColumns="false"

+	DataKeyField="ID"

+	CssClass="grid"

+	HeaderStyle.CssClass="grid-header"

+	ItemStyle.CssClass="grid-row1"

+	SelectedItemStyle.CssClass="grid-row-selected"

+	AlternatingItemStyle.CssClass="grid-row2"

+	AllowPaging="true"

+	AllowCustomPaging="true"

+	PageSize="20"

+	PagerStyle.CssClass="grid-pager"

+	PagerStyle.Mode="Numeric"

+	OnPageIndexChanged="changePage"

+	OnPagerCreated="pagerCreated"

+	OnEditCommand="editItem"

+	OnUpdateCommand="saveItem"

+	OnCancelCommand="cancelItem"

+	>

+	<com:THyperLinkColumn

+		HeaderText="Title"

+		DataNavigateUrlField="ID"

+		DataNavigateUrlFormatString="#$this->Service->constructUrl('Posts.ViewPost',array('id'=>{0}))"

+		DataTextField="Title"

+		/>

+	<com:THyperLinkColumn

+		HeaderText="Author"

+		DataNavigateUrlField="AuthorID"

+		DataNavigateUrlFormatString="#$this->Service->constructUrl('Users.ViewUser',array('id'=>{0}))"

+		DataTextField="AuthorName"

+		/>

+	<com:TTemplateColumn

+		HeaderText="Status"

+		ItemStyle.HorizontalAlign="Center"

+		ItemStyle.Width="90px" >

+		<prop:ItemTemplate>

+		<%#

+			$this->Parent->DataItem->Status===0 ?

+				'Published' :

+				($this->Parent->DataItem->Status===1 ? 'Draft' : 'Pending')

+		%>

+		</prop:ItemTemplate>

+		<prop:EditItemTemplate>

+		<com:TDropDownList ID="PostStatus" SelectedValue=<%# $this->Parent->DataItem->Status %> >

+			<com:TListItem Value="0" Text="Published" />

+			<com:TListItem Value="1" Text="Draft" />

+			<com:TListItem Value="2" Text="Pending" />

+		</com:TDropDownList>

+		</prop:EditItemTemplate>

+	</com:TTemplateColumn>

+	<com:TBoundColumn

+		HeaderText="Time"

+		ReadOnly="true"

+		DataField="CreateTime"

+		DataFormatString="#date('M j, Y',{0})"

+		ItemStyle.Wrap="false"

+		ItemStyle.Width="90px"

+		ItemStyle.HorizontalAlign="Center"

+		/>

+	<com:TEditCommandColumn

+		HeaderText="Command"

+		HeaderStyle.Width="80px"

+		UpdateText="Save"

+		ItemStyle.HorizontalAlign="Center"

+		ItemStyle.Wrap="false"

+		ItemStyle.Width="80px"

+		/>

+</com:TDataGrid>

+

+</com:TContent>
\ No newline at end of file
diff --git a/demos/blog/protected/Pages/Admin/PostMan.php b/demos/blog/protected/Pages/Admin/PostMan.php
new file mode 100644
index 00000000..a99332eb
--- /dev/null
+++ b/demos/blog/protected/Pages/Admin/PostMan.php
@@ -0,0 +1,56 @@
+<?php

+

+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->dataBind();

+	}

+

+	public function onLoad($param)

+	{

+		parent::onLoad($param);

+		if(!$this->IsPostBack)

+			$this->bindData();

+	}

+

+	public function changePage($sender,$param)

+	{

+		$this->PostGrid->CurrentPageIndex=$param->NewPageIndex;

+		$this->bindData();

+	}

+

+	public function pagerCreated($sender,$param)

+	{

+		$param->Pager->Controls->insertAt(0,'Page: ');

+	}

+

+	public function editItem($sender,$param)

+	{

+		$this->PostGrid->EditItemIndex=$param->Item->ItemIndex;

+		$this->bindData();

+	}

+

+	public function saveItem($sender,$param)

+	{

+		$item=$param->Item;

+		$postID=$this->PostGrid->DataKeys[$item->ItemIndex];

+		$postRecord=$this->DataAccess->queryPostByID($postID);

+		$postRecord->Status=TPropertyValue::ensureInteger($item->Cells[2]->PostStatus->SelectedValue);

+		$this->DataAccess->updatePost($postRecord);

+		$this->PostGrid->EditItemIndex=-1;

+		$this->bindData();

+	}

+

+	public function cancelItem($sender,$param)

+	{

+		$this->PostGrid->EditItemIndex=-1;

+		$this->bindData();

+	}

+}

+

+?>
\ No newline at end of file
diff --git a/demos/blog/protected/Pages/Admin/Settings.page b/demos/blog/protected/Pages/Admin/Settings.page
new file mode 100644
index 00000000..48dfde96
--- /dev/null
+++ b/demos/blog/protected/Pages/Admin/Settings.page
@@ -0,0 +1,4 @@
+<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.page b/demos/blog/protected/Pages/Admin/UserMan.page
new file mode 100644
index 00000000..a8b634c6
--- /dev/null
+++ b/demos/blog/protected/Pages/Admin/UserMan.page
@@ -0,0 +1,95 @@
+<com:TContent ID="Main">

+

+<h2>Administration Center</h2>

+

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

+

+<com:TDataGrid ID="UserGrid"

+	AutoGenerateColumns="false"

+	DataKeyField="ID"

+	CssClass="grid"

+	HeaderStyle.CssClass="grid-header"

+	ItemStyle.CssClass="grid-row1"

+	SelectedItemStyle.CssClass="grid-row-selected"

+	AlternatingItemStyle.CssClass="grid-row2"

+	AllowPaging="true"

+	AllowCustomPaging="true"

+	PageSize="20"

+	PagerStyle.CssClass="grid-pager"

+	PagerStyle.Mode="Numeric"

+	OnPageIndexChanged="changePage"

+	OnPagerCreated="pagerCreated"

+	OnEditCommand="editItem"

+	OnUpdateCommand="saveItem"

+	OnCancelCommand="cancelItem"

+	>

+	<com:THyperLinkColumn

+		HeaderText="Name"

+		DataNavigateUrlField="ID"

+		DataNavigateUrlFormatString="#$this->Service->constructUrl('Users.ViewUser',array('id'=>{0}))"

+		DataTextField="Name"

+		/>

+	<com:TTemplateColumn

+		HeaderText="Role"

+		ItemStyle.HorizontalAlign="Center"

+		ItemStyle.Wrap="false"

+		ItemStyle.Width="7px" >

+		<prop:ItemTemplate>

+		<%#	$this->Parent->DataItem->Role===0 ?	'User' : 'Admin' %>

+		</prop:ItemTemplate>

+		<prop:EditItemTemplate>

+		<com:TDropDownList ID="UserRole" SelectedValue=<%# $this->Parent->DataItem->Role %> >

+			<com:TListItem Value="0" Text="User" />

+			<com:TListItem Value="1" Text="Admin" />

+		</com:TDropDownList>

+		</prop:EditItemTemplate>

+	</com:TTemplateColumn>

+	<com:TTemplateColumn

+		HeaderText="Status"

+		ItemStyle.HorizontalAlign="Center"

+		ItemStyle.Wrap="false"

+		ItemStyle.Width="70px" >

+		<prop:ItemTemplate>

+		<%#

+			$this->Parent->DataItem->Status===0 ?

+				'Normal' :

+				($this->Parent->DataItem->Status===1 ? 'Disabled' : 'Pending')

+		%>

+		</prop:ItemTemplate>

+		<prop:EditItemTemplate>

+		<com:TDropDownList ID="UserStatus" SelectedValue=<%# $this->Parent->DataItem->Status %> >

+			<com:TListItem Value="0" Text="Normal" />

+			<com:TListItem Value="1" Text="Disabled" />

+			<com:TListItem Value="2" Text="Pending" />

+		</com:TDropDownList>

+		</prop:EditItemTemplate>

+	</com:TTemplateColumn>

+	<com:TBoundColumn

+		HeaderText="Email"

+		DataField="Email"

+		ItemStyle.Wrap="false"

+		ItemStyle.Width="90px"

+		ReadOnly="true"	>

+		<prop:DataFormatString>#

+		'<a href="mailto:'.{0}.'">'.{0}.'</a>'

+		</prop:DataFormatString>

+	</com:TBoundColumn>

+	<com:TBoundColumn

+		HeaderText="Reg. Date"

+		DataField="CreateTime"

+		DataFormatString="#date('M j, Y',{0})"

+		ReadOnly="true"

+		ItemStyle.Wrap="false"

+		ItemStyle.Width="90px"

+		/>

+	<com:TEditCommandColumn

+		HeaderText="Command"

+		HeaderStyle.Width="80px"

+		UpdateText="Save"

+		ItemStyle.HorizontalAlign="Center"

+		ItemStyle.Wrap="false"

+		ItemStyle.Width="80px"

+		/>

+</com:TDataGrid>

+

+</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
new file mode 100644
index 00000000..1cb62482
--- /dev/null
+++ b/demos/blog/protected/Pages/Admin/UserMan.php
@@ -0,0 +1,58 @@
+<?php

+

+class UserMan extends BlogPage

+{

+	protected function bindData()

+	{

+		$author=$this->User->ID;

+		$offset=$this->UserGrid->CurrentPageIndex*$this->UserGrid->PageSize;

+		$limit=$this->UserGrid->PageSize;

+		$this->UserGrid->DataSource=$this->DataAccess->queryUsers('','ORDER BY status DESC, name ASC',"LIMIT $offset,$limit");

+		$this->UserGrid->VirtualItemCount=$this->DataAccess->queryUserCount('');

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

+	}

+

+	public function onLoad($param)

+	{

+		parent::onLoad($param);

+		if(!$this->IsPostBack)

+			$this->bindData();

+	}

+

+	public function changePage($sender,$param)

+	{

+		$this->UserGrid->CurrentPageIndex=$param->NewPageIndex;

+		$this->bindData();

+	}

+

+	public function pagerCreated($sender,$param)

+	{

+		$param->Pager->Controls->insertAt(0,'Page: ');

+	}

+

+	public function editItem($sender,$param)

+	{

+		$this->UserGrid->EditItemIndex=$param->Item->ItemIndex;

+		$this->bindData();

+	}

+

+	public function saveItem($sender,$param)

+	{

+		$item=$param->Item;

+		$userID=$this->UserGrid->DataKeys[$item->ItemIndex];

+		$userRecord=$this->DataAccess->queryUserByID($userID);

+		$userRecord->Role=TPropertyValue::ensureInteger($item->Cells[1]->UserRole->SelectedValue);

+		$userRecord->Status=TPropertyValue::ensureInteger($item->Cells[2]->UserStatus->SelectedValue);

+		$this->DataAccess->updateUser($userRecord);

+		$this->UserGrid->EditItemIndex=-1;

+		$this->bindData();

+	}

+

+	public function cancelItem($sender,$param)

+	{

+		$this->UserGrid->EditItemIndex=-1;

+		$this->bindData();

+	}

+}

+

+?>
\ No newline at end of file
diff --git a/demos/blog/protected/Pages/Admin/config.xml b/demos/blog/protected/Pages/Admin/config.xml
new file mode 100644
index 00000000..c99e5892
--- /dev/null
+++ b/demos/blog/protected/Pages/Admin/config.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+

+<configuration>

+  <authorization>

+    <allow roles="admin" />

+    <deny users="*" />

+  </authorization>

+</configuration>
\ No newline at end of file