merge from 3.0 branch till 1133.

4 files changed, 9 insertions, 1 deletions

diff --git a/demos/blog/protected/Pages/Admin/ConfigMan.page b/demos/blog/protected/Pages/Admin/ConfigMan.page
index 5c6cd53d..b959551e 100644
--- a/demos/blog/protected/Pages/Admin/ConfigMan.page
+++ b/demos/blog/protected/Pages/Admin/ConfigMan.page
@@ -1,3 +1,5 @@
+<%@ Title="System Configuration" %>

+

 <com:TContent ID="Main">

 

 <h2>Administration Center</h2>

diff --git a/demos/blog/protected/Pages/Admin/PostMan.page b/demos/blog/protected/Pages/Admin/PostMan.page
index 68ac44f8..9d96af42 100644
--- a/demos/blog/protected/Pages/Admin/PostMan.page
+++ b/demos/blog/protected/Pages/Admin/PostMan.page
@@ -1,3 +1,5 @@
+<%@ Title="Post Management" %>

+

 <com:TContent ID="Main">

 

 <h2>Administration Center</h2>

diff --git a/demos/blog/protected/Pages/Admin/UserMan.page b/demos/blog/protected/Pages/Admin/UserMan.page
index a8b634c6..02b1a069 100644
--- a/demos/blog/protected/Pages/Admin/UserMan.page
+++ b/demos/blog/protected/Pages/Admin/UserMan.page
@@ -1,3 +1,5 @@
+<%@ Title="User Management" %>

+

 <com:TContent ID="Main">

 

 <h2>Administration Center</h2>

diff --git a/demos/blog/protected/Pages/Posts/MyPost.page b/demos/blog/protected/Pages/Posts/MyPost.page
index ca153166..69ba78e4 100644
--- a/demos/blog/protected/Pages/Posts/MyPost.page
+++ b/demos/blog/protected/Pages/Posts/MyPost.page
@@ -1,3 +1,5 @@
+<%@ Title="My Posts" %>

+

 <com:TContent ID="Main">

 

 <h2>My Posts</h2>

@@ -25,7 +27,7 @@
 	<com:TBoundColumn

 		HeaderText="Status"

 		DataField="Status"

-		DataFormatString="#{0}===0?'Published':({0}===1?'Draft':'Pending')"

+		DataFormatString="#{0}===0?'Published':({0}===1?'Draft':({0}===2?'Pending':'Sticky'))"

 		ItemStyle.Width="70px"

 		/>

 	<com:TBoundColumn