diff options
| author | christophe.boulain <> | 2008-12-03 14:22:03 +0000 |
|---|---|---|
| committer | christophe.boulain <> | 2008-12-03 14:22:03 +0000 |
| commit | 6228873cf9d6471463d2413e7dfd7447f759baf2 (patch) | |
| tree | 496a0e658330c39d4caa35602ba9f783b6f24f9c /demos/personal | |
| parent | e8f239fea7351b248302a593a8e5eaa2a88c3e80 (diff) | |
Merge from trunk
Diffstat (limited to 'demos/personal')
| -rw-r--r-- | demos/personal/protected/Pages/Settings.page | 2 | ||||
| -rw-r--r-- | demos/personal/protected/Pages/config.php | 6 | ||||
| -rw-r--r-- | demos/personal/protected/application.php | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/demos/personal/protected/Pages/Settings.page b/demos/personal/protected/Pages/Settings.page index 48dfde96..f461fa13 100644 --- a/demos/personal/protected/Pages/Settings.page +++ b/demos/personal/protected/Pages/Settings.page @@ -1,4 +1,4 @@ -<com:TContent ID="main" >
+<com:TContent ID="content" >
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/personal/protected/Pages/config.php b/demos/personal/protected/Pages/config.php index 7a6c9a6c..23cb184e 100644 --- a/demos/personal/protected/Pages/config.php +++ b/demos/personal/protected/Pages/config.php @@ -3,10 +3,8 @@ return array( 'authorization' => array( array( 'action' => 'deny', - 'properties' => array( - 'pages' => 'Settings', - 'users' => '?', - ), + 'pages' => 'Settings', + 'users' => '?', ), ), 'pages' => array( diff --git a/demos/personal/protected/application.php b/demos/personal/protected/application.php index 0d9cadd4..26100576 100644 --- a/demos/personal/protected/application.php +++ b/demos/personal/protected/application.php @@ -5,7 +5,7 @@ return array( 'mode' => 'Debug', ), 'paths' => array( - 'using'=>array('Application.common.*'), + 'using'=>array('Application.Common.*'), ), 'modules' => array( ), |