branch 3.1: misc doc updates

9 files changed, 36 insertions, 30 deletions

diff --git a/COPYRIGHT b/COPYRIGHT
index d69606dd..281a0f8e 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
 The PRADO framework and the included demos are free software.
 They are released under the terms of the following BSD License.
 
-Copyright 2004-2009, The PRADO Group (http://www.pradosoft.com)
+Copyright 2004-2011, The PRADO Group (http://www.pradosoft.com)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/UPGRADE b/UPGRADE
index cc550f7c..2f7096a9 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -1,5 +1,5 @@
 
-         Upgrading Instructions for PRADO Framework v3.1.7
+         Upgrading Instructions for PRADO Framework v3.1.8
          =================================================
 
 !!!IMPORTANT!!!
@@ -9,6 +9,12 @@ 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.1.7
+---------------------
+- tinyMCE has been updated to support Internet Explorer 9; a lot of new languages and plugins are now supported,
+but some of the old ones changed their name. If you have problems in getting THtmlArea localized with your language,
+check if the language code for your locale has changed and update it.
+
 Upgrading from v3.1.6
 ---------------------
 - The different SQLMap cache engines (TSQLMapFifoCache, TSQLMapLRUCache, TSQLMapApplicationCache) doesn't
diff --git a/demos/quickstart/protected/pages/Advanced/I18N.page b/demos/quickstart/protected/pages/Advanced/I18N.page
index 5d3e05b5..1840e69b 100644
--- a/demos/quickstart/protected/pages/Advanced/I18N.page
+++ b/demos/quickstart/protected/pages/Advanced/I18N.page
@@ -78,10 +78,10 @@ The <tt>marker</tt> value is used to surround any untranslated text.
 

 Each translation message is wrapped within a <tt>trans-unit</tt> tag, where <tt>source</tt> is the original message, and <tt>target</tt> is the translated message. Editors such as <a href="http://www.heartsome.net/EN/xlfedit.html">Heartsome XLIFF Translation Editor</a> can help in editing these XML files.

 

-<h2>Using a Database for translation</h2>

+<h2 id="166008">Using a Database for translation</h2>

 

 <com:SinceVersion Version="3.1.3" />

-<p>Since version 3.1.3 the messages can also be stored in a database using the connection id from an existing <tt>TDataSourceConfig</tt>. You have to create two tables in your database: <tt>catalogue</tt> and <tt>trans_unit</tt>. The catalogue table needs an entry for each catalogue you want to use. Example schemas for different databases can be found in the framework's <tt>I18N/schema</tt> directory. To configure translation with a database use:</>

+<p id="830016" class="block-content">Since version 3.1.3 the messages can also be stored in a database using the connection id from an existing <tt>TDataSourceConfig</tt>. You have to create two tables in your database: <tt>catalogue</tt> and <tt>trans_unit</tt>. The catalogue table needs an entry for each catalogue you want to use. Example schemas for different databases can be found in the framework's <tt>I18N/schema</tt> directory. To configure translation with a database use:</>

 

 <com:TTextHighlighter Language="xml" CssClass="source block-content">

 <module id="db1" class="System.Data.TDataSourceConfig">

@@ -97,7 +97,7 @@ Each translation message is wrapped within a <tt>trans-unit</tt> tag, where <tt>
 </module>

 </com:TTextHighlighter>

 

-<p>The translation messages will be stored in the <tt>trans_unit</tt> table. Add your translation in the <tt>target</tt> field of that table. You should make sure that you are working on the right catalogue by comparing the message's <tt>cat_id</tt> with that from the catalogue table.</p>

+<p id="830017" class="block-content">The translation messages will be stored in the <tt>trans_unit</tt> table. Add your translation in the <tt>target</tt> field of that table. You should make sure that you are working on the right catalogue by comparing the message's <tt>cat_id</tt> with that from the catalogue table.</p>

 

 <h2 id="6206">Setting and Changing Culture</h2>

 <p id="790633" class="block-content">Once globalization is enabled, you can access the globalization settings, such as, <tt>Culture</tt>, <tt>Charset</tt>, etc, using </p>

diff --git a/demos/quickstart/protected/pages/Configurations/UrlMapping.page b/demos/quickstart/protected/pages/Configurations/UrlMapping.page
index bdd0b81d..6bbedc28 100644
--- a/demos/quickstart/protected/pages/Configurations/UrlMapping.page
+++ b/demos/quickstart/protected/pages/Configurations/UrlMapping.page
@@ -133,9 +133,9 @@ parameters with these patterns if a lot of pages share common parameters.</p>
 </ul>

 </p>

 

-<p>As above, put more specific rules before more common rules as the first matching rule will be used.</p>

+<p id="250001" class="block-content">As above, put more specific rules before more common rules as the first matching rule will be used.</p>

 

-<p>To make configuration of friendly URLs for multiple pages even easier, you can also use <tt>UrlFormat="Path"</tt> 

+<p id="250002" class="block-content">To make configuration of friendly URLs for multiple pages even easier, you can also use <tt>UrlFormat="Path"</tt> 

 in combination with wildcard patterns. In fact, this feature only is available in combination with wildcard rules:</P>

 

 <com:TTextHighlighter Language="xml" CssClass="source block-content">

@@ -160,7 +160,7 @@ Since version 3.1.1, <tt>TUrlMapping</tt> starts to support constructing customi
 

 <p id="230234" class="block-content">

 A matching pattern is one whose <tt>ServiceID</tt> and <tt>ServiceParameter</tt> properties are the same as those passed to <tt>constructUrl()</tt> and whose named parameters are found in the GET variables. For example, <tt>constructUrl('Posts.ListPost',array('cat'=>2))</tt> will use the third pattern in the above example.

-<p>

+<p id="250003" class="block-content">

 

 <p id="230235" class="block-content">

 By default, <tt>TUrlMapping</tt> will construct URLs prefixed with the currently requesting PHP script path, such as <tt><b>/path/to/index.php</b>/article/3</tt>. Users may change this behavior by explicitly specifying the URL prefix through its <tt>UrlPrefix</tt> property. For example, if the Web server configuration treats <tt>index.php</tt> as the default script, we can set <tt>UrlPrefix</tt> as <tt>/path/to</tt> and the constructed URL will look like <tt>/path/to/article/3</tt>.

diff --git a/demos/quickstart/protected/pages/Controls/TabPanel.page b/demos/quickstart/protected/pages/Controls/TabPanel.page
index d85de681..69309931 100644
--- a/demos/quickstart/protected/pages/Controls/TabPanel.page
+++ b/demos/quickstart/protected/pages/Controls/TabPanel.page
@@ -1,13 +1,13 @@
 <com:TContent ID="body" >

 

-<h1>TTabPanel</h1>

+<h1 id="106004">TTabPanel</h1>

 <com:DocLink ClassPath="System.Web.UI.WebControls.TTabPanel" />

 

-<p>

+<p id="530004" class="block-content">

 <tt>TTabPanel</tt> displays a tabbed panel. Users can click on the tab bar to switching among different tab views. Each tab view is an independent panel that can contain arbitrary content.

 </p>

 

-<p>

+<p id="530005" class="block-content">

 A <tt>TTabPanel</tt> control consists of one or several <tt>TTabView</tt> controls representing the possible tab views. At any time, only one tab view is visible (active), which is specified by any of the following properties:

 </p>

 

@@ -17,11 +17,11 @@ A <tt>TTabPanel</tt> control consists of one or several <tt>TTabView</tt> contro
 <li><tt>ActiveView</tt> - the visible view instance.</li>

 </ul>

 

-<p>

+<p id="530006" class="block-content">

 If both <tt>ActiveViewIndex</tt> and <tt>ActiveViewID</tt> are set, the latter takes precedence.

 </p>

 

-<p>

+<p id="530007" class="block-content">

 <tt>TTabPanel</tt> uses CSS to specify the appearance of the tab bar and panel. By default, an embedded CSS file will be published which contains the default CSS for <tt>TTabPanel</tt>. You may also use your own CSS file by specifying the <tt>CssUrl</tt> property. The following properties specify the CSS classes used for elements in a <tt>TTabPanel</tt>:

 </p>

 

@@ -32,11 +32,11 @@ If both <tt>ActiveViewIndex</tt> and <tt>ActiveViewID</tt> are set, the latter t
 <li><tt>ViewCssClass</tt> - the CSS class for the div element enclosing view content (defaults to 'tab-view');</li>

 </ul>

 

-<p>

+<p id="530008" class="block-content">

 To use TTabPanel, write a template like following:

 </p>

 

-<com:TTextHighlighter Language="prado" CssClass="source">

+<com:TTextHighlighter Language="prado" CssClass="source block-content" id="code-530117">

  &lt;com:TTabPanel>

    &lt;com:TTabView Caption="View 1">

      content for view 1

diff --git a/demos/quickstart/protected/pages/Database/ActiveRecord.page b/demos/quickstart/protected/pages/Database/ActiveRecord.page
index bc0df529..78947faf 100644
--- a/demos/quickstart/protected/pages/Database/ActiveRecord.page
+++ b/demos/quickstart/protected/pages/Database/ActiveRecord.page
@@ -50,16 +50,16 @@
         <li>Fetch relationships (related foreign objects) such as "has many", "has one", "belongs to" and "many to many" via association table.</li>
         <li>Lazy loading of relationships.</li>
     </ul>
-<h2>Design Implications</h2>
-<p>
+<h2 id="144005">Design Implications</h2>
+<p id="720009" class="block-content">
 Prado's implementation of Active Record does not maintain referential identity. Each object obtained using
 Active Record is a copy of the data in the database. For example, If you ask for
 a particular customer and get back a <tt>Customer</tt> object, the next time you ask for
 that customer you get back another instance of a <tt>Customer</tt> object. This implies that a strict
 comparison (i.e., using <tt>===</tt>) will return false, while loose comparison (i.e., using <tt>==</tt>) will
 return true if the object values are equal by loose comparison.
-<p>
-<p>
+<p id="720010" class="block-content">
+<p id="720011" class="block-content">
 This is design implication related to the following question.
 <i>"Do you think of the customer as an object, of which there's only one,
 or do you think of the objects you operate on as <b>copies</b> of the database?"</i>
@@ -876,8 +876,8 @@ class Category extends TActiveRecord
 }
 </com:TTextHighlighter>
 
-<h3>Query Criteria for Related Objects</h3>
-<p>
+<h3 id="144007">Query Criteria for Related Objects</h3>
+<p id="720012" class="block-content">
 In the above, we show that an Active Record object can reference to its related objects by
 declaring a static class member $RELATIONS which specifies a list of relations. Each relation
 is specified as an array consisting of three elements: relation type, related AR class name,
@@ -1147,14 +1147,14 @@ arrays. E.g. <tt>$player->skills[] = new SkillRecord()</tt>. If <tt>array</tt> w
 will be thrown.
 </p>
 
-<h2>Column Mapping</h2>
-<p>
+<h2 id="144006">Column Mapping</h2>
+<p id="720013" class="block-content">
 Since v3.1.1, Active Record starts to support column mapping. Column mapping allows developers
 to address columns in Active Record using a more consistent naming convention. In particular,
 using column mapping, one can access a column using whatever name he likes, rather than limited by
 the name defined in the database schema.
 </p>
-<p>
+<p id="720014" class="block-content">
 To use column mapping, declare a static array named <tt>COLUMN_MAPPING</tt> in the Active Record class.
 The keys of the array are column names (called <i>physical column names</i>) as defined in the database
 schema, while the values are corresponding property names (called <i>logical column names</i>) defined
@@ -1181,7 +1181,7 @@ class UserRecord extends TActiveRecord
 	//....
 }
 </com:TTextHighlighter>
-<p>
+<p id="720015" class="block-content">
 With the above column mapping, we can address <tt>first_name</tt> using <tt>$userRecord->firstName</tt>
 instead of <tt>$userRecord->first_name</tt>. This helps separation of logic and model.
 </p>
diff --git a/demos/quickstart/protected/pages/GettingStarted/NewFeatures.page b/demos/quickstart/protected/pages/GettingStarted/NewFeatures.page
index 51dbb981..8d509bdb 100644
--- a/demos/quickstart/protected/pages/GettingStarted/NewFeatures.page
+++ b/demos/quickstart/protected/pages/GettingStarted/NewFeatures.page
@@ -6,19 +6,19 @@
 This page summarizes the main new features that are introduced in each PRADO release.

 </p>
 
-<h2>Version 3.1.3</h2>
+<h2 id="8001">Version 3.1.3</h2>
 <ul>
 <li>Added <a href="?page=ActiveControls.DragDrop">Drag and drop controls</a></li>
 <li>Added TActiveDatePicker control</li>
 </ul>

 
-<h2>Version 3.1.2</h2>
+<h2 id="8002">Version 3.1.2</h2>
 <ul>
 <li>Added a new active control <a href="?page=ActiveControls.ActivePager">TActivePager</a> that allows to paginate a databound control with an ajax callback.</li>
 <li>Added TFirebugLogRoute to send logs to the Firebug console</li>
 </ul>
 

-<h2>Version 3.1.1</h2>

+<h2 id="8003">Version 3.1.1</h2>

 <ul>

 <li>Added a new control <a href="?page=Controls.TabPanel">TTabPanel</a> that displays tabbed views.</li>

 <li>Added a new control <a href="?page=Controls.Keyboard">TKeyboard</a> that displays a virtual keyboard for text input.</li>

diff --git a/index.html b/index.html
index 4c6ca066..3d41aaa7 100644
--- a/index.html
+++ b/index.html
@@ -142,7 +142,7 @@ The PRADO framework and the included demos are free software. They are released
 the terms of the following BSD License.
 </p>
 <p>
-Copyright 2004-2010 by The PRADO Group (http://www.pradosoft.com)<br/>
+Copyright 2004-2011 by The PRADO Group (http://www.pradosoft.com)<br/>
 All rights reserved.
 </p>
 <p>
diff --git a/requirements/index.php b/requirements/index.php
index 44879240..252f7a45 100644
--- a/requirements/index.php
+++ b/requirements/index.php
@@ -222,7 +222,7 @@ function getUserLanguages()
 		$languages=array();

 		foreach(explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']) as $language)

 		{

-			$array=split(';q=',trim($language));

+			$array=explode(';q=',trim($language));

 			$languages[trim($array[0])]=isset($array[1])?(float)$array[1]:1.0;

 		}

 		arsort($languages);