summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxue <>2006-06-02 13:56:05 +0000
committerxue <>2006-06-02 13:56:05 +0000
commit123e3e47b1194ed75b998cfc6bf26b5595070930 (patch)
tree4f493f321c69a567721965aa11d9b85376f23f3d
parentc6a44b363bdcd6828420ea490a4000f5fc02bbcc (diff)
some minor fixes.
-rw-r--r--demos/blog/protected/Pages/Admin/ConfigMan.page2
-rw-r--r--demos/blog/protected/Pages/Admin/PostMan.page2
-rw-r--r--demos/blog/protected/Pages/Admin/UserMan.page2
-rw-r--r--demos/blog/protected/Pages/Posts/MyPost.page4
-rw-r--r--demos/blog/themes/Fall/style.css5
-rw-r--r--demos/blog/themes/Spring/style.css5
-rw-r--r--demos/blog/themes/Summer/style.css5
-rw-r--r--demos/blog/themes/Winter/style.css5
-rw-r--r--framework/Web/UI/WebControls/TDataBoundControl.php2
-rw-r--r--framework/Web/UI/WebControls/TWizard.php6
10 files changed, 33 insertions, 5 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
diff --git a/demos/blog/themes/Fall/style.css b/demos/blog/themes/Fall/style.css
index 9b18b151..ac4e40e7 100644
--- a/demos/blog/themes/Fall/style.css
+++ b/demos/blog/themes/Fall/style.css
@@ -30,6 +30,11 @@ a img {
border: 0px none;
}
+div {
+ overflow: hidden;
+ word-wrap: break-word;
+}
+
#page {
background-color:#fff;
margin:0 auto;
diff --git a/demos/blog/themes/Spring/style.css b/demos/blog/themes/Spring/style.css
index 6a675c0f..19b8f5ba 100644
--- a/demos/blog/themes/Spring/style.css
+++ b/demos/blog/themes/Spring/style.css
@@ -30,6 +30,11 @@ a img {
border: 0px none;
}
+div {
+ overflow: hidden;
+ word-wrap: break-word;
+}
+
#page {
background-color:#fff;
margin:0 auto;
diff --git a/demos/blog/themes/Summer/style.css b/demos/blog/themes/Summer/style.css
index d7218f7d..939b36ef 100644
--- a/demos/blog/themes/Summer/style.css
+++ b/demos/blog/themes/Summer/style.css
@@ -30,6 +30,11 @@ a img {
border: 0px none;
}
+div {
+ overflow: hidden;
+ word-wrap: break-word;
+}
+
#page {
background-color:#fff;
margin:0 auto;
diff --git a/demos/blog/themes/Winter/style.css b/demos/blog/themes/Winter/style.css
index bfa488fa..1d36859e 100644
--- a/demos/blog/themes/Winter/style.css
+++ b/demos/blog/themes/Winter/style.css
@@ -30,6 +30,11 @@ a img {
border: 0px none;
}
+div {
+ overflow: hidden;
+ word-wrap: break-word;
+}
+
#page {
background:#fff;
margin:0 auto;
diff --git a/framework/Web/UI/WebControls/TDataBoundControl.php b/framework/Web/UI/WebControls/TDataBoundControl.php
index 0bb771bf..9e6ecbf3 100644
--- a/framework/Web/UI/WebControls/TDataBoundControl.php
+++ b/framework/Web/UI/WebControls/TDataBoundControl.php
@@ -59,7 +59,7 @@ abstract class TDataBoundControl extends TWebControl
*/
public function setDataSource($value)
{
- $this->_dataSource=$this->validateDataSource($value);;
+ $this->_dataSource=$this->validateDataSource($value);
$this->onDataSourceChanged();
}
diff --git a/framework/Web/UI/WebControls/TWizard.php b/framework/Web/UI/WebControls/TWizard.php
index fb0c941d..2cc3f346 100644
--- a/framework/Web/UI/WebControls/TWizard.php
+++ b/framework/Web/UI/WebControls/TWizard.php
@@ -623,7 +623,7 @@ class TWizard extends TWebControl implements INamingContainer
}
/**
- * @var TWizardNavigationContainer container of the start navigation
+ * @return TWizardNavigationContainer container of the start navigation
*/
public function getStartNavigation()
{
@@ -631,7 +631,7 @@ class TWizard extends TWebControl implements INamingContainer
}
/**
- * @var TWizardNavigationContainer container of the step navigation
+ * @return TWizardNavigationContainer container of the step navigation
*/
public function getStepNavigation()
{
@@ -639,7 +639,7 @@ class TWizard extends TWebControl implements INamingContainer
}
/**
- * @var TWizardNavigationContainer container of the finish navigation
+ * @return TWizardNavigationContainer container of the finish navigation
*/
public function getFinishNavigation()
{