Changeset 1482

Timestamp:

10/29/2006 06:53:33 AM (2 years ago)

Author:

xue

Message:

merge from 3.0 branch till 1481.

Location:

trunk

Files:

• HISTORY (modified) (2 diffs)
• UPGRADE (modified) (1 diff)
• demos/quickstart/protected/pages/GettingStarted/CommandLine.page (modified) (6 diffs)
• framework/Web/Services/TPageService.php (modified) (1 diff)
• framework/Web/THttpRequest.php (modified) (1 diff)
• framework/Web/UI/WebControls/TRepeater.php (modified) (1 diff)
• index.html (modified) (2 diffs)

trunk/HISTORY

@@ -14 +14 @@
 CHG: All validators ClientSide.OnError becomes ClientSide.OnValidationError, and OnError event becomes OnValidationError. (Wei)
 
-
-Version 3.0.5 October 8, 2006
-===============================
+Version 3.0.6 December 4, 2006
+==============================
+CHG: constructUrl() now encodes & into & by default (Qiang)
+CHG: TRepeater does not render <span> anymore for empty item template (Qiang)
+
+Version 3.0.5 October 23, 2006
+==============================
 BUG: Ticket#409 - Multiple page services will mess up page caching (Qiang)
 BUG: Ticket#417 - SelectedIndex in template incorrect caused by bug in TList (Qiang)
@@ -24 +28 @@
 ENH: Ticket#378 - PRADO applications can now run in command line (Qiang)
 ENH: Ticket#379 - TAuthorizationRule performance enhancement (Qiang)
+ENH: Ticket#382 - Untranslated messages can be marked now (Wei)
 ENH: Ticket#394 - Enhancing TDropDownListColumn to allow specifying both text and value (Qiang)
 ENH: Easier to customize the TDatePicker using CssClass (Wei)

trunk/UPGRADE

@@ -22 +22 @@
 - Validator OnError event becomes OnValidationError. 
 
+Upgrading from v3.0.5
+---------------------
+- constructUrl() now encodes & into & by default.
+- TRepeater does not render <span> anymore for empty item template.
 
 Upgrading from v3.0.4

trunk/demos/quickstart/protected/pages/GettingStarted/CommandLine.page

@@ -2 +2 @@
 <h1 id="501">Command Line Tool</h1>
 <p>The optional <tt>prado-cli.php</tt> PHP script file in the <tt>framework</tt>
-directory provides command line tools to perform various tendious taks in Prado.
+directory provides command line tools to perform various tedious takes in Prado.
 The <tt>prado-cli.php</tt> can be used to create Prado project skeletons, create
 initial test fixtures, and access to an interactive PHP shell.
@@ -45 +45 @@
         <li>Change to the directory where you want to create the project skeleton.</li>
         <li>Type, <tt>php ../prado/framework/prado-cli.php -c helloworld</tt>, where
-        <tt>hellowworld</tt> is the directory name that you want to create the project skeleton files.</li>
+        <tt>helloworld</tt> is the directory name that you want to create the project skeleton files.</li>
         <li>Type, <tt>php ../prado/framework/prado-cli.php <b>-t</b> helloworld</tt> to create
         the test fixtures for the <tt>helloworld</tt> project.</li>
@@ -52 +52 @@
 <h2 id="505">Interactive Shell</h2>
 <p>
-The interactive shell allows you to evaluate PHP statements from te command line.
+The interactive shell allows you to evaluate PHP statements from the command line.
 The <tt>prado-cli.php</tt> script can be used to start the shell and load an existing
 Prado project. For example, let us load the blog demo project. Assume that your
@@ -64 +64 @@
 <com:TTextHighlighter Language="cli" CssClass="source">
 Command line tools for Prado 3.0.5.
-** Loaded Prado appplication in directory "demos\blog\protected".
+** Loaded Prado application in directory "demos\blog\protected".
 PHP-Shell - Version 0.3.1
 (c) 2006, Jan Kneschke <jan@kneschke.de>
@@ -74 +74 @@
 Then we will get an instance of the Prado blog application, and from
 that instance we want an instance of the <tt>'data'</tt> module. Notice that
-a <b>semicolon</b> at the end of the line <b>supresses the output</b>.
+a <b>semicolon</b> at the end of the line <b>suppresses the output</b>.
 
 <com:TTextHighlighter Language="cli" CssClass="source">
@@ -98 +98 @@
     [Content] => 'Congratulations! You have successfully installed Prado Blog --
  a PRADO-driven weblog system. A default administrator account has been created.
- Please login with <b>admin/prado</b> and update your password as soon as possib
-le.'
+ Please login with <b>admin/prado</b> and update your password as soon as possible.'
     [Status] => 0
     [CommentCount] => 0

trunk/framework/Web/Services/TPageService.php

@@ -463 +463 @@
          * @param string page path
          * @param array list of GET parameters, null if no GET parameters required
-         * @param boolean whether to encode the ampersand in URL, defaults to false.
+         * @param boolean whether to encode the ampersand in URL, defaults to true.
          * @param boolean whether to encode the GET parameters (their names and values), defaults to true.
          * @return string URL for the page and GET parameters
          */
-        public function constructUrl($pagePath,$getParams=null,$encodeAmpersand=false,$encodeGetItems=true)
+        public function constructUrl($pagePath,$getParams=null,$encodeAmpersand=true,$encodeGetItems=true)
         {
                 return $this->getRequest()->constructUrl($this->getID(),$pagePath,$getParams,$encodeAmpersand,$encodeGetItems);

trunk/framework/Web/THttpRequest.php

@@ -483 +483 @@
          * @param string service parameter
          * @param array GET parameters, null if not needed
-         * @param boolean whether to encode the ampersand in URL, defaults to false.
+         * @param boolean whether to encode the ampersand in URL, defaults to true.
          * @param boolean whether to encode the GET parameters (their names and values), defaults to true.
          * @return string URL
          * @see parseUrl
          */
-        public function constructUrl($serviceID,$serviceParam,$getItems=null,$encodeAmpersand=false,$encodeGetItems=true)
+        public function constructUrl($serviceID,$serviceParam,$getItems=null,$encodeAmpersand=true,$encodeGetItems=true)
         {
                 $url=$serviceID.'='.$serviceParam;

trunk/framework/Web/UI/WebControls/TRepeater.php

@@ -365 +365 @@
         public function render($writer)
         {
-                if($this->_items && $this->_items->getCount())
+                if($this->_items && $this->_items->getCount() || $this->_emptyTemplate!==null)
                         $this->renderContents($writer);
-                else if($this->_emptyTemplate!==null)
-                        parent::render($writer);
         }
 

trunk/index.html

@@ -8 +8 @@
 <body>
 <h1>PRADO Framework for PHP 5 </h1>
-<p>Version 3.0.5, October 8, 2006<br>
+<p>Version 3.0.5, October 23, 2006<br>
 Copyright&copy; 2004-2006 by <a href="http://www.pradosoft.com/">PradoSoft</a><br>
 All Rights Reserved.
@@ -70 +70 @@
 <h2>Documentation</h2>
 <ul>
-<li><a href="docs/manual/index.html">API documentation</a></li>
+<li><a href="docs/prado3_manual.chm">Integrated manual (CHM)</a>, including quickstart, API, class docs and wiki</li>
 <li><a href="docs/quickstart.pdf">Quickstart tutorial (PDF)</a></li>
+<li><a href="docs/manual/index.html">API documentation (HTML)</a></li>
 </ul>