From 705737294ee53b5b1a2f2a832a20ee3bd11691ab Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Sat, 26 Oct 2013 10:33:18 +0200
Subject: Small fix for the quickstart tutorial

---
 demos/quickstart/protected/pages/GettingStarted/HelloWorld.page | 1 +
 1 file changed, 1 insertion(+)

(limited to 'demos/quickstart/protected/pages/GettingStarted')

diff --git a/demos/quickstart/protected/pages/GettingStarted/HelloWorld.page b/demos/quickstart/protected/pages/GettingStarted/HelloWorld.page
index c69921f8..557aa46d 100755
--- a/demos/quickstart/protected/pages/GettingStarted/HelloWorld.page
+++ b/demos/quickstart/protected/pages/GettingStarted/HelloWorld.page
@@ -60,6 +60,7 @@ $application->run();                // run the application
 </li>
 <li><tt>Home.php</tt> - page class for the <tt>Home</tt> page. It mainly contains the method responding to the <tt>OnClick</tt> event of the button.
 <com:TTextHighlighter CssClass="source block-content" id="code_50005">
+<?php
 class Home extends TPage
 {
     public function buttonClicked($sender,$param)
-- 
cgit v1.2.3


From 10ccdbf5179ff6aa3cb7a170cd8c0b908492569f Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Mon, 25 Nov 2013 19:48:58 +0100
Subject: Updated version to 3.2.3

---
 UPGRADE                                                              | 5 ++++-
 .../protected/pages/Controls/Samples/TConditional/Home.page          | 4 ++--
 demos/quickstart/protected/pages/GettingStarted/NewFeatures.page     | 2 ++
 framework/PradoBase.php                                              | 2 +-
 framework/Web/Javascripts/source/prado/prado.js                      | 2 +-
 index.html                                                           | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'demos/quickstart/protected/pages/GettingStarted')

diff --git a/UPGRADE b/UPGRADE
index 73a093bb..51f0304d 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -1,5 +1,5 @@
 
-         Upgrading Instructions for PRADO Framework v3.2.2
+         Upgrading Instructions for PRADO Framework v3.2.3
          =================================================
 
 !!!IMPORTANT!!!
@@ -9,6 +9,9 @@ if you want to upgrade from version A to version C and there is
 version B between A and C, you need to following the instructions
 for both A and B.
 
+Upgrading from v3.2.2
+---------------------
+
 Upgrading from v3.2.1
 ---------------------
 - TEmailAddressValidator's CheckMXRecord property now defaults to false.
diff --git a/demos/quickstart/protected/pages/Controls/Samples/TConditional/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TConditional/Home.page
index 9e37b675..5702970a 100755
--- a/demos/quickstart/protected/pages/Controls/Samples/TConditional/Home.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TConditional/Home.page
@@ -1,9 +1,9 @@
 <com:TContent ID="body">
 <h1>TConditional Samples</h1>
 
-<com:TConditional Condition="Prado::getVersion()==='3.2.2'">
+<com:TConditional Condition="Prado::getVersion()==='3.2.3'">
 <prop:TrueTemplate>
-  <com:TLabel Text="You are using PRADO 3.2.2" />
+  <com:TLabel Text="You are using PRADO 3.2.3" />
 </prop:TrueTemplate>
 <prop:FalseTemplate>
   <com:TLabel Text="You are using PRADO <%= Prado::getVersion() %>" />
diff --git a/demos/quickstart/protected/pages/GettingStarted/NewFeatures.page b/demos/quickstart/protected/pages/GettingStarted/NewFeatures.page
index 897b45f0..95bcc57f 100755
--- a/demos/quickstart/protected/pages/GettingStarted/NewFeatures.page
+++ b/demos/quickstart/protected/pages/GettingStarted/NewFeatures.page
@@ -9,6 +9,8 @@ This page summarizes the main new features that are introduced in each PRADO rel
 <h2 id="8001">Version 3.2.3</h2>
 <ul>
 <li>Added <a href="?page=Controls.HtmlArea4">THtmlArea4 control</a> based on TinyMCE4</li>
+<li>Added support for Behaviors, Class Behaviors, fx global events, and dy one to one events</li>
+<li>Added the ability to set a priority (order) to event handlers</li>
 </ul>
 
 <h2 id="8001">Version 3.2.2</h2>
diff --git a/framework/PradoBase.php b/framework/PradoBase.php
index 84826f15..6e884cec 100644
--- a/framework/PradoBase.php
+++ b/framework/PradoBase.php
@@ -71,7 +71,7 @@ class PradoBase
 	 */
 	public static function getVersion()
 	{
-		return '3.2.2';
+		return '3.2.3';
 	}
 
 	/**
diff --git a/framework/Web/Javascripts/source/prado/prado.js b/framework/Web/Javascripts/source/prado/prado.js
index b827b125..05f11dcd 100644
--- a/framework/Web/Javascripts/source/prado/prado.js
+++ b/framework/Web/Javascripts/source/prado/prado.js
@@ -8,7 +8,7 @@ var Prado =
 	 * Version of Prado clientscripts
 	 * @var Version
 	 */
-	Version: '3.2.2',
+	Version: '3.2.3',
 	
 	/**
 	 * Registry for Prado components
diff --git a/index.html b/index.html
index fadd51ca..37a2a60d 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,7 @@
 
 <body>
 <h1>PRADO Framework for PHP 5 </h1>
-<p>Version 3.2.2<br>
+<p>Version 3.2.3<br>
 Copyright&copy; 2004-2013 by <a href="http://www.pradosoft.com/">Prado Software</a><br>
 All Rights Reserved.
 </p>
-- 
cgit v1.2.3