merge from 3.0 branch till 1463.

45 files changed, 1110 insertions, 618 deletions

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/options.ini b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/options.ini
index 56474470..4566db60 100644
--- a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/options.ini
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/options.ini
@@ -5,122 +5,189 @@ preservedocbooktags = false
 ;; format:

 ;; T_CONSTANTNAME = open

 ;; /T_CONSTANTNAME = close

-T_ABSTRACT = <font color="blue">

-/T_ABSTRACT = </font>

-T_CLONE = <font color="blue">

-/T_CLONE = </font>

-T_HALT_COMPILER = <font color="red">

-/T_HALT_COMPILER = </font>

-T_PUBLIC = <font color="blue">

-/T_PUBLIC = </font>

-T_PRIVATE = <font color="blue">

-/T_PRIVATE = </font>

-T_PROTECTED = <font color="blue">

-/T_PROTECTED = </font>

-T_FINAL = <font color="blue">

-/T_FINAL = </font>

-T_IMPLEMENTS = <font color="blue">

-/T_IMPLEMENTS = </font>

-T_CLASS = <font color="blue">

-/T_CLASS = </font>

-T_INTERFACE = <font color="blue">

-/T_INTERFACE = </font>

-T_INCLUDE = <font color="blue">

-/T_INCLUDE = </font>

-T_INCLUDE_ONCE = <font color="blue">

-/T_INCLUDE_ONCE = </font>

-T_REQUIRE_ONCE = <font color="blue">

-/T_REQUIRE_ONCE = </font>

-T_FUNCTION = <font color="blue">

-/T_FUNCTION = </font>

-T_VARIABLE = <strong>

-/T_VARIABLE = </strong>

-T_CONSTANT_ENCAPSED_STRING = <font color="#66cccc">

-/T_CONSTANT_ENCAPSED_STRING = </font>

-T_COMMENT = <font color="green">

-/T_COMMENT = </font>

-T_OBJECT_OPERATOR = <strong>

-/T_OBJECT_OPERATOR = </strong>

-T_RETURN = <font color="blue">

-/T_RETURN = </font>

-T_STATIC = <font color="blue">

-/T_STATIC = </font>

-T_SWITCH = <font color="blue">

-/T_SWITCH = </font>

-T_IF = <font color="blue">

-/T_IF = </font>

-T_FOREACH = <font color="blue">

-/T_FOREACH = </font>

-T_FOR = <font color="blue">

-/T_FOR = </font>

-T_VAR = <font color="blue">

-/T_VAR = </font>

-T_EXTENDS = <font color="blue">

-/T_EXTENDS = </font>

-T_RETURN = <font color="blue">

-/T_RETURN = </font>

-T_GLOBAL = <font color="blue">

-/T_GLOBAL = </font>

-T_DOUBLE_COLON = <strong>

-/T_DOUBLE_COLON = </strong>

-T_OBJECT_OPERATOR = <strong>

-/T_OBJECT_OPERATOR = </strong>

-T_OPEN_TAG = <strong>

-/T_OPEN_TAG = </strong>

-T_CLOSE_TAG = <strong>

-/T_CLOSE_TAG = </strong>

+

+T_INCLUDE = <span class="src-inc">

+/T_INCLUDE = </span>

+T_INCLUDE_ONCE = <span class="src-inc">

+/T_INCLUDE_ONCE = </span>

+T_REQUIRE_ONCE = <span class="src-inc">

+/T_REQUIRE_ONCE = </span>

+T_REQUIRE_ONCE = <span class="src-inc">

+/T_REQUIRE_ONCE = </span>

+

+T_CONSTANT_ENCAPSED_STRING = <span class="src-str">

+/T_CONSTANT_ENCAPSED_STRING = </span>

+T_STRING_VARNAME = <span class="src-str">

+/T_STRING_VARNAME = </span>

+

+T_STRING = <span class="src-id">

+/T_STRING = </span>

+

+T_DNUMBER = <span class="src-num">

+/T_DNUMBER = </span>

+T_LNUMBER = <span class="src-num">

+/T_LNUMBER = </span>

+

+T_VARIABLE = <span class="src-var">

+/T_VARIABLE = </span>

+

+T_COMMENT = <span class="src-comm">

+/T_COMMENT = </span>

+T_ML_COMMENT = <span class="src-comm">

+/T_ML_COMMENT = </span>

+

+T_OBJECT_OPERATOR = <span class="src-sym">

+/T_OBJECT_OPERATOR = </span>

+

+T_ABSTRACT = <span class="src-key">

+/T_ABSTRACT = </span>

+T_CLONE = <span class="src-key">

+/T_CLONE = </span>

+T_HALT_COMPILER = <span class="src-key">

+/T_HALT_COMPILER = </span>

+T_ARRAY = <span class="src-key">

+/T_ARRAY = </span>

+T_AS = <span class="src-key">

+/T_AS = </span>

+T_BREAK = <span class="src-key">

+/T_BREAK = </span>

+T_CLASS = <span class="src-key">

+/T_CLASS = </span>

+T_CASE = <span class="src-key">

+/T_CASE = </span>

+T_CONST = <span class="src-key">

+/T_CONST = </span>

+T_CONTINUE = <span class="src-key">

+/T_CONTINUE = </span>

+T_DECLARE = <span class="src-key">

+/T_DECLARE = </span>

+T_DEFAULT = <span class="src-key">

+/T_DEFAULT = </span>

+T_ELSE = <span class="src-key">

+/T_ELSE = </span>

+T_ELSEIF = <span class="src-key">

+/T_ELSEIF = </span>

+T_EMPTY = <span class="src-key">

+/T_EMPTY = </span>

+T_ENDDECLARE = <span class="src-key">

+/T_ENDDECLARE = </span>

+T_ENDFOR = <span class="src-key">

+/T_ENDFOR = </span>

+T_ENDSWITCH = <span class="src-key">

+/T_ENDSWITCH = </span>

+T_ENDFOREACH = <span class="src-key">

+/T_ENDFOREACH = </span>

+T_ENDIF = <span class="src-key">

+/T_ENDIF = </span>

+T_ENDWHILE = <span class="src-key">

+/T_ENDWHILE = </span>

+T_EXIT = <span class="src-key">

+/T_EXIT = </span>

+T_EXTENDS = <span class="src-key">

+/T_EXTENDS = </span>

+T_FINAL = <span class="src-key">

+/T_FINAL = </span>

+T_FOR = <span class="src-key">

+/T_FOR = </span>

+T_FOREACH = <span class="src-key">

+/T_FOREACH = </span>

+T_FUNCTION = <span class="src-key">

+/T_FUNCTION = </span>

+T_GLOBAL = <span class="src-key">

+/T_GLOBAL = </span>

+T_IF = <span class="src-key">

+/T_IF = </span>

+T_IMPLEMENTS = <span class="src-key">

+/T_IMPLEMENTS = </span>

+T_INTERFACE = <span class="src-key">

+/T_INTERFACE = </span>

+T_LOGICAL_AND = <span class="src-key">

+/T_LOGICAL_AND = </span>

+T_LOGICAL_OR = <span class="src-key">

+/T_LOGICAL_OR = </span>

+T_LOGICAL_XOR = <span class="src-key">

+/T_LOGICAL_XOR = </span>

+T_NEW = <span class="src-key">

+/T_NEW = </span>

+T_PRIVATE = <span class="src-key">

+/T_PRIVATE = </span>

+T_PROTECTED = <span class="src-key">

+/T_PROTECTED = </span>

+T_PUBLIC = <span class="src-key">

+/T_PUBLIC = </span>

+T_RETURN = <span class="src-key">

+/T_RETURN = </span>

+T_STATIC = <span class="src-key">

+/T_STATIC = </span>

+T_SWITCH = <span class="src-key">

+/T_SWITCH = </span>

+T_VAR = <span class="src-key">

+/T_VAR = </span>

+T_WHILE = <span class="src-key">

+/T_WHILE = </span>

+

+T_DOUBLE_COLON = <span class="src-sym">

+/T_DOUBLE_COLON = </span>

+

+T_OPEN_TAG = <span class="src-php">

+/T_OPEN_TAG = </span>

+T_OPEN_TAG_WITH_ECHO = <span class="src-php">

+/T_OPEN_TAG_WITH_ECHO = </span>

+T_CLOSE_TAG = <span class="src-php">

+/T_CLOSE_TAG = </span>

+

 

 [highlightSource]

 ;; this is for highlighting things that aren't tokens like "&"

 ;; format:

 ;; word = open

 ;; /word = close

-@ = <strong>

-/@ = </strong>

-& = <strong>

-/& = </strong>

-[ = <strong>

-/[ = </strong>

-] = <strong>

-/] = </strong>

-! = <strong>

-/! = </strong>

-";" = <strong>

-/; = </strong>

-( = <strong>

-/( = </strong>

-) = <strong>

-/) = </strong>

-, = <strong>

-/, = </strong>

-{ = <strong>

-/{ = </strong>

-} = <strong>

-/} = </strong>

-""" = <font color="#66cccc">

-/" = </font>

+@ = <span class="src-sym">

+/@ = </span>

+& = <span class="src-sym">

+/& = </span>

+[ = <span class="src-sym">

+/[ = </span>

+] = <span class="src-sym">

+/] = </span>

+! = <span class="src-sym">

+/! = </span>

+";" = <span class="src-sym">

+/; = </span>

+( = <span class="src-sym">

+/( = </span>

+) = <span class="src-sym">

+/) = </span>

+, = <span class="src-sym">

+/, = </span>

+{ = <span class="src-sym">

+/{ = </span>

+} = <span class="src-sym">

+/} = </span>

+""" = <span class="src-str">

+/" = </span>

 

 [highlightDocBlockSourceTokens]

 ;; this is for docblock tokens, using by phpDocumentor_HighlightParser

 ;; tagphptype is for "string" in @param string description, for example

-docblock = <font color="#009999">

-/docblock = </font>

-tagphptype = <em>

-/tagphptype = </em>

-tagvarname = <strong>

-/tagvarname = </strong>

-coretag = <strong><font color = "#0099FF">

-/coretag = </font></strong>

-tag = <strong><font color="#009999">

-/tag = </font></strong>

-inlinetag = <em><font color="#0099FF">

-/inlinetag = </font></em>

-internal = <em><font color = "#6699cc">

-/internal = </font></em>

-closetemplate = <strong><font color="blue">

-/closetemplate = </font></strong>

-docblocktemplate = <font color="blue">

-/docblocktemplate = </font color="blue">

+docblock = <span class="src-doc">

+/docblock = </span>

+tagphptype = <span class="src-doc-type">

+/tagphptype = </span>

+tagvarname = <span class="src-doc-var">

+/tagvarname = </span>

+coretag = <span class="src-doc-coretag">

+/coretag = </span>

+tag = <span class="src-doc-tag">

+/tag = </span>

+inlinetag = <span class="src-doc-inlinetag">

+/inlinetag = </span>

+internal = <span class="src-doc-internal">

+/internal = </span>

+closetemplate = <span class="src-doc-close-template">

+/closetemplate = </span>

+docblocktemplate = <span class="src-doc-template">

+/docblocktemplate = </span>

 

 [highlightTutorialSourceTokens]

 ;; this is for XML DocBook-based tutorials, highlighted by phpDocumentor_TutorialHighlightParser

@@ -154,8 +221,8 @@ ol = <ol>
 /ol = </ol>

 li = <li>

 /li = </li>

-code = <code><pre>

-/code = </pre></code>

+code = <div class="listing"><pre>

+/code = </pre></div>

 var = <var>

 /var = </var>

 samp = <samp>

@@ -174,7 +241,8 @@ br = <br />
 

 [ppage]

 ;; this is the DocBook package page translation section.  All DocBook tags

-;; that have a corresponding html tag must be listed here

+;; that have a corresponding html tag must be listed here.  Entities should

+;; also be listed here

 ;;

 ;; examples:

 ;; 1)

@@ -286,33 +354,34 @@ blockquote = blockquote
 arg = span

 arg->choice = class

 

-author = <font size="-1"><strong>by <em>

-/author = </em></strong></font>

+author = <span class="author">

+/author = </span>

 author! = 0

 

-authorblurb = blockquote

+authorblurb = <div class="author-blurb">

+/authorblurb = </div>

 

-authorgroup = <strong>Authors:</strong><br />

-/authorgroup = 

+authorgroup = <div class="authors"><h2 class="title">Authors</h2>

+/authorgroup = </div>

 authorgroup! = 0

 

-caution = <table border="1"><th align="center">Caution</th><tr><td>

-/caution = </td></tr></table>

+caution = <span class="warning">

+/caution = </span>

 caution! = 0

 

-command = <b class="cmd">

-/command = </b>

-

-cmdsynopsis = <div id="cmdsynopsis">

+cmdsynopsis = <div class="cmd-synopsis">

 /cmdsynopsis = </div>

 

-copyright = <em>

-/copyright = </em><br />

+command = <span class="cmd-title">

+/command = </span>

+

+copyright = <div class="notes">

+/copyright = </div>

 

 emphasis = strong

 

-example = <table class="example" width="100%" border="1"><tr><td>

-/example = </td></tr></table>

+example = <pre class="example">

+/example = </pre>

 example! = 0

 

 function =

@@ -324,11 +393,11 @@ graphic = img
 graphic->fileref = src

 graphic/ =

 

-important = u

+important = strong

 

 informalequation = blockquote

 

-informalexample = pre

+informalexample = div

 

 inlineequation = em

 

@@ -338,7 +407,7 @@ listitem = li
 

 literal = code

 

-literallayout = pre

+literallayout = span

 

 option = " "

 /option = 

@@ -347,22 +416,23 @@ orderedlist = ol
 

 para = p

 

-programlisting = <table border="0" bgcolor="#E0E0E0" cellpadding="5"><tr><td><pre class="php">

-/programlisting = </pre></td></tr></table>

+programlisting = <pre class="listing">

+/programlisting = </pre>

 programlisting! = 0

 

 refentry = div

 

-refnamediv = <div class="refname">

+refnamediv = <div class="ref-title-box">

 /refnamediv = </div>

 refnamediv! = 0

 

-refname = h1

+refname = <h1 class="ref-title">

+/refname = </h1>

 

-refpurpose = <h2 class="refpurpose"><em>

-/refpurpose = </em></h2>

+refpurpose = <h2 class="ref-purpose">

+/refpurpose = </h2>

 

-refsynopsisdiv = <div class="refsynopsis">

+refsynopsisdiv = <div class="ref-synopsis">

 /refsynopsisdiv = </div>

 refsynopsisdiv! = 0

 

@@ -374,8 +444,8 @@ refsect2 =
 refsect3 = 

 /refsect3 = <br />

 

-releaseinfo = (

-/releaseinfo = )<br />

+releaseinfo = <div class="release-info">(

+/releaseinfo = )</div>

 

 simpara = 

 /simpara = <br />

@@ -428,8 +498,8 @@ entry->morerows+9 = 10
 entry->morerows+10 = 11

 ;; add more if you need more colspans

 

-warning = <table border="1"><tr><td>

-/warning = </td></tr></table>

+warning = <span class="warning">

+/warning = </span>

 warning! = 0

 

 ;; now begins the attributes that should be tags in cdata

@@ -448,7 +518,7 @@ $id = name
 ;attr_name = title

 cdata_start = true

 ;cdata_end = true

-open = <h1 class="title" align="center">

+open = <h1 class="title">

 close = </h1>

 

 [refsect1_title]

@@ -456,40 +526,40 @@ close = </h1>
 ;attr_name = title

 cdata_start = true

 ;cdata_end = true

-open = <h2 class="title" align="center">

-close = </h1>

+open = <h2 class="title">

+close = </h2>

 

 [refsect2_title]

 ;tag_attr = true

 ;attr_name = title

 cdata_start = true

 ;cdata_end = true

-open = <h2 class="title" align="center">

-close = </h2>

+open = <h3 class="title">

+close = </h3>

 

 [refsect3_title]

 ;tag_attr = true

 ;attr_name = title

 cdata_start = true

 ;cdata_end = true

-open = <h3 class="title" align="center">

-close = </h3>

+open = <h4 class="title">

+close = </h4>

 

 [para_title]

 ;tag_attr = true

 ;attr_name = title

 cdata_start = true

 ;cdata_end = true

-open = <strong class="title" align="center">

-close = </strong>

+open = <div class="title">

+close = </div>

 

 [formalpara_title]

 ;tag_attr = true

 ;attr_name = title

 cdata_start = true

 ;cdata_end = true

-open = <strong class="title" align="center">

-close = </strong>

+open = <div class="title">

+close = </div>

 

 [example_title]

 ;tag_attr = true

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/__tags.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/__tags.tpl
new file mode 100644
index 00000000..221830c4
--- /dev/null
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/__tags.tpl
@@ -0,0 +1,13 @@
+<div class="tag-list">

+    {section name=tag loop=$tags}

+        {if $tags[tag].keyword != "abstract" &&

+            $tags[tag].keyword != "access" &&

+            $tags[tag].keyword != "static" &&

+	    $tags[tag].keyword != "version"

+	}

+

+            <strong>{$tags[tag].keyword|capitalize}:</strong> 

+            {$tags[tag].data}<br />

+        {/if}

+    {/section}

+</div>

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_class_declaration.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_class_declaration.tpl
new file mode 100644
index 00000000..d7fe2f82
--- /dev/null
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_class_declaration.tpl
@@ -0,0 +1,38 @@
+<hr size="1" noshade="noshade"/>

+<div class="class-declaration">

+    {if count($tags) > 0}

+        {section name=tag loop=$tags}

+            {if $tags[tag].keyword == "abstract"}

+                abstract

+            {/if}

+        {/section}

+    {/if}

+

+    {if $is_interface}

+        interface

+    {else}

+        class

+    {/if}

+

+    <strong>{$class_name}</strong>

+

+    {if count($class_tree) > 1}

+        {section name=tree loop=$class_tree.classes}

+            {if $smarty.section.tree.last}

+                extends {$class_tree.classes[$smarty.section.tree.index_prev]}

+            {/if}

+        {/section}

+    {/if}

+

+    {if $implements}

+        <br/>

+        implements

+        {foreach item="interface" from=$implements}

+            {if !$smarty.foreach.interface.first}

+                , {$interface}

+            {else}

+                {$interface}

+            {/if}

+        {/foreach}

+    {/if}

+</div>
\ No newline at end of file
diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_class_description.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_class_description.tpl
new file mode 100644
index 00000000..12025c1c
--- /dev/null
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_class_description.tpl
@@ -0,0 +1,7 @@
+<div class="class-description">

+    <p>{$sdesc}</p>

+

+    {if $desc != ""}{$desc}{/if}

+</div>

+

+{include file="_tags.tpl" tags=$tags}

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_class_list.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_class_list.tpl
new file mode 100644
index 00000000..d6a1d398
--- /dev/null
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_class_list.tpl
@@ -0,0 +1 @@
+{eval var=$compiledclassindex}
\ No newline at end of file
diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_constant_details.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_constant_details.tpl
new file mode 100644
index 00000000..bca71e17
--- /dev/null
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_constant_details.tpl
@@ -0,0 +1,33 @@
+{if $consts}

+    <hr size="1" noshade="noshade"/>

+    <a name="constant-details"></a>

+    <table class="constant-details" cellspacing="1">

+        <tr>

+            <th>Constant Details</th>

+        </tr>

+        {section name=const loop=$consts}

+            <tr>

+                <td>

+                    <a name="{$consts[const].const_dest}"></a>

+

+                    <h3>{$consts[const].const_name}</h3>

+

+                    <p>{$consts[const].sdesc}</p>

+

+                    {if $consts[const].desc}

+                        {$consts[const].desc}

+                    {/if}

+

+                    <div class="tag-list">

+                        <h4 class="tag">Type:</h4>

+                        <div class="tag-data">{include file="_get_constant_type.tpl" const=$consts[const].const_value}</div>

+                        <h4 class="tag">Value:</h4>

+                        <div class="tag-data">{$consts[const].const_value}</div>

+                    </div>

+                    {include file="_tags.tpl" tags=$consts[const].tags}

+                    <p/>

+                </td>

+            </tr>

+        {/section}

+    </table>

+{/if}
\ No newline at end of file
diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_constant_summary.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_constant_summary.tpl
new file mode 100644
index 00000000..8049c4b0
--- /dev/null
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_constant_summary.tpl
@@ -0,0 +1,22 @@
+{if $consts || $iconsts}

+    <hr size="1" noshade="noshade"/>

+    <a name="constant-summary"></a>

+    <table class="constant-summary" cellspacing="1">

+        <tr>

+            <th colspan="3">Constant Summary</th>

+        </tr>

+        {section name=const loop=$consts}

+            <tr>

+                <td class="type" nowrap="nowrap">{strip}{include file="_get_constant_type.tpl" const=$consts[const].const_value}{/strip}</td>

+                <td class="name"><a href="{$consts[const].id}">{$consts[const].const_name}</a></td>

+                <td class="description" width="100%">

+                    {$consts[const].sdesc}

+

+                    {if $consts[const].desc}

+                        {$consts[const].desc}

+                    {/if}

+                </td>

+            </tr>

+        {/section}

+    </table>

+{/if}
\ No newline at end of file
diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_constructor_details.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_constructor_details.tpl
new file mode 100644
index 00000000..ec4fd0a2
--- /dev/null
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_constructor_details.tpl
@@ -0,0 +1,55 @@
+{if $methods}

+    {section name=method loop=$methods}

+        {if $methods[method].function_name == "__construct"}

+            <hr size="1" noshade="noshade"/>

+            <a name="sec-method"></a>

+            <table class="method-details" cellspacing="1">

+                <tr>

+                    <th colspan="3">Constructor Details</th>

+                </tr>

+                <tr>

+                    <td class="method-data">

+                        <a name="{$methods[method].method_dest}"></a>

+

+                        <h2>{$methods[method].function_name}</h2>

+

+                        <table class="method-detail" cellspacing="0">

+                            <tr>

+                                <td nowrap="nowrap">{strip}

+                                    {if $methods[method].access == "protected"}

+                                        protected&nbsp;

+                                    {/if}

+

+                                    {if $methods[method].access == "public"}

+                                        public&nbsp;

+                                    {/if}

+

+                                    {if $methods[method].abstract == "1"}

+                                        abstract&nbsp;

+                                    {/if}

+

+                                    {if $methods[method].static == "1"}

+                                        static&nbsp;

+                                    {/if}

+

+                                    <strong>{$methods[method].function_name}</strong>

+                                {/strip}</td>

+                                <td nowrap="nowrap">{strip}

+                                    {$methods[method].ifunction_call.params}

+                                {/strip}</td>

+                            </tr>

+                        </table>

+

+                        <p>{$methods[method].sdesc}</p>

+

+                        {if $methods[method].desc}

+                            {$methods[method].desc}

+                        {/if}

+

+                        {include file="_tags.tpl" tags=$methods[method].tags}

+                    </td>

+                </tr>

+            </table>

+        {/if}

+    {/section}

+{/if}

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_constructor_summary.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_constructor_summary.tpl
new file mode 100644
index 00000000..8819f63e
--- /dev/null
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_constructor_summary.tpl
@@ -0,0 +1,25 @@
+{if $methods}

+    {section name=method loop=$methods}

+        {if $methods[method].function_name == "__construct"}

+            <hr size="1" noshade="noshade"/>

+            <a name="constructor-summary"></a>

+            <table class="method-summary" cellspacing="1">

+                <tr>

+                    <th colspan="2">Constructor Summary</th>

+                </tr>

+                <tr>

+                    <td class="type" nowrap="nowrap" width="1%">{$methods[method].access}</td>

+                    <td>

+                        <div class="declaration">

+                            <a href="{$methods[method].id}">{$methods[method].function_name}</a>

+                            {$methods[method].ifunction_call.params}

+                        </div>

+                        <div class="description">

+                            {$methods[method].sdesc}

+                        </div>

+                    </td>

+                </tr>

+            </table>

+        {/if}

+    {/section}

+{/if}

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_destructor_details.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_destructor_details.tpl
new file mode 100644
index 00000000..3cb5534a
--- /dev/null
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_destructor_details.tpl
@@ -0,0 +1,55 @@
+{if $methods}

+    {section name=method loop=$methods}

+        {if $methods[method].function_name == "__destruct"}

+            <hr size="1" noshade="noshade"/>

+            <a name="sec-method"></a>

+            <table class="method-details" cellspacing="1">

+                <tr>

+                    <th colspan="3">Destructor Details</th>

+                </tr>

+                <tr>

+                    <td class="method-data">

+                        <a name="{$methods[method].method_dest}"></a>

+

+                        <h2>{$methods[method].function_name}</h2>

+

+                        <table class="method-detail" cellspacing="0">

+                            <tr>

+                                <td nowrap="nowrap">{strip}

+                                    {if $methods[method].access == "protected"}

+                                        protected&nbsp;

+                                    {/if}

+

+                                    {if $methods[method].access == "public"}

+                                        public&nbsp;

+                                    {/if}

+

+                                    {if $methods[method].abstract == "1"}

+                                        abstract&nbsp;

+                                    {/if}

+

+                                    {if $methods[method].static == "1"}

+                                        static&nbsp;

+                                    {/if}

+

+                                    <strong>{$methods[method].function_name}</strong>

+                                {/strip}</td>

+                                <td nowrap="nowrap">{strip}

+                                    {build_argument_list args=$methods[method].ifunction_call.params style="vertical"}

+                                {/strip}</td>

+                            </tr>

+                        </table>

+

+                        <p>{$methods[method].sdesc}</p>

+

+                        {if $methods[method].desc}

+                            {$methods[method].desc}

+                        {/if}

+

+                        {include file="_tags.tpl" tags=$methods[method].tags}

+                    </td>

+                </tr>

+            </table>

+        {/if}

+    {/section}

+{/if}
\ No newline at end of file
diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_destructor_summary.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_destructor_summary.tpl
new file mode 100644
index 00000000..53e8f1d2
--- /dev/null
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_destructor_summary.tpl
@@ -0,0 +1,27 @@
+{if $methods}

+    {section name=method loop=$methods}

+        {if $methods[method].function_name == "__destruct"}

+            <hr size="1" noshade="noshade"/>

+            <a name="desructor-summary"></a>

+            <table class="method-summary" cellspacing="1">

+                <tr>

+                    <th colspan="2">Destructor Summary</th>

+                </tr>

+                <tr>

+                    <td class="type" nowrap="nowrap" width="1%">{strip}

+                        {$methods[method].access}

+                    {/strip}</td>

+                    <td>

+                        <div class="declaration">{strip}

+                            <a href="{$methods[method].id}">{$methods[method].function_name}</a>

+                            {$methods[method].ifunction_call.params}

+                        {/strip}</div>

+                        <div class="description">

+                            {$methods[method].sdesc}

+                        </div>

+                    </td>

+                </tr>

+            </table>

+        {/if}

+    {/section}

+{/if}

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_footer.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_footer.tpl
new file mode 100644
index 00000000..0c2eddc2
--- /dev/null
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_footer.tpl
@@ -0,0 +1 @@
+</div>

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_get_constant_type.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_get_constant_type.tpl
new file mode 100644
index 00000000..48301da4
--- /dev/null
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_get_constant_type.tpl
@@ -0,0 +1,10 @@
+{if is_numeric(strtolower(trim($const)))}

+    int

+{elseif strtolower(trim($const)) == "true" ||

+        strtolower(trim($const)) == "false"}

+    bool

+{elseif strtolower(trim($const)) == "null"}

+    null

+{else}

+    string

+{/if}
\ No newline at end of file
diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_header.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_header.tpl
new file mode 100644
index 00000000..f92571a4
--- /dev/null
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_header.tpl
@@ -0,0 +1,4 @@
+<div id="bar" nowrap="nowrap">

+    {include file="_class_list.tpl"}

+</div>

+<div id="content1">

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_inherited_constants.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_inherited_constants.tpl
new file mode 100644
index 00000000..66c37633
--- /dev/null
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_inherited_constants.tpl
@@ -0,0 +1,34 @@
+{if $iconsts}

+    {section name=iconst loop=$iconsts}

+        <table class="inherited-constants" cellspacing="1">

+            <tr>

+                <th>Constants Inherited From {$iconsts[iconst].parent_class}</th>

+            </tr>

+            <tr>

+                <td>

+                    {assign var="_consts" value=""}

+

+                    {section name=_const loop=$iconsts[iconst].iconsts}

+                        {if $_consts != ""},

+                           {* append var="_consts" value=", "*}

+                        {/if}

+			<a href="{$href}">{$iconsts[iconst].iconsts[_const].name}</a>{if !$smarty.section.name.last},{/if}

+			{*	

+                        {extract_attribute attribute="href"

+                                           element=$iconsts[iconst].iconsts[_const].link

+                                           var="href" append="no"}

+

+                        {append var="_consts" value="<a href=\""}

+                        {append var="_consts" value=$href}

+                        {append var="_consts" value="\">"}

+                        {append var="_consts" value=$iconsts[iconst].iconsts[_const].name}

+                        {append var="_consts" value="</a>"}

+			*}                    

+{/section}

+

+                    {*$_consts*}

+                </td>

+            </tr>

+        </table>

+    {/section}

+{/if}

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_inherited_methods.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_inherited_methods.tpl
new file mode 100644
index 00000000..55aafb17
--- /dev/null
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_inherited_methods.tpl
@@ -0,0 +1,42 @@
+{if $imethods}

+    {section name=imethod loop=$imethods}

+        {if count($imethods[imethod].imethods) > 1 ||

+            ($imethods[imethod].imethods[0].name != "__construct" &&

+             $imethods[imethod].imethods[0].name != "__destruct" &&

+             $imethods[imethod].imethods[0].abstract != "1")}

+            <table class="inherited-methods" cellspacing="1">

+                <tr>

+                    <th>Methods Inherited From {$imethods[imethod].parent_class}</th>

+                </tr>

+                <tr>

+                    <td>

+                        {* assign var="_methods" value="" *}

+

+                        {section name=_method loop=$imethods[imethod].imethods}

+                            {if $imethods[imethod].imethods[_method].name != "__construct" &&

+                                $imethods[imethod].imethods[_method].abstract != "1"}

+                                {*

+				{if $_methods != ""}

+                                    {append var="_methods" value=", "}

+                                {/if}

+				

+                                {extract_attribute attribute="href"

+                                                   element=$imethods[imethod].imethods[_method].link

+                                                   var="href" append="no"}

+

+                                {append var="_methods" value="<a href=\""}

+                                {append var="_methods" value=$href}

+                                {append var="_methods" value="\">"}

+                                {append var="_methods" value=$imethods[imethod].imethods[_method].name}

+                                {append var="_methods" value="</a>"}

+                            	*}

+				{$imethods[imethod].imethods[_method].link}{if !$smarty.section._method.last},{/if}

+				{/if}

+                        {/section}

+

+                    </td>

+                </tr>

+            </table>

+        {/if}

+    {/section}

+{/if}

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_inheritence_tree.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_inheritence_tree.tpl
new file mode 100644
index 00000000..471c7972
--- /dev/null
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_inheritence_tree.tpl
@@ -0,0 +1,3 @@
+<div class="inheritence-tree">

+    <pre>{section name=tree loop=$class_tree.classes}{if $smarty.section.tree.last}<strong>{$class_tree.classes[tree]}</strong>{else}{$class_tree.classes[tree]}{/if}{$class_tree.distance[tree]}{/section}</pre>

+</div>
\ No newline at end of file
diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_method_details.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_method_details.tpl
new file mode 100644
index 00000000..b5ddfb10
--- /dev/null
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_method_details.tpl
@@ -0,0 +1,101 @@
+{if $methods && (count($methods) > 1 ||

+   ($methods[0].function_name != "__construct" &&

+    $methods[0].function_name != "__destruct"))}

+

+    <hr size="1" noshade="noshade"/>

+    <a name="method-details"></a>

+    <table class="method-details" cellspacing="1">

+        <tr>

+            <th>Method Details</th>

+        </tr>

+        {section name=method loop=$methods}

+            {if $methods[method].function_name != "__construct" &&

+                $methods[method].function_name != "__destruct"}

+

+                <tr>

+                    <td class="method-data">

+

+                        <a name="{$methods[method].method_dest}"></a>

+

+                        <h2>{$methods[method].function_name}</h2>

+

+                        <table class="method-detail" cellspacing="0">

+                            <tr>

+                                <td nowrap="nowrap">{strip}

+                                    {if $methods[method].access == "protected"}

+                                        protected&nbsp;

+                                    {/if}

+

+                                    {if $methods[method].access == "public"}

+                                        public&nbsp;

+                                    {/if}

+

+                                    {if $methods[method].abstract == 1}

+                                        abstract&nbsp;

+                                    {/if}

+

+                                    {if $methods[method].static == 1}

+                                        static&nbsp;

+                                    {/if}

+

+                                    {$methods[method].function_return}&nbsp;

+

+

+                                    <strong>{$methods[method].function_name}</strong>

+                                {/strip}</td>

+                                <td width="100%">{strip}

+                         (

+                        {if $methods[method].ifunction_call.params}

+                            {foreach item=param name="method" from=$methods[method].ifunction_call.params}

+                                {$param.type} {$param.name} {if !$smarty.foreach.method.last}, {/if}

+                            {/foreach}

+

+                        {/if}

+                        )

+				{/strip}</td>

+                            </tr>

+                        </table>

+

+                        <p>{$methods[method].sdesc}</p>

+

+                        {if $methods[method].desc}

+                            {$methods[method].desc}

+                        {/if}

+			{* $methods[method]|print_r *}	

+			<div class="tag-list"><table class="method-summary" cellspacing="1">

+			{if $methods[method].ifunction_call.params}

+				<tr><th colspan="3" class="small">Input</th></tr>

+                            {foreach item=param name="method" from=$methods[method].ifunction_call.params}

+                                <tr><td valign="top">{$param.type}</td><td valign="top"><strong>{$param.name}</strong><td valign="top">{$param.description}</td></tr>

+                            {/foreach}

+                        {/if}

+			{if $methods[method].tags}

+				<tr><th colspan="3" class="small">Output</th></tr>

+			    

+                            {foreach item=param name="method" from=$methods[method].tags}

+				{if $param.keyword == "return"}

+                                <tr><td valign="top">

+                                    {$methods[method].function_return}

+				</td><td valign="top" colspan="2">{$param.data}</td></tr>

+                            	{/if}

+			    {/foreach}

+                        {/if}

+ 			{if $methods[method].tags}

+				<tr><th colspan="3" class="small">Exception</th></tr>

+			    

+                            {foreach item=param name="method" from=$methods[method].tags}

+				{if $param.keyword == "throws"}

+                                <tr><td valign="top">{$param.keyword}</td><td valign="top" colspan="2">{$param.data}</td></tr>

+                            	{/if}

+			    {/foreach}

+                        {/if}

+			</table></div>

+                                              

+ {* include file="_tags.tpl" tags=$methods[method].tags *}

+                        <p/>

+                    </td>

+                </tr>

+            {/if}

+        {/section}

+    </table>

+{/if}

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_method_summary.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_method_summary.tpl
new file mode 100644
index 00000000..8fefd671
--- /dev/null
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_method_summary.tpl
@@ -0,0 +1,61 @@
+{if $methods || $imethods}

+    <hr size="1" noshade="noshade"/>

+    <a name="method-summary"></a>

+    <table class="method-summary" cellspacing="1">

+        <tr>

+            <th colspan="2">Method Summary</th>

+        </tr>

+        {section name=method loop=$methods}

+            {if $methods[method].function_name != "__construct" &&

+                $methods[method].function_name != "__destruct"}

+                {*

+		{if trim(substr($methods[method].function_call, 0, 1)) == "&"}

+                    {assign var="ref" value="true"}

+                    {assign var="css" value=" class=\"reference\""}

+                {else}

+                    {assign var="ref" value="false"}

+                    {assign var="css" value=""}

+                {/if}

+		*}

+                <tr>

+                    <td class="type" nowrap="nowrap" width="1%">

+                        {if $methods[method].access == "protected"}

+                            protected&nbsp;

+                        {/if}

+

+                        {if $methods[method].abstract == 1}

+                            abstract&nbsp;

+                        {/if}

+

+                        {if $methods[method].static == 1}

+                            static&nbsp;

+                        {/if}

+

+                        {$methods[method].function_return}

+{*

+                        {if $ref == "true"}

+                            &nbsp;&amp;

+                        {/if}

+*}

+                    </td>

+                    <td>

+                        <div class="declaration">

+                            <a href="{$methods[method].id}">{$methods[method].function_name}</a>

+						({strip}

+						{if $methods[method].ifunction_call.params}

+							{foreach item=param name="method" from=$methods[method].ifunction_call.params}	

+								{$param.type} {$param.name}{if !$smarty.foreach.method.last}, {/if}

+							{/foreach}

+                        	    

+						{/if}

+						{/strip})

+						</div>

+                        <div class="description">

+                            {$methods[method].sdesc}

+                        </div>

+                    </td>

+                </tr>

+            {/if}

+        {/section}

+    </table>

+{/if}

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_sub_classes.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_sub_classes.tpl
new file mode 100644
index 00000000..e605b314
--- /dev/null
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_sub_classes.tpl
@@ -0,0 +1,19 @@
+{if $children}

+    <div class="sub-classes">

+        {if $is_interface}

+            <h4>Direct Known Sub-interfaces:</h4>

+        {else}

+            <h4>Direct Known Sub-classes:</h4>

+        {/if}

+

+        <div><small>

+        {section name=child loop=$children}

+            {if !$smarty.section.child.first}

+                , {$children[child].link}

+            {else}

+                {$children[child].link}

+            {/if}

+        {/section}

+        </small></div>

+    </div>

+{/if}

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_tags.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_tags.tpl
new file mode 100644
index 00000000..221830c4
--- /dev/null
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/_tags.tpl
@@ -0,0 +1,13 @@
+<div class="tag-list">

+    {section name=tag loop=$tags}

+        {if $tags[tag].keyword != "abstract" &&

+            $tags[tag].keyword != "access" &&

+            $tags[tag].keyword != "static" &&

+	    $tags[tag].keyword != "version"

+	}

+

+            <strong>{$tags[tag].keyword|capitalize}:</strong> 

+            {$tags[tag].data}<br />

+        {/if}

+    {/section}

+</div>

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/basicindex.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/basicindex.tpl
index a040830b..37e94343 100644
--- a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/basicindex.tpl
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/basicindex.tpl
@@ -1,21 +1,18 @@
 {section name=letter loop=$letters}

-	<a href="{$indexname}.html#{$letters[letter].letter}">{$letters[letter].letter}</a>

+	[ <a href="{$indexname}.html#{$letters[letter].letter}">{$letters[letter].letter}</a> ]

 {/section}

-<table>

+

 {section name=index loop=$index}

-<tr><td colspan = "2"><a name="{$index[index].letter}">&nbsp; </a>

-<a href="#top">top</a><br>

-<TABLE CELLPADDING='3' CELLSPACING='0' WIDTH='100%' CLASS="border">

-	<TR CLASS='TableHeadingColor'>

-		<TD>

-			<FONT SIZE='+2'><B>{$index[index].letter}</B></FONT>

-		</TD>

-	</TR>

-</TABLE>

-</td></tr>

-	{section name=contents loop=$index[index].index}

-	<tr><td><b>{$index[index].index[contents].name}</b></td><td width="100%" align="left" valign="top">{$index[index].index[contents].listing}</td></tr>

-	{/section}

+  <hr />

+	<a name="{$index[index].letter}"></a>

+	<div>

+		<h2>{$index[index].letter}</h2>

+		<dl>

+			{section name=contents loop=$index[index].index}

+				<dt><b>{$index[index].index[contents].name}</b></dt>

+				<dd>{$index[index].index[contents].listing}</dd>

+			{/section}

+		</dl>

+	</div>

+	<a href="{$indexname}.html#top">top</a><br>

 {/section}

-</table>

-

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/blank.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/blank.tpl
index 1fbaca2f..b503c142 100644
--- a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/blank.tpl
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/blank.tpl
@@ -1,13 +1,5 @@
-<html>

-<head>

-	<title>{$maintitle}</title>

-			<link rel="stylesheet" href="{$subdir}media/stylesheet.css" />

-			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>

-</head>

-<body>

 <div align="center"><h1>{$maintitle}</h1></div>

 <b>Welcome to {$package}!</b><br />

 <br />

 This documentation was generated by <a href="{$phpdocwebsite}">phpDocumentor v{$phpdocversion}</a><br />

-</body>

-</html>
\ No newline at end of file
+

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/class.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/class.tpl
index 1ed17562..49e8c142 100644
--- a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/class.tpl
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/class.tpl
@@ -1,94 +1,31 @@
 {include file="header.tpl" eltype="class" hasel=true contents=$classcontents}

-<!-- Start of Class Data -->

-<H3>

-	<SPAN class="type">{if $is_interface}Interface{else}Class{/if}</SPAN> {$class_name}

-	<HR>

-</H3>

-[line <span class="linenumber">{if $class_slink}{$class_slink}{else}{$line_number}{/if}</span>]<br />

-<pre>

-{section name=tree loop=$class_tree.classes}{$class_tree.classes[tree]}{$class_tree.distance[tree]}{/section}

-</pre>

-{if $tutorial}

-<div class="maintutorial">Class Tutorial: {$tutorial}</div>

-{/if}

-{if $children}

-<SPAN class="type">Classes extended from {$class_name}:</SPAN>

- 	{section name=kids loop=$children}

-	<dl>

-	<dt>{$children[kids].link}</dt>

-		<dd>{$children[kids].sdesc}</dd>

-	</dl>

-	{/section}</p>

-{/if}

-{if $conflicts.conflict_type}<p class="warning">Conflicts with classes:<br />

-	{section name=me loop=$conflicts.conflicts}

-	{$conflicts.conflicts[me]}<br />

-	{/section}

-<p>

-{/if}

-<SPAN class="type">Location:</SPAN> {$source_location}

-<hr>

-{include file="docblock.tpl" type="class" sdesc=$sdesc desc=$desc}

-<hr>

-{include file="var.tpl" show="summary"}

-<hr>

-{include file="const.tpl" show="summary"}

-<hr>

-<!-- =========== INHERITED CONST SUMMARY =========== -->

-<A NAME='inheritedconst_summary'><!-- --></A>

-<H3>Inherited Class Constant Summary</H3>

 

-{section name=iconsts loop=$iconsts}

-<H4>Inherited From Class {$iconsts[iconsts].parent_class}</H4>

-<UL>

-	{section name=iconsts2 loop=$iconsts[iconsts].iconsts}

-	<!-- =========== Summary =========== -->

-		<LI><CODE>{$iconsts[iconsts].iconsts[iconsts2].link}</CODE> = <CODE class="varsummarydefault">{$iconsts[iconsts].iconsts[iconsts2].value}</CODE>

-		<BR>

-		{$iconsts[iconsts].iconsts[iconsts2].sdesc}

-	{/section}

-	</LI>

-</UL>

-{/section}

-<hr>

-<!-- =========== INHERITED VAR SUMMARY =========== -->

-<A NAME='inheritedvar_summary'><!-- --></A>

-<H3>Inherited Class Variable Summary</H3>

+<h1><a href="../../../classdoc/{$class_name}.html">{if $is_interface}Interface{else}Class{/if} {$class_name}</a>

+<span style="font-size:11pt">(<a href="../../../classdoc/{$class_name}.html">Class Overview</a>)</span>

+</h1>

 

-{section name=ivars loop=$ivars}

-<H4>Inherited From Class {$ivars[ivars].parent_class}</H4>

-<UL>

-	{section name=ivars2 loop=$ivars[ivars].ivars}

-	<!-- =========== Summary =========== -->

-		<LI><CODE>{$ivars[ivars].ivars[ivars2].link}</CODE> = <CODE class="varsummarydefault">{$ivars[ivars].ivars[ivars2].default}</CODE>

-		<BR>

-		{$ivars[ivars].ivars[ivars2].sdesc}

-	{/section}

-	</LI>

-</UL>

-{/section}

+{*inheritence tree*}

+<div class="inheritence-tree">

+    <pre>{section name=tree loop=$class_tree.classes}{if $smarty.section.tree.last}<strong>{$class_tree.classes[tree]}</strong>{else}{$class_tree.classes[tree]}{/if}{$class_tree.distance[tree]}{/section}</pre>

+</div>

 

-<hr>

-{include file="method.tpl" show="summary"}

-<!-- =========== INHERITED METHOD SUMMARY =========== -->

-<A NAME='methods_inherited'><!-- --></A>

-<H3>Inherited Method Summary</H3> 

+{include file="_sub_classes.tpl"}

+{include file="_class_description.tpl"}

+{include file="_inherited_constants.tpl"}

+

+{include file="_constructor_summary.tpl"}

+{* include file="_destructor_summary.tpl" *}

+

+{include file="_method_summary.tpl"}

+

+{include file="_inherited_methods.tpl"}

+{include file="_constant_summary.tpl"}

+{include file="_constructor_details.tpl"}

+

+{* include file="_destructor_details.tpl" *}

+

+{include file="_method_details.tpl"}

+

+{include file="_constant_details.tpl"}

 

-{section name=imethods loop=$imethods}

-<H4>Inherited From Class {$imethods[imethods].parent_class}</h4>

-<UL>

-	{section name=im2 loop=$imethods[imethods].imethods}

-	<!-- =========== Summary =========== -->

-		<LI><CODE>{$imethods[imethods].imethods[im2].link}</CODE><br>

-		{$imethods[imethods].imethods[im2].sdesc}

-	{/section}

-</UL>

-{/section}

-<hr>

-{include file="method.tpl"}

-<hr>

-{include file="var.tpl"}

-<hr>

-{include file="const.tpl"}

-<hr>

 {include file="footer.tpl"}

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/classleft.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/classleft.tpl
index 15bf6b7e..c07fc33a 100644
--- a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/classleft.tpl
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/classleft.tpl
@@ -1,8 +1,9 @@
 {foreach key=subpackage item=files from=$classleftindex}

-	{if $subpackage != ""}<b>{$subpackage}</b><br>{/if}

+  <div class="package">

+	{if $subpackage != ""}{$subpackage}<br />{/if}

 	{section name=files loop=$files}

-		{if $files[files].link != ''}<a href="{ldelim}$subdir{rdelim}{$files[files].link}">{/if}

-		{$files[files].title}

-		{if $files[files].link != ''}</a>{/if}<br>

+    {if $subpackage != ""}&nbsp;&nbsp;{/if}

+		{if $files[files].link != ''}<a href="{$files[files].link}">{/if}{$files[files].title}{if $files[files].link != ''}</a>{/if}<br />

 	{/section}

+  </div>

 {/foreach}

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/classtrees.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/classtrees.tpl
index 28c648be..4020e3a8 100644
--- a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/classtrees.tpl
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/classtrees.tpl
@@ -1,12 +1,8 @@
-{capture name="title"}Class Trees for Package {$package}{/capture}

-{include file="header.tpl" title=$smarty.capture.title}

-

-<!-- Start of Class Data -->

-<H2>

-	{$smarty.capture.title}

-</H2>

+{include file="header.tpl" noleftindex=true}

+<h1>{$title}</h1>

 {section name=classtrees loop=$classtrees}

-<SPAN class="code">Root class {$classtrees[classtrees].class}</SPAN>

-<code class="vardefaultsummary">{$classtrees[classtrees].class_tree}</code>

+<hr />

+<div class="classtree">Root class {$classtrees[classtrees].class}</div><br>

+{$classtrees[classtrees].class_tree}

 {/section}

-{include file="footer.tpl"}
\ No newline at end of file
+{include file="footer.tpl"}

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/const.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/const.tpl
index 207491a5..88856c4b 100644
--- a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/const.tpl
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/const.tpl
@@ -1,29 +1,14 @@
-{if $show=="summary"}

-<!-- =========== CONST SUMMARY =========== -->

-<A NAME='const_summary'><!-- --></A>

-<H3>Class Constant Summary</H3>

-

-<UL>

-	{section name=consts loop=$consts}

-	<!-- =========== Summary =========== -->

-		<LI><CODE><a href="{$consts[consts].id}">{$consts[consts].const_name}</a></CODE> = <CODE class="varsummarydefault">{$consts[consts].const_value|replace:"\n":"<br>\n"|replace:" ":"&nbsp;"|replace:"\t":"&nbsp;&nbsp;&nbsp;"}</CODE>

-		<BR>

-		{$consts[consts].sdesc}

-	{/section}

-</UL>

-{else}

-<!-- ============ VARIABLE DETAIL =========== -->

-

-<A NAME='variable_detail'></A>

-

-<H3>Class Constant Detail</H3>

-

-<UL>

 {section name=consts loop=$consts}

-<A NAME="{$consts[consts].const_dest}"><!-- --></A>

-<LI><SPAN class="code">{$consts[consts].const_name}</SPAN> = <CODE class="varsummarydefault">{$consts[consts].const_value|replace:"\n":"<br>\n"|replace:" ":"&nbsp;"|replace:"\t":"&nbsp;&nbsp;&nbsp;"}</CODE> [line <span class="linenumber">{if $consts[consts].slink}{$consts[consts].slink}{else}{$consts[consts].line_number}{/if}</span>]</LI>

-{include file="docblock.tpl" sdesc=$consts[consts].sdesc desc=$consts[consts].desc tags=$consts[consts].tags}

-<BR>

+{if $show == 'summary'}

+	var {$consts[consts].const_name}, {$consts[consts].sdesc}<br>

+{else}

+	<a name="{$consts[consts].const_dest}"></a>

+	<p></p>

+	<h4>{$consts[consts].const_name} = <span class="value">{$consts[consts].const_value|replace:"\n":"<br>\n"|replace:" ":"&nbsp;"|replace:"\t":"&nbsp;&nbsp;&nbsp;"}</span></h4>

+	<p>[line {if $consts[consts].slink}{$consts[consts].slink}{else}{$consts[consts].line_number}{/if}]</p>

+  {include file="docblock.tpl" sdesc=$consts[consts].sdesc desc=$consts[consts].desc tags=$consts[consts].tags}

+

+  <br />

+	<div class="top">[ <a href="#top">Top</a> ]</div><br />

+{/if}

 {/section}

-</UL>

-{/if}
\ No newline at end of file
diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/contents.hhc.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/contents.hhc.tpl
index cf7ee7cb..a1c71a0d 100644
--- a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/contents.hhc.tpl
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/contents.hhc.tpl
@@ -1,11 +1 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">

-<HTML>

-<HEAD>

-<meta name="GENERATOR" content="phpDocumentor version {$phpdocversion}">

-<!-- Sitemap 1.0 -->

-</HEAD><BODY>

-<OBJECT type="text/site properties">

-	<param name="ImageType" value="Folder">

-</OBJECT>

-{$toc}

-</BODY></HTML>

+{$toc}
\ No newline at end of file
diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/define.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/define.tpl
index 3917cc70..04ce5b48 100644
--- a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/define.tpl
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/define.tpl
@@ -1,33 +1,32 @@
-{if $summary}

-<!-- =========== CONSTANT SUMMARY =========== -->

-<A NAME='constant_summary'><!-- --></A>

-<H3>Constant Summary</H3>

-

-<UL>

-	{section name=def loop=$defines}

-		<LI><CODE><A HREF="{$defines[def].id}">{$defines[def].define_name}</A></CODE> = <CODE class="varsummarydefault">{$defines[def].define_value}</CODE>

-		<BR>{$defines[def].sdesc}

-	{/section}

-</UL>

+{if count($defines) > 0}

+{section name=def loop=$defines}

+{if $show == 'summary'}

+define constant <a href="{$defines[def].id}">{$defines[def].define_name}</a> = {$defines[def].define_value}, {$defines[def].sdesc}<br>

 {else}

-<!-- ============ CONSTANT DETAIL =========== -->

-

-<A NAME='constant_detail'></A>

-<H3>Constant Detail</H3>

+  <hr />

+	<a name="{$defines[def].define_link}"></a>

+	<h3>{$defines[def].define_name} <span class="smalllinenumber">[line {if $defines[def].slink}{$defines[def].slink}{else}{$defines[def].line_number}{/if}]</span></h3>

+	<div class="tags">

+    <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">

+    <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">

+		<code>{$defines[def].define_name} = {$defines[def].define_value}</code>

+    </td></tr></table>

+    </td></tr></table>

 

-<UL>

-	{section name=def loop=$defines}

-		<A NAME="{$defines[def].define_link}"><!-- --></A>

-		<LI><SPAN class="code">{$defines[def].define_name}</SPAN> = <CODE class="varsummarydefault">{$defines[def].define_value}</CODE> [line <span class="linenumber">{if $defines[def].slink}{$defines[def].slink}{else}{$defines[def].line_number}{/if}</span>]<br />

-		{if $defines[def].define_conflicts.conflict_type}

-			<p><b>Conflicts with defines:</b> 

-			{section name=me loop=$defines[def].define_conflicts.conflicts}

-				{$defines[def].define_conflicts.conflicts[me]}<br />

-			{/section}

-			</p>

-		{/if}

-<BR><BR>

-		{include file="docblock.tpl" sdesc=$defines[def].sdesc desc=$defines[def].desc tags=$defines[def].tags}

+    {include file="docblock.tpl" sdesc=$defines[def].sdesc desc=$defines[def].desc tags=$defines[def].tags}

+    <br />

+	{if $defines[def].define_conflicts.conflict_type}

+	<p><b>Conflicts with defines:</b> 

+	{section name=me loop=$defines[def].define_conflicts.conflicts}

+	{$defines[def].define_conflicts.conflicts[me]}<br />

 	{/section}

-</UL>

+	</p>

+	{/if}

+{* original    {if $defines[def].define_conflicts != ""

+		<b>Conflicts:</b> {$defines[def].define_conflicts<br /><br />

+    {/if *}

+	</div>

+	<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />

+{/if}

+{/section}

 {/if}
\ No newline at end of file
diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/docblock.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/docblock.tpl
index 0de18b67..09a603f8 100644
--- a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/docblock.tpl
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/docblock.tpl
@@ -1,31 +1,15 @@
-<!-- ========== Info from phpDoc block ========= -->

-{if $function}

-	{if $params}

-	<p class="label"><b>Parameters</b></p>

-	{section name=params loop=$params}

-		<p class=dt><i>{$params[params].var}</i></p>

-		<p class=indent>{$params[params].data}</p>

-	{/section}

-	{/if}

-{/if}

-{section name=tags loop=$tags}

-{if $tags[tags].keyword == 'return'}

-	<p class="label"><b>Returns</b></p>

-		<p class=indent>{$tags[tags].data}</p>

-{/if}

+{if $sdesc != ''}{$sdesc|default:''}<br /><br />{/if}

+{if $desc != ''}{$desc|default:''}<br />{/if}

+{if count($tags) > 0}

+<br /><br />

+<h4>Tags:</h4>

+<div class="tags">

+<table border="0" cellspacing="0" cellpadding="0">

+{section name=tag loop=$tags}

+  <tr>

+    <td><b>{$tags[tag].keyword}:</b>&nbsp;&nbsp;</td><td>{$tags[tag].data}</td>

+  </tr>

 {/section}

-{if $sdesc || $desc}

-<p class="label"><b>Remarks</b></p>

-{/if}

-{if $sdesc}

-<p>{$sdesc}</p>

-{/if}

-{if $desc}

-<p>{$desc}</p>

-{/if}

-{section name=tags loop=$tags}

-{if $tags[tags].keyword != 'return'}

-	<p class="label"><b>{$tags[tags].keyword}</b></p>

-		<p class=indent>{$tags[tags].data}</p>

-{/if}

-{/section}
\ No newline at end of file
+</table>

+</div>

+{/if}
\ No newline at end of file
diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/elementindex.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/elementindex.tpl
index 8e25db5c..175a5136 100644
--- a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/elementindex.tpl
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/elementindex.tpl
@@ -1,9 +1,5 @@
 {include file="header.tpl" noleftindex=true}

 <a name="top"></a>

-<h1>Index of All Elements</h1>

-<b>Indexes by package:</b><br>

-{section name=p loop=$packageindex}

-<a href="elementindex_{$packageindex[p].title}.html">{$packageindex[p].title}</a><br>

-{/section}<br>

+<h1>Index of all elements</h1>

 {include file="basicindex.tpl" indexname="elementindex"}

 {include file="footer.tpl"}

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/examplesource.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/examplesource.tpl
new file mode 100644
index 00000000..fb85654b
--- /dev/null
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/examplesource.tpl
@@ -0,0 +1,6 @@
+{include file="header.tpl" title=$title}

+<h1 align="center">{$title}</h1>

+<div class="php">

+{$source}

+</div>

+{include file="footer.tpl"}
\ No newline at end of file
diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/fileleft.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/fileleft.tpl
index c85acbe0..50f108d7 100644
--- a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/fileleft.tpl
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/fileleft.tpl
@@ -1,8 +1,10 @@
 {foreach key=subpackage item=files from=$fileleftindex}

 	{if $subpackage != ""}subpackage <b>{$subpackage}</b><br>{/if}

+  <div class="package">

 	{section name=files loop=$files}

-		{if $files[files].link != ''}<a href="{ldelim}$subdir{rdelim}{$files[files].link}">{/if}

+		{if $files[files].link != ''}<a href="{$files[files].link}">{/if}

 		{$files[files].title}

 		{if $files[files].link != ''}</a>{/if}<br>

 	{/section}

+  </div><br />

 {/foreach}

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/filesource.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/filesource.tpl
index a0d7119e..b23076a0 100644
--- a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/filesource.tpl
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/filesource.tpl
@@ -2,5 +2,7 @@
 {include file="header.tpl" title=$smarty.capture.tutle}

 <h1 align="center">Source for file {$name}</h1>

 <p>Documentation is available at {$docs}</p>

+<div class="php">

 {$source}

+</div>

 {include file="footer.tpl"}
\ No newline at end of file
diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/footer.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/footer.tpl
index a015ceea..0b744c20 100644
--- a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/footer.tpl
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/footer.tpl
@@ -1,8 +1,11 @@
-{if !$index}

-	<div id="credit">

-		<hr>

-		Documentation generated on {$date} by <a href="{$phpdocwebsite}" target="_blank">phpDocumentor {$phpdocversion}</a>

-	</div>

-{/if}

+

+

+<div id="footer">

+  Copyright &copy; 2006 by Prado Software Group.

+</div>

+

+</div><!-- page -->

+

+

 </body>

-</html>

+</html>
\ No newline at end of file
diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/function.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/function.tpl
index ea314935..098aeb17 100644
--- a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/function.tpl
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/function.tpl
@@ -1,44 +1,48 @@
-{if $summary}

-<!-- =========== FUNCTION SUMMARY =========== -->

-<A NAME='function_summary'><!-- --></A>

-<H3>Function Summary</H3> 

-

-<UL>

-	{section name=func loop=$functions}

-	<!-- =========== Summary =========== -->

-		<LI><CODE><A HREF="{$functions[func].id}">{$functions[func].function_return} {$functions[func].function_name}()</A></CODE>

-		<BR>{$functions[func].sdesc}

-	{/section}

-</UL>

-{else}

-<!-- ============ FUNCTION DETAIL =========== -->

-

-<A NAME='function_detail'></A>

-<H3>Function Detail</H3>

-

-<UL>

 {section name=func loop=$functions}

-<A NAME="{$functions[func].function_dest}"><!-- --></A>

-

-<LI><SPAN class="code">{$functions[func].function_return} {$functions[func].function_name}()</SPAN> [line <span class="linenumber">{if $functions[func].slink}{$functions[func].slink}{else}{$functions[func].line_number}{/if}</span>]<br />

-<BR><BR>

-<SPAN class="type">Usage:</SPAN> <SPAN class="code">{if $functions[func].ifunction_call.returnsref}&amp;{/if}{$functions[func].function_name}(

+{if $show == 'summary'}

+function {$functions[func].id}, {$functions[func].sdesc}<br />

+{else}

+  <hr />

+	<a name="{$functions[func].function_dest}"></a>

+	<h3>{$functions[func].function_name} <span class="smalllinenumber">[line {if $functions[func].slink}{$functions[func].slink}{else}{$functions[func].line_number}{/if}]</span></h3>

+	<div class="function">

+    <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">

+    <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">

+		<code>{$functions[func].function_return} {if $functions[func].ifunction_call.returnsref}&amp;{/if}{$functions[func].function_name}(

 {if count($functions[func].ifunction_call.params)}

 {section name=params loop=$functions[func].ifunction_call.params}

 {if $smarty.section.params.iteration != 1}, {/if}{if $functions[func].ifunction_call.params[params].default != ''}[{/if}{$functions[func].ifunction_call.params[params].type} {$functions[func].ifunction_call.params[params].name}{if $functions[func].ifunction_call.params[params].default != ''} = {$functions[func].ifunction_call.params[params].default|escape:"html"}]{/if}

 {/section}

-{/if})</SPAN>

-<BR><BR>

-{if $functions[func].function_conflicts.conflict_type}

-<p><b>Conflicts with functions:</b> 

-{section name=me loop=$functions[func].function_conflicts.conflicts}

-{$functions[func].function_conflicts.conflicts[me]}<br />

-{/section}

-</p>

+{/if})</code>

+    </td></tr></table>

+    </td></tr></table><br />

+

+		{include file="docblock.tpl" sdesc=$functions[func].sdesc desc=$functions[func].desc tags=$functions[func].tags}

+    <br /><br />

+	{if $functions[func].function_conflicts.conflict_type}

+	<p><b>Conflicts with functions:</b> 

+	{section name=me loop=$functions[func].function_conflicts.conflicts}

+	{$functions[func].function_conflicts.conflicts[me]}<br />

+	{/section}

+	</p>

+	{/if}

+{* original    {if $functions[func].function_conflicts != ""

+		<b>Conflicts:</b> {$functions[func].function_conflicts<br /><br />

+    {/if *}

+

+    {if count($functions[func].params) > 0}

+		<h4>Parameters</h4>

+    <table border="0" cellspacing="0" cellpadding="0">

+		{section name=params loop=$functions[func].params}

+      <tr>

+        <td class="type">{$functions[func].params[params].datatype}&nbsp;&nbsp;</td>

+        <td><b>{$functions[func].params[params].var}</b>&nbsp;&nbsp;</td>

+        <td>{$functions[func].params[params].data}</td>

+      </tr>

+		{/section}

+		</table>

+    {/if}

+	<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />

+	</div>

 {/if}

-{include file="docblock.tpl" sdesc=$functions[func].sdesc desc=$functions[func].desc tags=$functions[func].tags params=$functions[func].params function=true}

-<BR>

-<p class="top">[ <a href="#top">Top</a> ]</p>

 {/section}

-</UL>

-{/if}
\ No newline at end of file
diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/global.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/global.tpl
index c1b74a1c..1053f748 100644
--- a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/global.tpl
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/global.tpl
@@ -1,32 +1,40 @@
-{if $summary}

-<!-- =========== GLOBAL VARIABLE SUMMARY =========== -->

-<A NAME='global_summary'><!-- --></A>

-<H3>Global Variable Summary</H3>

-

-<UL>

-	{section name=glob loop=$globals}

-		<LI><CODE><A HREF="{$globals[glob].id}">{$globals[glob].global_name}</A></CODE> = <CODE class="varsummarydefault">{$globals[glob].global_value}</CODE>

-		<BR>{$globals[glob].sdesc}

-	{/section}

-</UL>

-

+{if count($globals) > 0}

+{section name=glob loop=$globals}

+{if $show == 'summary'}

+global variable <a href="{$globals[glob].id}">{$globals[glob].global_name}</a> = {$globals[glob].global_value}, {$globals[glob].sdesc}<br>

 {else}

-<!-- ============ GLOBAL VARIABLE DETAIL =========== -->

-

-<A NAME='global_detail'></A>

-<H3>Global Variable Detail</H3>

+  <hr />

+	<a name="{$globals[glob].global_link}"></a>

+	<h4><i>{$globals[glob].global_type}</i> {$globals[glob].global_name} <span class="smalllinenumber">[line {if $globals[glob].slink}{$globals[glob].slink}{else}{$globals[glob].line_number}{/if}]</span></h4>

+	<div class="tags">

+  {if $globals[glob].sdesc != ""}

+	{include file="docblock.tpl" sdesc=$globals[glob].sdesc desc=$globals[glob].desc tags=$globals[glob].tags}

+  {/if}

 

-<UL>

-	{section name=glob loop=$globals}

-		<A NAME="{$globals[glob].global_link}"><!-- --></A>

-		<LI><i>{$globals[glob].global_type}</i> <SPAN class="code">{$globals[glob].global_name}</SPAN> = <CODE class="varsummarydefault">{$globals[glob].global_value}</CODE> [line <span class="linenumber">{if $globals[glob].slink}{$globals[glob].slink}{else}{$globals[glob].line_number}{/if}</span>]<br />

-		{if $globals[glob].global_conflicts.conflict_type}

-			<p><b>Conflicts with globals:</b> 

-			{section name=me loop=$globals[glob].global_conflicts.conflicts}

-				{$globals[glob].global_conflicts.conflicts[me]}<br />

-			{/section}

-		{/if}<BR><BR>

-		{include file="docblock.tpl" sdesc=$globals[glob].sdesc desc=$globals[glob].desc tags=$globals[glob].tags}

+  <table border="0" cellspacing="0" cellpadding="0">

+    <tr>

+      <td><b>Default value:</b>&nbsp;&nbsp;</td>

+      <td>{$globals[glob].global_value|replace:" ":"&nbsp;"|replace:"\n":"<br />\n"|replace:"\t":"&nbsp;&nbsp;&nbsp;"}</td>

+    </tr>

+	{if $globals[glob].global_conflicts.conflict_type}

+	<tr>

+	  <td><b>Conflicts with globals:</b>&nbsp;&nbsp;</td>

+	  <td>

+	{section name=me loop=$globals[glob].global_conflicts.conflicts}

+	{$globals[glob].global_conflicts.conflicts[me]}<br />

 	{/section}

-</UL>

+	  </td>

+	</tr>

+	{/if}

+{* original    {if $globals[glob].global_conflicts != ""

+    <tr>

+      <td><b>Conflicts:</b>&nbsp;&nbsp;</td>

+      <td>{$globals[glob].global_conflicts</td>

+    </tr>

+    {/if *}

+  </table>

+	</div><br /><br />

+	<div class="top">[ <a href="#top">Top</a> ]</div><br /><br />

+{/if}

+{/section}

 {/if}
\ No newline at end of file
diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/header.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/header.tpl
index bdf6173e..83b0c66b 100644
--- a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/header.tpl
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/header.tpl
@@ -1,22 +1,23 @@
-<!--

-	IE 6 makes the page to wide with the following doctype. I accept

-	standards if they help me, not if they make anything even harder!

-//-->

-<!--<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.0 Transitional//EN' 'http://www.w3.org/TR/REC-html40/loose.dtd'>//-->

-<!--NewPage-->

-<HTML>

-<HEAD>

-	<!-- Generated by PhpDoc date: '{$date}' -->

-	<TITLE>{$title}</TITLE>

-<LINK REL ='stylesheet' TYPE='text/css' HREF='{$subdir}media/stylesheet.css' TITLE='Style'>

-{if $bgleft}

-<STYLE type="text/css"><!--

-	BODY								{ldelim}

-											background-image		: url("{$subdir}media/bg_left.png");

-											background-repeat		: repeat-y;

-										{rdelim}

-//--></STYLE>

-{/if}

-</HEAD>

-<BODY {if !$bgleft}BGCOLOR='white'{/if}>

-<a name="top"><!-- --></a>
\ No newline at end of file
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

+

+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >

+

+<head>

+<title>PRADO API Manual: {$title}</title>

+

+<meta http-equiv="Expires" content="Fri, Jan 01 1900 00:00:00 GMT"/>

+<meta http-equiv="Pragma" content="no-cache"/>

+<meta http-equiv="Cache-Control" content="no-cache"/>

+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>

+<meta http-equiv="content-language" content="en"/>

+<meta name="Keywords" content="PRADO PHP framework component template delphi asp.net event property OOP PHP5 object oriented programming Web programming development" />

+<meta name="Description" content="PRADO is a component-based and event-driven framework for Web application development in PHP 5." />

+<meta name="Author" content="Qiang Xue" />

+<meta name="Subject" content="Web programming, PHP framework" />

+<meta name="Language" content="en" />

+<link rel="stylesheet" type="text/css" href="{$subdir}media/style.css" />

+<link rel="stylesheet" type="text/css" href="{$subdir}media/manual.css" />

+</head>

+<body>

+

+<div id="page">

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/include.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/include.tpl
index 1ab7440b..cff067db 100644
--- a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/include.tpl
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/include.tpl
@@ -1,26 +1,9 @@
-{if $summary}

-<!-- =========== INCLUDE SUMMARY =========== -->

-<A NAME='include_summary'><!-- --></A>

-<H3>Include Statements Summary</H3>

-

-<UL>

-	{section name=includes loop=$includes}

-		<LI><CODE><A HREF="#{$includes[includes].include_file}">{$includes[includes].include_name}</A></CODE> = <CODE class="varsummarydefault">{$includes[includes].include_value}</CODE>

-		<BR>{$includes[includes].sdesc}

-	{/section}

-</UL>

-{else}

-<!-- ============ INCLUDE DETAIL =========== -->

-

-<A NAME='include_detail'></A>

-<H3>Include Statements Detail</H3>

-

-<UL>

-	{section name=includes loop=$includes}

-		<A NAME="{$includes[includes].include_file}"><!-- --></A>

-		<LI><SPAN class="code">{$includes[includes].include_name} file:</SPAN> = <CODE class="varsummarydefault">{$includes[includes].include_value}</CODE> [line <span class="linenumber">{if $includes[includes].slink}{$includes[includes].slink}{else}{$includes[includes].line_number}{/if}</span>]<br />

-		<BR><BR>

-		{include file="docblock.tpl" sdesc=$includes[includes].sdesc desc=$includes[includes].desc tags=$includes[includes].tags}

-	{/section}

-</UL>

+{if count($includes) > 0}

+<h4>Includes:</h4>

+<div class="tags">

+{section name=includes loop=$includes}

+{$includes[includes].include_name}({$includes[includes].include_value}) [line {if $includes[includes].slink}{$includes[includes].slink}{else}{$includes[includes].line_number}{/if}]<br />

+{include file="docblock.tpl" sdesc=$includes[includes].sdesc desc=$includes[includes].desc tags=$includes[includes].tags}

+{/section}

+</div>

 {/if}
\ No newline at end of file
diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/index.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/index.tpl
index f73fb8a3..60c74b47 100644
--- a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/index.tpl
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/index.tpl
@@ -1,24 +1,7 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">

-<!--NewPage-->

-<HTML>

-<HEAD>

-	<!-- Generated by PhpDoc on {$date}  -->

-	<TITLE>{$title}</TITLE>

-</HEAD>

-<FRAMESET cols='220,*'>

-{if $package_count > 1}

-	<FRAMESET rows='220,*'>

-		<FRAME src='packages.html' name='left_top'>

+{include file="header.tpl"}

+{if $contents}

+{$contents}

+{else}

+{include file="blank.tpl"}

 {/if}

-		<FRAME src='{$start}' name='left_bottom'>

-{if $package_count > 1}

-	</FRAMESET>

-{/if}

-	<FRAME src='{$blank}.html' name='right'>

-	<NOFRAMES>

-		<H2>Frame Alert</H2>

-		<P>This document is designed to be viewed using the frames feature.

-		If you see this message, you are using a non-frame-capable web client.</P>

-	</NOFRAMES>

-</FRAMESET>

-</HTML>

+{include file="footer.tpl"}

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/method.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/method.tpl
index 9309962b..07cb76e5 100644
--- a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/method.tpl
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/method.tpl
@@ -1,38 +1,25 @@
+{section name=methods loop=$methods}

 {if $show == 'summary'}

-<!-- =========== METHOD SUMMARY =========== -->

-<A NAME='method_summary'><!-- --></A>

-<H3>Method Summary</H3> 

-

-<UL>

-	{section name=methods loop=$methods}

-	<!-- =========== Summary =========== -->

-		<LI><CODE><A HREF='{$methods[methods].id}'>{$methods[methods].function_return} {$methods[methods].function_name}()</A></CODE>

-		<BR>{$methods[methods].sdesc}

-	{/section}

-</UL>

-

+method {$methods[methods].function_call}, {$methods[methods].sdesc}<br />

 {else}

-<!-- ============ METHOD DETAIL =========== -->

-

-<A NAME='method_detail'></A>

-<H3>Method Detail</H3>

-

-<UL>

-{section name=methods loop=$methods}

-<A NAME='{$methods[methods].method_dest}'><!-- --></A>

-

-<h1><A name="{$methods[methods].function_name}"></A>{$class_name}::{$methods[methods].function_name}</h1>

-

-<p class=method>

-<b>{if $methods[methods].ifunction_call.returnsref}&amp;{/if}{$methods[methods].function_name}(</b>

+  <hr />

+	<a name="{$methods[methods].method_dest}"></a>

+	<h3>{if $methods[methods].ifunction_call.constructor}constructor {elseif $methods[methods].ifunction_call.destructor}destructor {else}method {/if}{$methods[methods].function_name} <span class="smalllinenumber">[line {if $methods[methods].slink}{$methods[methods].slink}{else}{$methods[methods].line_number}{/if}]</span></h3>

+	<div class="function">

+    <table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">

+    <table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">

+		<code>{$methods[methods].function_return} {if $methods[methods].ifunction_call.returnsref}&amp;{/if}{$methods[methods].function_name}(

 {if count($methods[methods].ifunction_call.params)}

 {section name=params loop=$methods[methods].ifunction_call.params}

 {if $smarty.section.params.iteration != 1}, {/if}

-{if $methods[methods].ifunction_call.params[params].default != ''}[{/if}<b>{$methods[methods].ifunction_call.params[params].type}</b>

-<i>{$methods[methods].ifunction_call.params[params].name}</i>{if $methods[methods].ifunction_call.params[params].default != ''} = {$methods[methods].ifunction_call.params[params].default}]{/if}

+{if $methods[methods].ifunction_call.params[params].default != ''}[{/if}{$methods[methods].ifunction_call.params[params].type}

+{$methods[methods].ifunction_call.params[params].name}{if $methods[methods].ifunction_call.params[params].default != ''} = {$methods[methods].ifunction_call.params[params].default}]{/if}

 {/section}

-{/if}<b> );</b>

-</p>

+{/if})</code>

+    </td></tr></table>

+    </td></tr></table><br />

+	

+		{include file="docblock.tpl" sdesc=$methods[methods].sdesc desc=$methods[methods].desc tags=$methods[methods].tags}<br /><br />

 

 {if $methods[methods].descmethod}

 	<p>Overridden in child classes as:<br />

@@ -43,13 +30,29 @@
 	</dl>

 	{/section}</p>

 {/if}

-{if $methods[methods].method_overrides}

-<p>Overrides {$methods[methods].method_overrides.link} ({$methods[methods].method_overrides.sdesc|default:"parent method not documented"})</p>

+{* original    {if $methods[methods].descmethod != ""

+    {$methods[methods].descmethod<br /><br />

+    {/if *}

+{if $methods[methods].method_overrides}Overrides {$methods[methods].method_overrides.link} ({$methods[methods].method_overrides.sdesc|default:"parent method not documented"})<br /><br />{/if}

+{* original    {if $methods[methods].method_overrides != ""

+    {$methods[methods].method_overrides<br /><br />

+    {/if *}

+

+    {if count($methods[methods].params) > 0}

+    <h4>Parameters:</h4>

+    <div class="tags">

+    <table border="0" cellspacing="0" cellpadding="0">

+    {section name=params loop=$methods[methods].params}

+      <tr>

+        <td class="type">{$methods[methods].params[params].datatype}&nbsp;&nbsp;</td>

+        <td><b>{$methods[methods].params[params].var}</b>&nbsp;&nbsp;</td>

+        <td>{$methods[methods].params[params].data}</td>

+      </tr>

+    {/section}

+    </table>

+    </div><br />

+    {/if}

+    <div class="top">[ <a href="#top">Top</a> ]</div>

+  </div>

 {/if}

-

-{include file="docblock.tpl" sdesc=$methods[methods].sdesc desc=$methods[methods].desc tags=$methods[methods].tags params=$methods[methods].params function=true}

-	<p class="top">[ <a href="#top">Top</a> ]</p>

-<BR>

 {/section}

-</UL>

-{/if}
\ No newline at end of file
diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/page.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/page.tpl
index dc93b0a1..6dd8683d 100644
--- a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/page.tpl
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/page.tpl
@@ -1,34 +1,31 @@
-{include file="header.tpl" eltype="Procedural file"}

-<h3><SPAN class="type">File:</SPAN> {$source_location}<HR>

-</h3>

+{include file="header.tpl" eltype="Procedural file" class_name=$name hasel=true contents=$pagecontents}

+

+<br>

+<br>

+

+{if $classes}

+<div class="contents">

 {if $tutorial}

-<div class="maintutorial">Main Tutorial: {$tutorial}</div>

+<span class="maintutorial">Main Tutorial: {$tutorial}</span>

 {/if}

-{include file="docblock.tpl" desc=$desc sdesc=$sdesc tags=$tags}

-Classes in this file:

-<dl>

+<h2>Classes:</h2>

 {section name=classes loop=$classes}

 <dt>{$classes[classes].link}</dt>

 	<dd>{$classes[classes].sdesc}</dd>

 {/section}

-</dl>

-<hr>

-{include file="include.tpl" summary=true}

-<hr>

-{include file="global.tpl" summary=true}

-<hr>

-{include file="define.tpl" summary=true}

-<hr>

-{include file="function.tpl" summary=true}

-<hr>

+</div><br /><br />

+{/if}

+

+<h2>Page Details:</h2>

+{include file="docblock.tpl" type="page"}

+<br /><br />

 {include file="include.tpl"}

-<hr>

+<br /><br />

 {include file="global.tpl"}

-<hr>

+<br /><br />

 {include file="define.tpl"}

-<hr>

+<br />

 {include file="function.tpl"}

-<hr>

+

 {include file="footer.tpl"}

 

-</HTML>
\ No newline at end of file
diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/pkgelementindex.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/pkgelementindex.tpl
index 68897450..753ad7cf 100644
--- a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/pkgelementindex.tpl
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/pkgelementindex.tpl
@@ -1,14 +1,5 @@
 {include file="header.tpl"}

 <a name="top"></a>

 <h1>Element index for package {$package}</h1>

-{if count($packageindex) > 1}

-<b>Indexes by package:</b><br>

-{/if}

-{section name=p loop=$packageindex}

-{if $packageindex[p].title != $package}

-<a href="elementindex_{$packageindex[p].title}.html">{$packageindex[p].title}</a><br>

-{/if}

-{/section}<br>

-<a href="elementindex.html"><b>Index of all elements</b></a><br>

 {include file="basicindex.tpl" indexname=elementindex_$package}

 {include file="footer.tpl"}

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/tutorial_tree.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/tutorial_tree.tpl
index 6997545a..faf7bcef 100644
--- a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/tutorial_tree.tpl
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/tutorial_tree.tpl
@@ -1,5 +1,5 @@
 <ul>

-	<li><a href="{$main.link}" target="right">{$main.title|strip_tags}</a>

+	<li type="square"><a href="{$main.link}">{$main.title|strip_tags}</a>

 {if $kids}{$kids}</li>{/if}

 </ul>

 

diff --git a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/var.tpl b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/var.tpl
index d6f04b53..c76929fe 100644
--- a/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/var.tpl
+++ b/buildscripts/PhpDocumentor/phpDocumentor/Converters/CHM/default/templates/default/templates/var.tpl
@@ -1,30 +1,28 @@
-{if $show=="summary"}

-<!-- =========== VAR SUMMARY =========== -->

-<A NAME='var_summary'><!-- --></A>

-<H3>Class Variable Summary</H3>

-

-<UL>

-	{section name=vars loop=$vars}

-	<!-- =========== Summary =========== -->

-		<LI><CODE><a href="{$vars[vars].id}">{$vars[vars].var_name}</a></CODE> = <CODE class="varsummarydefault">{$vars[vars].var_default|replace:"\n":"<br>\n"|replace:" ":"&nbsp;"|replace:"\t":"&nbsp;&nbsp;&nbsp;"}</CODE>

-		<BR>

-		{$vars[vars].sdesc}

-	{/section}

-</UL>

+{section name=vars loop=$vars}

+{if $show == 'summary'}

+	var {$vars[vars].var_name}, {$vars[vars].sdesc}<br>

 {else}

-<!-- ============ VARIABLE DETAIL =========== -->

-

-<A NAME='variable_detail'></A>

+	<a name="{$vars[vars].var_dest}"></a>

+	<p></p>

+	<h4>{$vars[vars].var_name} = <span class="value">{$vars[vars].var_default|replace:"\n":"<br>\n"|replace:" ":"&nbsp;"|replace:"\t":"&nbsp;&nbsp;&nbsp;"}</span></h4>

+	<p>[line {if $vars[vars].slink}{$vars[vars].slink}{else}{$vars[vars].line_number}{/if}]</p>

+  {include file="docblock.tpl" sdesc=$vars[vars].sdesc desc=$vars[vars].desc tags=$vars[vars].tags}

 

-<H3>Variable Detail</H3>

-

-<UL>

-{section name=vars loop=$vars}

-<A NAME="{$vars[vars].var_dest}"><!-- --></A>

-<LI><SPAN class="code">{$vars[vars].var_name}</SPAN> = <CODE class="varsummarydefault">{$vars[vars].var_default|replace:"\n":"<br>\n"|replace:" ":"&nbsp;"|replace:"\t":"&nbsp;&nbsp;&nbsp;"}</CODE> [line <span class="linenumber">{if $vars[vars].slink}{$vars[vars].slink}{else}{$vars[vars].line_number}{/if}</span>]</LI>

-<LI><b>Data type:</b> <CODE class="varsummarydefault">{$vars[vars].var_type}</CODE>{if $vars[vars].var_overrides}<b>Overrides:</b> {$vars[vars].var_overrides}<br>{/if}</LI>

-{include file="docblock.tpl" sdesc=$vars[vars].sdesc desc=$vars[vars].desc tags=$vars[vars].tags}

-<BR>

+  <br />

+	<div class="tags">

+  <table border="0" cellspacing="0" cellpadding="0">

+    <tr>

+      <td><b>Type:</b>&nbsp;&nbsp;</td>

+      <td>{$vars[vars].var_type}</td>

+    </tr>

+    {if $vars[vars].var_overrides != ""}

+    <tr>

+      <td><b>Overrides:</b>&nbsp;&nbsp;</td>

+      <td>{$vars[vars].var_overrides}</td>

+    </tr>

+    {/if}

+  </table>

+	</div><br /><br />

+	<div class="top">[ <a href="#top">Top</a> ]</div><br />

+{/if}

 {/section}

-</UL>

-{/if}
\ No newline at end of file