From 6228873cf9d6471463d2413e7dfd7447f759baf2 Mon Sep 17 00:00:00 2001
From: "christophe.boulain" <>
Date: Wed, 3 Dec 2008 14:22:03 +0000
Subject: Merge from trunk

---
 demos/personal/protected/Pages/Settings.page | 2 +-
 demos/personal/protected/Pages/config.php    | 6 ++----
 demos/personal/protected/application.php     | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'demos/personal')

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(	
 	),
-- 
cgit v1.2.3