Merge branch 'master' of https://github.com/majuca/prado

6 files changed, 35 insertions, 33 deletions

diff --git a/buildscripts/texbuilder/Page2Tex.php b/buildscripts/texbuilder/Page2Tex.php
index ce2ece7f..e0c3507d 100644
--- a/buildscripts/texbuilder/Page2Tex.php
+++ b/buildscripts/texbuilder/Page2Tex.php
@@ -163,14 +163,14 @@ class Page2Tex
 
 		//runbar
 		$html = preg_replace('/<com:RunBar\s+PagePath="([^"]*)"\s+\/>/',
-				'\href{http://www.pradosoft.com/demos/quickstart/index.php?page=$1}{$1 Demo}', $html);
+				'\href{http://www.pradoframework.net/site/demos/quickstart/index.php?page=$1}{$1 Demo}', $html);
 
 		//DocLink
 		$html = preg_replace('/<com:DocLink\s+ClassPath="([^"]*)[.]([^."]*)"\s+Text="([^"]+)"\s*\/>/',
-	                        '\href{http://www.pradosoft.com/docs/manual/$1/$2.html}{$3}', $html);
+	                        '\href{http://pradosoft.github.io/docs/manual/$1/$2.html}{$3}', $html);
 
 		$html = preg_replace('/<com:DocLink\s+ClassPath="([^"]*)[.]([^.]*)"\s+\/>/',
-	                        '\href{http://www.pradosoft.com/docs/manual/$1/$2.html}{$1.$2 API Reference}', $html);
+	                        '\href{http://pradosoft.github.io/docs/manual/$1/$2.html}{$1.$2 API Reference}', $html);
 
 		//text modifiers
 		$html = preg_replace('/<(b|strong)[^>]*>([^<]*)<\/(b|strong)>/', '\textbf{$2}', $html);
diff --git a/buildscripts/texbuilder/quickstart/pages.php b/buildscripts/texbuilder/quickstart/pages.php
index 1fb94431..bbdec29b 100644
--- a/buildscripts/texbuilder/quickstart/pages.php
+++ b/buildscripts/texbuilder/quickstart/pages.php
@@ -9,13 +9,15 @@ $pages['Getting Started'] = array(
 	'GettingStarted/AboutPrado.page',
 	'GettingStarted/Installation.page',
 	'GettingStarted/NewFeatures.page',
-	'GettingStarted/Upgrading.page'
+	'GettingStarted/Upgrading.page',
+	'GettingStarted/Upgrading32.page'
 	);
 
 $pages['Tutorials'] = array(
 	'GettingStarted/HelloWorld.page',
 	'Fundamentals/Hangman.page',
-	'GettingStarted/CommandLine.page'
+	'GettingStarted/CommandLine.page',
+	'GettingStarted/Wsat.page'
 	);
 
 $pages['Tutorial: Currency Converter'] = array(
@@ -26,13 +28,10 @@ $pages['Tutorial: Building an AJAX Chat Application'] = array(
 	'Tutorial/AjaxChat.page'
 	);
 
-$pages['Tutorial: Addressbook'] = array(
-	'Tutorial/AddressBook.page'
-	);
-
 $pages['Fundamentals'] = array(
 	'Fundamentals/Architecture.page',
-	'Fundamentals/Components.page',
+	'Fundamentals/Components1.page',
+	'Fundamentals/Components2.page',
 	'Fundamentals/Controls.page',
 	'Fundamentals/Pages.page',
 	'Fundamentals/Modules.page',
@@ -66,6 +65,7 @@ $pages['Control Reference : Standard Controls'] = array(
 	'Controls/Head.page',
 	'Controls/HiddenField.page',
 	'Controls/HtmlArea.page',
+	'Controls/HtmlArea4.page',
 	'Controls/HyperLink.page',
 	'Controls/Image.page',
 	'Controls/ImageButton.page',
@@ -76,6 +76,7 @@ $pages['Control Reference : Standard Controls'] = array(
 	'Controls/Label.page',
 	'Controls/LinkButton.page',
 	'Controls/Literal.page',
+	'Controls/Markdown.page',
 	'Controls/MultiView.page',
 	'Controls/OutputCache.page',
 	'Controls/Pager.page',
@@ -125,24 +126,32 @@ $pages['Control Reference : Active Controls (AJAX)'] = array(
 	'ActiveControls/ActivePanel.page',
 	'ActiveControls/ActiveRadioButton.page',
 	'ActiveControls/ActiveRadioButtonList.page',
+	'ActiveControls/ActiveRatingList.page',
 	'ActiveControls/ActiveRepeater.page',
 	'ActiveControls/ActiveTextBox.page',
 	'ActiveControls/AutoComplete.page',
 	'ActiveControls/Callback.page',
+	'ActiveControls/EventTriggeredCallback.page',
+	'ActiveControls/TimeTriggeredCallback.page',
+	'ActiveControls/ValueTriggeredCallback.page',
+	'ActiveControls/DragDrop.page',
+	'ActiveControls/InPlaceTextBox.page',
 	'ActiveControls/CallbackClientScript.page',
 	'ActiveControls/CallbackClientSide.page',
 	'ActiveControls/CallbackEventParameter.page',
-	'ActiveControls/CallbackOptions.page',
-	'ActiveControls/DragDrop.page',
-	'ActiveControls/EventTriggeredCallback.page',
-	'ActiveControls/InPlaceTextBox.page',
-	'ActiveControls/TimeTriggeredCallback.page',
-	'ActiveControls/ValueTriggeredCallback.page');
+	'ActiveControls/CallbackOptions.page'
+	);
 
 $pages['Active Control Overview'] = array(
-		'ActiveControls/Home.page',
+	'ActiveControls/Home.page',
 	'ActiveControls/Introduction.page');
 
+$pages['Control Reference : Jui Controls (jQuery UI)'] = array(
+	'JuiControls/Home.page',
+	'JuiControls/Interactions.page',
+	'JuiControls/Widgets.page'
+	);
+
 $pages['Write New Controls'] = array(
 	'Controls/NewControl.page');
 
@@ -154,7 +163,9 @@ $pages['Working with Databases'] = array(
 	'Database/DAO.page',
 	'Database/ActiveRecord.page',
 	'Database/Scaffold.page',
-	'Database/SqlMap.page');
+	'Database/SqlMap.page',
+	'Database/ViewsArUpdate.page'
+	);
 
 $pages['Advanced Topics'] = array(
 	'Advanced/Collections.page',
@@ -171,8 +182,6 @@ $pages['Advanced Topics'] = array(
 
 $pages['Client-side Scripting'] = array(
 	'Advanced/Scripts.page',
-	'Advanced/Scripts1.page',
-	'Advanced/Scripts2.page',
 	'Advanced/Scripts3.page');
 
 return $pages;
diff --git a/buildscripts/texbuilder/quickstart/quickstart.tex b/buildscripts/texbuilder/quickstart/quickstart.tex
index 29c76afc..7ef6e92e 100644
--- a/buildscripts/texbuilder/quickstart/quickstart.tex
+++ b/buildscripts/texbuilder/quickstart/quickstart.tex
@@ -52,8 +52,8 @@
 
 %----------------- TITLE --------------
 
-\title{\Huge \bfseries PRADO v3.2.3 Quickstart Tutorial
-    \thanks{Copyright 2004-2014. All Rights Reserved.}
+\title{\Huge \bfseries PRADO v3.3.0 Quickstart Tutorial
+    \thanks{Copyright 2004-2015. All Rights Reserved.}
 }
 \author{Qiang Xue and Wei Zhuo}
 \date{\today}
@@ -78,7 +78,7 @@ Prado quick start doc
 \chapter*{License}
 \addcontentsline{toc}{chapter}{License}
 PRADO is free software released under the terms of the following BSD license.\\
-Copyright 2004-2014, The PRADO Group (http://www.pradosoft.com)
+Copyright 2004-2015, The PRADO Group (https://github.com/pradosoft)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/buildscripts/texbuilder/sqlmap/sqlmap.tex b/buildscripts/texbuilder/sqlmap/sqlmap.tex
index 5000b547..e3a0254f 100644
--- a/buildscripts/texbuilder/sqlmap/sqlmap.tex
+++ b/buildscripts/texbuilder/sqlmap/sqlmap.tex
@@ -88,7 +88,7 @@ Framework Developer Guide.
 \chapter*{License}

 \addcontentsline{toc}{chapter}{License}

 SQLMap for PHP is free software released under the terms of the following BSD license.\\

-Copyright 2004-2006, PradoSoft (http://www.pradosoft.com)\\

+Copyright 2004-2006, The PRADO Group (https://github.com/pradosoft)\\

 All rights reserved.

 

 Redistribution and use in source and binary forms, with or without

diff --git a/buildscripts/texbuilder/time-tracker/preface.tex b/buildscripts/texbuilder/time-tracker/preface.tex
index 908f97fb..c1a30bed 100644
--- a/buildscripts/texbuilder/time-tracker/preface.tex
+++ b/buildscripts/texbuilder/time-tracker/preface.tex
@@ -8,11 +8,4 @@ The guide is intended for readers who has some experience
 using PHP version 5 and some basic concepts of Object-Oriented application

 design. The guide will assume that the reader understands the primary concepts

 of class, methods, class inheritance, and other basic features offered by PHP

-version 5 or later.

-\subsection*{Questions and Comments}

-Readers are encouraged to ask questions as the forum regarding any

-particular aspect of this documentation. Comment and constructive criticisms

-are most welcome. Questions and comments may be directed at

-\href{http://www.pradosoft.com/forum/}{http://www.pradosoft.com/forum/}.

-

-

+version 5 or later.
\ No newline at end of file
diff --git a/buildscripts/texbuilder/time-tracker/time-tracker.tex b/buildscripts/texbuilder/time-tracker/time-tracker.tex
index fcfb639a..5934c5c0 100644
--- a/buildscripts/texbuilder/time-tracker/time-tracker.tex
+++ b/buildscripts/texbuilder/time-tracker/time-tracker.tex
@@ -79,7 +79,7 @@
 \chapter*{License}

 \addcontentsline{toc}{chapter}{License}

 PRADO is free software released under the terms of the following BSD license.\\

-Copyright 2004-2006, The PRADO Group (http://www.pradosoft.com).

+Copyright 2004-2006, The PRADO Group (https://github.com/pradosoft).

 All rights reserved.

 

 Redistribution and use in source and binary forms, with or without