cvs: smarty /docs/en getting-started.xml /docs/en/designers chapter-debugging-console.xml /docs/en/designers/language-basic-syntax language-syntax-comments.xml /docs/en/designers/language-custom-functions language-function-html-image.xml language-function-html-options.xml language-function-html-radios.xml language-function-html-select-date.xml language-function-html-select-time.xml language-function-html-table.xml language-function-mailto.xml language-function-popup-init.xml language-function-textformat.xml /docs/en/designers/language-variables language-config-variables.xml language-variables-smarty.xml
[email protected] ("Peter 'Mash' Morgan") Wed, 27 Sep 2006 08:47:37 -0000
| Newsgroups | php.smarty.cvs |
|---|---|
| Message-ID | <cvspete_morgan1159346857@cvsserver> |
pete_morgan Wed Sep 27 08:47:37 2006 UTC
Modified files:
/smarty/docs/en getting-started.xml
/smarty/docs/en/designers chapter-debugging-console.xml
/smarty/docs/en/designers/language-basic-syntax
language-syntax-comments.xml
/smarty/docs/en/designers/language-custom-functions
language-function-html-image.xml
language-function-html-options.xml
language-function-html-radios.xml
language-function-html-select-date.xml
language-function-html-select-time.xml
language-function-html-table.xml
language-function-mailto.xml
language-function-popup-init.xml
language-function-textformat.xml
/smarty/docs/en/designers/language-variables
language-config-variables.xml
language-variables-smarty.xml
Log:
Add literal tags to html, general formatting
pete_morgan-20060927084737.txt
(text/plain, 43.9 KB)
http://cvs.php.net/viewvc.cgi/smarty/docs/en/getting-started.xml?r1=1.14&r2=1.15&diff_format=u
Index: smarty/docs/en/getting-started.xml
diff -u smarty/docs/en/getting-started.xml:1.14 smarty/docs/en/getting-started.xml:1.15
--- smarty/docs/en/getting-started.xml:1.14 Wed Sep 27 07:20:56 2006
+++ smarty/docs/en/getting-started.xml Wed Sep 27 08:47:36 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
+<!-- $Revision: 1.15 $ -->
<part id="getting.started">
<title>Getting Started</title>
@@ -330,15 +330,12 @@
<literal>index.php</literal> onto the end of your
<literal>DirectoryIndex</literal> setting (separate
each entry with a space) as in the following <filename>httpd.conf</filename> example.
- </para>
-
- <example>
- <title>http.conf</title>
- <programlisting>
-<![CDATA[DirectoryIndex index.htm index.html index.cgi index.php]]>
- </programlisting>
- </example>
-
+ <informalexample>
+ <programlisting>
+ <![CDATA[DirectoryIndex index.htm index.html index.cgi index.php]]>
+ </programlisting>
+ </informalexample>
+ </para>
</note>
<para>
http://cvs.php.net/viewvc.cgi/smarty/docs/en/designers/chapter-debugging-console.xml?r1=1.7&r2=1.8&diff_format=u
Index: smarty/docs/en/designers/chapter-debugging-console.xml
diff -u smarty/docs/en/designers/chapter-debugging-console.xml:1.7 smarty/docs/en/designers/chapter-debugging-console.xml:1.8
--- smarty/docs/en/designers/chapter-debugging-console.xml:1.7 Tue May 24 14:01:44 2005
+++ smarty/docs/en/designers/chapter-debugging-console.xml Wed Sep 27 08:47:36 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<chapter id="chapter.debugging.console">
<title>Debugging Console</title>
<para>
@@ -8,36 +8,41 @@
<link linkend="language.function.include">included</link> templates,
<link linkend="api.assign">assigned</link> variables and
<link linkend="language.config.variables">config</link>
- file variables
- for the current invocation of the template. A template named "debug.tpl" is
- included with the distribution of Smarty which controls the formatting of
- the console. Set
- <link linkend="variable.debugging">$debugging</link> to true in Smarty, and if needed set
- <link linkend="variable.debug.tpl">$debug_tpl</link>
- to the template resource path for debug.tpl (this is in
- <link linkend="constant.smarty.dir">SMARTY_DIR</link> by
- default.) When you load the page, a javascript console window should pop up
+ file variables for the current invocation of the template. A template file
+ named <literal>debug.tpl</literal> is included with the distribution of
+ Smarty which controls the formatting of the console.
+ </para>
+ <para>
+ Set <link linkend="variable.debugging"><parameter>$debugging</parameter></link>
+ to &true; in Smarty, and if needed set <link linkend="variable.debug.tpl">
+ <parameter>$debug_tpl</parameter></link> to the template resource path to
+ <literal>debug.tpl</literal> (this is in <link linkend="constant.smarty.dir">
+ <constant>SMARTY_DIR</constant></link> by default).
+ When you load the page, a Javascript console window will pop up
and give you the names of all the included templates and assigned variables
- for the current page. To see the available variables for a particular
- templates, see the <link linkend="language.function.debug">{debug}</link>
- template function. To disable the debugging console, set
- <link linkend="variable.debugging">$debugging</link> to
- false. You can also temporarily turn on the debugging console by putting
- SMARTY_DEBUG in the URL if you enable this option with <link
- linkend="variable.debugging.ctrl">$debugging_ctrl</link>.
+ for the current page.</para>
+ <para>To see the available variables for a particular
+ template, see the <link linkend="language.function.debug">
+ <varname>{debug}</varname></link> template function.
+ To disable the debugging console, set
+ <link linkend="variable.debugging"><parameter>$debugging</parameter></link> to
+ &false;. You can also temporarily turn on the debugging console by putting
+ <literal>SMARTY_DEBUG</literal> in the URL if you enable this option with
+ <link linkend="variable.debugging.ctrl"><parameter>$debugging_ctrl</parameter>
+ </link>.
</para>
<note>
<title>Technical Note</title>
<para>
The debugging console does not work when you use the
- <link linkend="api.fetch">fetch()</link>
- API, only when using
- <link linkend="api.display">display()</link>.
+ <link linkend="api.fetch"><varname>fetch()</varname></link>
+ API, only when using <link linkend="api.display">
+ <varname>display()</varname></link>.
It is a set of javascript statements added
to the very bottom of the generated template. If you do not like javascript,
- you can edit the debug.tpl template to format the output however you like.
- Debug data is not cached and debug.tpl info is not included in the output of
- the debug console.
+ you can edit the <literal>debug.tpl</literal> template to format the output
+ however you like. Debug data is not cached and <literal>debug.tpl</literal>
+ info is not included in the output of the debug console.
</para>
</note>
<note>
@@ -49,9 +54,10 @@
<para>
See also
<link linkend="troubleshooting">troubleshooting</link>,
- <link linkend="variable.error.reporting">$error_reporting</link>
+ <link linkend="variable.error.reporting">
+ <parameter>$error_reporting</parameter></link>
and
- <link linkend="api.trigger.error">trigger_error()</link>.
+ <link linkend="api.trigger.error"><varname>trigger_error()</varname></link>.
</para>
</chapter>
http://cvs.php.net/viewvc.cgi/smarty/docs/en/designers/language-basic-syntax/language-syntax-comments.xml?r1=1.12&r2=1.13&diff_format=u
Index: smarty/docs/en/designers/language-basic-syntax/language-syntax-comments.xml
diff -u smarty/docs/en/designers/language-basic-syntax/language-syntax-comments.xml:1.12 smarty/docs/en/designers/language-basic-syntax/language-syntax-comments.xml:1.13
--- smarty/docs/en/designers/language-basic-syntax/language-syntax-comments.xml:1.12 Tue Sep 26 02:42:08 2006
+++ smarty/docs/en/designers/language-basic-syntax/language-syntax-comments.xml Wed Sep 27 08:47:36 2006
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
<sect1 id="language.syntax.comments">
<title>Comments</title>
<para>
Template comments are surrounded by asterisks, and that is surrounded
by the
<link linkend="variable.left.delimiter">delimiter</link>
- tags like so: <emphasis>{* this is a comment *}</emphasis>
+ tags like so: <literal>{* this is a comment *}</literal>
Smarty comments are NOT displayed in the final output of the template,
- unlike <!-- HTML comments -->
+ unlike <literal><!-- HTML comments --></literal>
these are useful for making internal notes in the templates which no one will see ;-)
</para>
<example>
http://cvs.php.net/viewvc.cgi/smarty/docs/en/designers/language-custom-functions/language-function-html-image.xml?r1=1.9&r2=1.10&diff_format=u
Index: smarty/docs/en/designers/language-custom-functions/language-function-html-image.xml
diff -u smarty/docs/en/designers/language-custom-functions/language-function-html-image.xml:1.9 smarty/docs/en/designers/language-custom-functions/language-function-html-image.xml:1.10
--- smarty/docs/en/designers/language-custom-functions/language-function-html-image.xml:1.9 Tue Sep 26 02:02:55 2006
+++ smarty/docs/en/designers/language-custom-functions/language-function-html-image.xml Wed Sep 27 08:47:36 2006
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
<sect1 id="language.function.html.image">
<title>{html_image}</title>
<para>
<varname>{html_image}</varname> is a
<link linkend="language.custom.functions">custom function</link>
- that generates a HTML <img> tag.
+ that generates an HTML <literal><img></literal> tag.
The <parameter>height</parameter> and <parameter>width</parameter>
are automatically calculated from the image file if they are not supplied.
</para>
@@ -92,8 +92,8 @@
<listitem><para>
<parameter>href</parameter> is the href value to link the image to.
- If link is supplied, an <a href="LINKVALUE"><a> tag is placed
- around the image tag.
+ If link is supplied, an <literal><a href="LINKVALUE"><a></literal>
+ tag is placed around the image tag.
</para> </listitem>
<listitem><para>
@@ -104,7 +104,7 @@
<listitem><para>
All parameters that are not in the list above are printed as
- name/value-pairs inside the created <img> tag.
+ name/value-pairs inside the created <literal><img></literal> tag.
</para></listitem>
</itemizedlist>
http://cvs.php.net/viewvc.cgi/smarty/docs/en/designers/language-custom-functions/language-function-html-options.xml?r1=1.16&r2=1.17&diff_format=u
Index: smarty/docs/en/designers/language-custom-functions/language-function-html-options.xml
diff -u smarty/docs/en/designers/language-custom-functions/language-function-html-options.xml:1.16 smarty/docs/en/designers/language-custom-functions/language-function-html-options.xml:1.17
--- smarty/docs/en/designers/language-custom-functions/language-function-html-options.xml:1.16 Tue Sep 26 19:28:45 2006
+++ smarty/docs/en/designers/language-custom-functions/language-function-html-options.xml Wed Sep 27 08:47:36 2006
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.16 $ -->
+<!-- $Revision: 1.17 $ -->
<sect1 id="language.function.html.options">
<title>{html_options}</title>
<para>
<varname>{html_options}</varname> is a
<link linkend="language.custom.functions">custom function</link>
- that creates a html <select><option> group
+ that creates the html <literal><select><option></literal> group
with the assigned data. It takes care of which item(s) are selected by
default as well.
</para>
@@ -32,35 +32,35 @@
<entry>array</entry>
<entry>Yes, unless using options attribute</entry>
<entry><emphasis>n/a</emphasis></entry>
- <entry>an array of values for dropdown</entry>
+ <entry>An array of values for dropdown</entry>
</row>
<row>
<entry>output</entry>
<entry>array</entry>
<entry>Yes, unless using options attribute</entry>
<entry><emphasis>n/a</emphasis></entry>
- <entry>an array of output for dropdown</entry>
+ <entry>An array of output for dropdown</entry>
</row>
<row>
<entry>selected</entry>
<entry>string/array</entry>
<entry>No</entry>
<entry><emphasis>empty</emphasis></entry>
- <entry>the selected option element(s)</entry>
+ <entry>The selected option element(s)</entry>
</row>
<row>
<entry>options</entry>
<entry>associative array</entry>
<entry>Yes, unless using values and output</entry>
<entry><emphasis>n/a</emphasis></entry>
- <entry>an associative array of values and output</entry>
+ <entry>An associative array of values and output</entry>
</row>
<row>
<entry>name</entry>
<entry>string</entry>
<entry>No</entry>
<entry><emphasis>empty</emphasis></entry>
- <entry>name of select group</entry>
+ <entry>Name of select group</entry>
</row>
</tbody>
</tgroup>
@@ -76,18 +76,19 @@
<listitem><para>
If the optional <parameter>name</parameter> attribute is given, the
- <select></select> tags are created,
- otherwise ONLY the <option>'s list are generated.
+ <literal><select></select></literal> tags are created,
+ otherwise ONLY the <literal><option></literal> list is generated.
</para></listitem>
<listitem><para>
- If a given value is an array, it will treat it as an html <optgroup>,
- and display the groups. Recursion is supported with <optgroup>.
+ If a given value is an array, it will treat it as an html
+ <literal><optgroup></literal>, and display the groups.
+ Recursion is supported with <literal><optgroup></literal>.
</para></listitem>
<listitem><para>
- All parameters that are not in the list above are printed as
- name/value-pairs inside the <select> tag. They are ignored if
+ All parameters that are not in the list above are printed as name/value-pairs
+ inside the <literal><select></literal> tag. They are ignored if
the optional <parameter>name</parameter> is not given.
</para></listitem>
@@ -114,7 +115,7 @@
<para>
The following template will generate a drop-down list.
Note the presence of the <parameter>name</parameter> attribute
- which creates the <select> tags.
+ which creates the <literal><select></literal> tags.
</para>
<programlisting>
<![CDATA[
@@ -137,7 +138,8 @@
</example>
<example>
-<title>Dropdown with seperate arrays for ouptut.</title>
+<title>Dropdown with seperate arrays for <varname>values</varname> and
+<varname>ouptut</varname></title>
<programlisting role="php">
<![CDATA[
<?php
@@ -151,10 +153,10 @@
]]>
</programlisting>
<para>
- The above arrays would be output with the following template.
- Note the sneaky use of the php <ulink url="&url.php-manual;function.count">
+ The above arrays would be output with the following template
+ (note the use of the php <ulink url="&url.php-manual;function.count">
<varname>count()</varname></ulink> function as a modifier
- to set the select size.
+ to set the select size).
</para>
<programlisting>
<![CDATA[
@@ -194,7 +196,9 @@
]]>
</programlisting>
<para>
-Where a template could be as follows. Note the use of the truncate modifier.
+Where a template could be as follows. Note the use of the
+<link linkend="language.modifier.truncate"><varname>truncate</varname></link>
+modifier.
</para>
<programlisting>
<![CDATA[
@@ -218,8 +222,7 @@
?>
]]>
</programlisting>
- <para>With the template would be
-
+ <para>The script above and the following template
</para>
<programlisting>
<![CDATA[
@@ -228,7 +231,7 @@
</programlisting>
<para>
- Output of the above example would be:
+ would output:
</para>
<screen>
<![CDATA[
http://cvs.php.net/viewvc.cgi/smarty/docs/en/designers/language-custom-functions/language-function-html-radios.xml?r1=1.17&r2=1.18&diff_format=u
Index: smarty/docs/en/designers/language-custom-functions/language-function-html-radios.xml
diff -u smarty/docs/en/designers/language-custom-functions/language-function-html-radios.xml:1.17 smarty/docs/en/designers/language-custom-functions/language-function-html-radios.xml:1.18
--- smarty/docs/en/designers/language-custom-functions/language-function-html-radios.xml:1.17 Tue Sep 26 02:02:55 2006
+++ smarty/docs/en/designers/language-custom-functions/language-function-html-radios.xml Wed Sep 27 08:47:36 2006
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.17 $ -->
+<!-- $Revision: 1.18 $ -->
<sect1 id="language.function.html.radios">
<title>{html_radios}</title>
<para>
<varname>{html_radios}</varname> is a
<link linkend="language.custom.functions">custom function</link>
- that creates html radio button group.
- It takes care of which item is selected by default as well.
+ that creates a HTML radio button group.
+ It also takes care of which item is selected by default as well.
</para>
@@ -32,49 +32,49 @@
<entry>string</entry>
<entry>No</entry>
<entry><emphasis>radio</emphasis></entry>
- <entry>name of radio list</entry>
+ <entry>Name of radio list</entry>
</row>
<row>
<entry>values</entry>
<entry>array</entry>
<entry>Yes, unless using options attribute</entry>
<entry><emphasis>n/a</emphasis></entry>
- <entry>an array of values for radio buttons</entry>
+ <entry>An array of values for radio buttons</entry>
</row>
<row>
<entry>output</entry>
<entry>array</entry>
<entry>Yes, unless using options attribute</entry>
<entry><emphasis>n/a</emphasis></entry>
- <entry>an array of output for radio buttons</entry>
+ <entry>An array of output for radio buttons</entry>
</row>
<row>
<entry>selected</entry>
<entry>string</entry>
<entry>No</entry>
<entry><emphasis>empty</emphasis></entry>
- <entry>the selected radio element</entry>
+ <entry>The selected radio element</entry>
</row>
<row>
<entry>options</entry>
<entry>associative array</entry>
<entry>Yes, unless using values and output</entry>
<entry><emphasis>n/a</emphasis></entry>
- <entry>an associative array of values and output</entry>
+ <entry>An associative array of values and output</entry>
</row>
<row>
<entry>separator</entry>
<entry>string</entry>
<entry>No</entry>
<entry><emphasis>empty</emphasis></entry>
- <entry>string of text to separate each radio item</entry>
+ <entry>String of text to separate each radio item</entry>
</row>
<row>
<entry>assign</entry>
<entry>string</entry>
<entry>No</entry>
<entry><emphasis>empty</emphasis></entry>
- <entry>assign radio tags to an array instead of output</entry>
+ <entry>Assign radio tags to an array instead of output</entry>
</row>
</tbody>
</tgroup>
@@ -92,8 +92,9 @@
</para></listitem>
<listitem><para>
- All parameters that are not in the list above are printed as
- name/value-pairs inside each of the created <input>-tags.
+ All parameters that are not in the list above are output as
+ name/value-pairs inside each of the created
+ <literal><input></literal>-tags.
</para></listitem>
</itemizedlist>
<example>
http://cvs.php.net/viewvc.cgi/smarty/docs/en/designers/language-custom-functions/language-function-html-select-date.xml?r1=1.11&r2=1.12&diff_format=u
Index: smarty/docs/en/designers/language-custom-functions/language-function-html-select-date.xml
diff -u smarty/docs/en/designers/language-custom-functions/language-function-html-select-date.xml:1.11 smarty/docs/en/designers/language-custom-functions/language-function-html-select-date.xml:1.12
--- smarty/docs/en/designers/language-custom-functions/language-function-html-select-date.xml:1.11 Tue Sep 26 02:02:55 2006
+++ smarty/docs/en/designers/language-custom-functions/language-function-html-select-date.xml Wed Sep 27 08:47:36 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
<sect1 id="language.function.html.select.date">
<title>{html_select_date}</title>
<para>
@@ -8,7 +8,8 @@
that creates date dropdowns.
It can display any or all of year, month, and day.
All parameters that are not in the list below are printed as
- name/value-pairs inside the <select> tags of day, month and year.
+ name/value-pairs inside the <literal><select></literal> tags
+ of day, month and year.
</para>
<informaltable frame="all">
@@ -33,21 +34,21 @@
<entry>string</entry>
<entry>No</entry>
<entry>Date_</entry>
- <entry>what to prefix the var name with</entry>
+ <entry>What to prefix the var name with</entry>
</row>
<row>
<entry>time</entry>
- <entry>timestamp/YYYY-MM-DD</entry>
+ <entry>timestamp/ YYYY-MM-DD</entry>
<entry>No</entry>
<entry>current time in unix timestamp or YYYY-MM-DD format</entry>
- <entry>what date/time to use</entry>
+ <entry>What date/time to use</entry>
</row>
<row>
<entry>start_year</entry>
<entry>string</entry>
<entry>No</entry>
<entry>current year</entry>
- <entry>the first year in the dropdown, either
+ <entry>The first year in the dropdown, either
year number, or relative to current year (+/- N)</entry>
</row>
<row>
@@ -55,7 +56,7 @@
<entry>string</entry>
<entry>No</entry>
<entry>same as start_year</entry>
- <entry>the last year in the dropdown, either
+ <entry>The last year in the dropdown, either
year number, or relative to current year (+/- N)</entry>
</row>
<row>
@@ -63,56 +64,56 @@
<entry>boolean</entry>
<entry>No</entry>
<entry>&true;</entry>
- <entry>whether to display days or not</entry>
+ <entry>Whether to display days or not</entry>
</row>
<row>
<entry>display_months</entry>
<entry>boolean</entry>
<entry>No</entry>
<entry>&true;</entry>
- <entry>whether to display months or not</entry>
+ <entry>Whether to display months or not</entry>
</row>
<row>
<entry>display_years</entry>
<entry>boolean</entry>
<entry>No</entry>
<entry>&true;</entry>
- <entry>whether to display years or not</entry>
+ <entry>Whether to display years or not</entry>
</row>
<row>
<entry>month_format</entry>
<entry>string</entry>
<entry>No</entry>
<entry>%B</entry>
- <entry>what format the month should be in (strftime)</entry>
+ <entry>What format the month should be in (strftime)</entry>
</row>
<row>
<entry>day_format</entry>
<entry>string</entry>
<entry>No</entry>
<entry>%02d</entry>
- <entry>what format the day output should be in (sprintf)</entry>
+ <entry>What format the day output should be in (sprintf)</entry>
</row>
<row>
<entry>day_value_format</entry>
<entry>string</entry>
<entry>No</entry>
<entry>%d</entry>
- <entry>what format the day value should be in (sprintf)</entry>
+ <entry>What format the day value should be in (sprintf)</entry>
</row>
<row>
<entry>year_as_text</entry>
<entry>boolean</entry>
<entry>No</entry>
<entry>&false;</entry>
- <entry>whether or not to display the year as text</entry>
+ <entry>Whether or not to display the year as text</entry>
</row>
<row>
<entry>reverse_years</entry>
<entry>boolean</entry>
<entry>No</entry>
<entry>&false;</entry>
- <entry>display years in reverse order</entry>
+ <entry>Display years in reverse order</entry>
</row>
<row>
<entry>field_array</entry>
@@ -120,7 +121,7 @@
<entry>No</entry>
<entry>null</entry>
<entry>
- if a name is given, the select boxes will be drawn
+ If a name is given, the select boxes will be drawn
such that the results will be returned to PHP in the
form of name[Day], name[Year], name[Month].
</entry>
@@ -130,70 +131,70 @@
<entry>string</entry>
<entry>No</entry>
<entry>null</entry>
- <entry>adds size attribute to select tag if given</entry>
+ <entry>Adds size attribute to select tag if given</entry>
</row>
<row>
<entry>month_size</entry>
<entry>string</entry>
<entry>No</entry>
<entry>null</entry>
- <entry>adds size attribute to select tag if given</entry>
+ <entry>Adds size attribute to select tag if given</entry>
</row>
<row>
<entry>year_size</entry>
<entry>string</entry>
<entry>No</entry>
<entry>null</entry>
- <entry>adds size attribute to select tag if given</entry>
+ <entry>Adds size attribute to select tag if given</entry>
</row>
<row>
<entry>all_extra</entry>
<entry>string</entry>
<entry>No</entry>
<entry>null</entry>
- <entry>adds extra attributes to all select/input tags if given</entry>
+ <entry>Adds extra attributes to all select/input tags if given</entry>
</row>
<row>
<entry>day_extra</entry>
<entry>string</entry>
<entry>No</entry>
<entry>null</entry>
- <entry>adds extra attributes to select/input tags if given</entry>
+ <entry>Adds extra attributes to select/input tags if given</entry>
</row>
<row>
<entry>month_extra</entry>
<entry>string</entry>
<entry>No</entry>
<entry>null</entry>
- <entry>adds extra attributes to select/input tags if given</entry>
+ <entry>Adds extra attributes to select/input tags if given</entry>
</row>
<row>
<entry>year_extra</entry>
<entry>string</entry>
<entry>No</entry>
<entry>null</entry>
- <entry>adds extra attributes to select/input tags if given</entry>
+ <entry>Adds extra attributes to select/input tags if given</entry>
</row>
<row>
<entry>field_order</entry>
<entry>string</entry>
<entry>No</entry>
<entry>MDY</entry>
- <entry>the order in which to display the fields</entry>
+ <entry>The order in which to display the fields</entry>
</row>
<row>
<entry>field_separator</entry>
<entry>string</entry>
<entry>No</entry>
<entry>\n</entry>
- <entry>string printed between different fields</entry>
+ <entry>String printed between different fields</entry>
</row>
<row>
<entry>month_value_format</entry>
<entry>string</entry>
<entry>No</entry>
<entry>%m</entry>
- <entry>strftime format of the month values, default is
+ <entry>strftime() format of the month values, default is
%m for month numbers.</entry>
</row>
<row>
@@ -233,9 +234,9 @@
<note>
<para>
- There's an useful php function on the
+ There is an useful php function on the
<link linkend="tips.dates">date tips page</link> for converting
- <varname>{html_select_date}</varname> values to a timestamp.
+ <varname>{html_select_date}</varname> form values to a timestamp.
</para>
</note>
@@ -277,7 +278,7 @@
<option value="31">31</option>
</select>
<select name="Date_Year">
-<option value="2001" selected="selected">2001</option>
+<option value="2006" selected="selected">2006</option>
</select>
]]>
</screen>
@@ -288,8 +289,8 @@
<programlisting>
<![CDATA[
{* start and end year can be relative to current year *}
-{html_select_date prefix="StartDate" time=$time start_year="-5"
- end_year="+1" display_days=false}
+{html_select_date prefix='StartDate' time=$time start_year='-5'
+ end_year='+1' display_days=false}
]]>
</programlisting>
<para>
http://cvs.php.net/viewvc.cgi/smarty/docs/en/designers/language-custom-functions/language-function-html-select-time.xml?r1=1.8&r2=1.9&diff_format=u
Index: smarty/docs/en/designers/language-custom-functions/language-function-html-select-time.xml
diff -u smarty/docs/en/designers/language-custom-functions/language-function-html-select-time.xml:1.8 smarty/docs/en/designers/language-custom-functions/language-function-html-select-time.xml:1.9
--- smarty/docs/en/designers/language-custom-functions/language-function-html-select-time.xml:1.8 Tue Sep 26 02:02:55 2006
+++ smarty/docs/en/designers/language-custom-functions/language-function-html-select-time.xml Wed Sep 27 08:47:37 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
<sect1 id="language.function.html.select.time">
<title>{html_select_time}</title>
<para>
@@ -10,8 +10,8 @@
</para>
<para>
The <parameter>time</parameter> attribute can have different formats.
- It can be a unique timestamp, a string of the format YYYYMMDDHHMMSS
- or a string that is parseable by php's
+ It can be a unique timestamp, a string of the format
+ <literal>YYYYMMDDHHMMSS</literal> or a string that is parseable by PHP's
<ulink url="&url.php-manual;strtotime"><varname>strtotime()</varname></ulink>.
</para>
http://cvs.php.net/viewvc.cgi/smarty/docs/en/designers/language-custom-functions/language-function-html-table.xml?r1=1.11&r2=1.12&diff_format=u
Index: smarty/docs/en/designers/language-custom-functions/language-function-html-table.xml
diff -u smarty/docs/en/designers/language-custom-functions/language-function-html-table.xml:1.11 smarty/docs/en/designers/language-custom-functions/language-function-html-table.xml:1.12
--- smarty/docs/en/designers/language-custom-functions/language-function-html-table.xml:1.11 Tue Sep 26 02:02:55 2006
+++ smarty/docs/en/designers/language-custom-functions/language-function-html-table.xml Wed Sep 27 08:47:37 2006
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
<sect1 id="language.function.html.table">
<title>{html_table}</title>
<para>
<varname>{html_table}</varname> is a
<link linkend="language.custom.functions">custom function</link>
- that dumps an array of data into an HTML table.
+ that dumps an array of data into an HTML <literal><table></literal>.
</para>
<informaltable frame="all">
@@ -30,7 +30,7 @@
<entry>array</entry>
<entry>Yes</entry>
<entry><emphasis>n/a</emphasis></entry>
- <entry>array of data to loop through</entry>
+ <entry>Array of data to loop through</entry>
</row>
<row>
<entry>cols</entry>
@@ -38,7 +38,7 @@
<entry>No</entry>
<entry><emphasis>3</emphasis></entry>
<entry>
- number of columns in the table or a comma-separated list of column heading
+ Number of columns in the table or a comma-separated list of column heading
names or an array of column heading names.if the cols-attribute is empty,
but rows are given, then the number of cols is computed by the number
of rows and the number of elements to display to be just enough cols to
@@ -53,7 +53,7 @@
<entry>No</entry>
<entry><emphasis>empty</emphasis></entry>
<entry>
- number of rows in the table. if the rows-attribute is empty, but
+ Number of rows in the table. if the rows-attribute is empty, but
cols are given, then the number of rows is computed by the number of
cols and the number of elements to display to be just enough rows to
display all elements.
@@ -65,7 +65,7 @@
<entry>No</entry>
<entry><emphasis>cols</emphasis></entry>
<entry>
- direction of consecutive elements in the loop-array to be
+ Direction of consecutive elements in the loop-array to be
rendered. <emphasis>cols</emphasis> means elements are displayed
col-by-col. <emphasis>rows</emphasis> means elements are displayed
row-by-row.
@@ -76,44 +76,46 @@
<entry>string</entry>
<entry>No</entry>
<entry><emphasis>empty</emphasis></entry>
- <entry>
- text to be used for the caption element of the table.
- </entry>
+ <entry>Text to be used for the <literal><caption></literal>
+ element of the table</entry>
</row>
<row>
<entry>table_attr</entry>
<entry>string</entry>
<entry>No</entry>
<entry><emphasis>border="1"</emphasis></entry>
- <entry>attributes for table tag</entry>
+ <entry>Attributes for <literal><table></literal> tag</entry>
</row>
<row>
<entry>th_attr</entry>
<entry>string</entry>
<entry>No</entry>
<entry><emphasis>empty</emphasis></entry>
- <entry>attributes for th tag (arrays are cycled)</entry>
+ <entry>Attributes for <literal><th></literal> tag
+ (arrays are cycled)</entry>
</row>
<row>
<entry>tr_attr</entry>
<entry>string</entry>
<entry>No</entry>
<entry><emphasis>empty</emphasis></entry>
- <entry>attributes for tr tag (arrays are cycled)</entry>
+ <entry>attributes for <literal><tr></literal> tag
+ (arrays are cycled)</entry>
</row>
<row>
<entry>td_attr</entry>
<entry>string</entry>
<entry>No</entry>
<entry><emphasis>empty</emphasis></entry>
- <entry>attributes for td tag (arrays are cycled)</entry>
+ <entry>Attributes for <literal><td></literal> tag
+ (arrays are cycled)</entry>
</row>
<row>
<entry>trailpad</entry>
<entry>string</entry>
<entry>No</entry>
<entry><emphasis>&nbsp;</emphasis></entry>
- <entry>value to pad the trailing cells on last row with (if any)</entry>
+ <entry>Value to pad the trailing cells on last row with (if any)</entry>
</row>
<row>
<entry>hdir</entry>
@@ -121,7 +123,7 @@
<entry>No</entry>
<entry><emphasis>right</emphasis></entry>
<entry>
- direction of each row to be rendered. possible values:
+ Direction of each row to be rendered. possible values:
<emphasis>right</emphasis> (left-to-right), and
<emphasis>left</emphasis> (right-to-left)
</entry>
@@ -132,7 +134,7 @@
<entry>No</entry>
<entry><emphasis>down</emphasis></entry>
<entry>
- direction of each column to be rendered. possible values:
+ Direction of each column to be rendered. possible values:
<emphasis>down</emphasis> (top-to-bottom), <emphasis>up</emphasis>
(bottom-to-top)
</entry>
@@ -150,7 +152,8 @@
<listitem><para>
The <parameter>table_attr</parameter>, <parameter>tr_attr</parameter>
and <parameter>td_attr</parameter> values determine the attributes given
- to the <table>, <tr> and <td> tags.
+ to the <literal><table></literal>, <literal><tr></literal>
+ and <literal><td></literal> tags.
</para></listitem>
<listitem><para>
@@ -169,8 +172,8 @@
<programlisting role="php">
<![CDATA[
<?php
-$smarty->assign('data',array(1,2,3,4,5,6,7,8,9));
-$smarty->assign('tr',array('bgcolor="#eeeeee"','bgcolor="#dddddd"'));
+$smarty->assign( 'data', array(1,2,3,4,5,6,7,8,9) );
+$smarty->assign( 'tr', array('bgcolor="#eeeeee"','bgcolor="#dddddd"') );
$smarty->display('index.tpl');
?>
]]>
http://cvs.php.net/viewvc.cgi/smarty/docs/en/designers/language-custom-functions/language-function-mailto.xml?r1=1.9&r2=1.10&diff_format=u
Index: smarty/docs/en/designers/language-custom-functions/language-function-mailto.xml
diff -u smarty/docs/en/designers/language-custom-functions/language-function-mailto.xml:1.9 smarty/docs/en/designers/language-custom-functions/language-function-mailto.xml:1.10
--- smarty/docs/en/designers/language-custom-functions/language-function-mailto.xml:1.9 Tue Sep 26 02:02:55 2006
+++ smarty/docs/en/designers/language-custom-functions/language-function-mailto.xml Wed Sep 27 08:47:37 2006
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
<sect1 id="language.function.mailto">
<title>{mailto}</title>
<para>
- <varname>{mailto}</varname> automates the creation of mailto: links
- and optionally encodes them. Encoding e-mails makes it more difficult for
- web spiders to lift e-mail addresses off of a site.
+ <varname>{mailto}</varname> automates the creation of a <literal>mailto:</literal>
+ anchor links and optionally encodes them. Encoding emails makes it more
+ difficult for web spiders to lift email addresses off of a site.
<note>
<title>Technical Note</title>
<para>
@@ -117,7 +117,7 @@
{mailto address="[email protected]" encode="javascript"}
<script type="text/javascript" language="javascript">
- eval(unescape('%64%6f% ... snipped ...%61%3e%27%29%3b'))
+ eval(unescape('%64%6f% ... snipped ...%61%3e%27%29%3b'))
</script>
{mailto address="[email protected]" encode="hex"}
@@ -134,9 +134,9 @@
{mailto address="[email protected]" encode="javascript_charcode"}
<script type="text/javascript" language="javascript">
-<!--
-{document.write(String.fromCharCode(60,97, ... snipped ....60,47,97,62))}
-//-->
+ <!--
+ {document.write(String.fromCharCode(60,97, ... snipped ....60,47,97,62))}
+ //-->
</script>
]]>
</programlisting>
@@ -145,8 +145,8 @@
See also
<link linkend="language.modifier.escape"><varname>escape</varname></link>,
<link linkend="language.function.textformat"><varname>{textformat}</varname></link>
- and the
- <link linkend="tips.obfuscating.email">obfuscating email addresses</link> page.
+ and
+ <link linkend="tips.obfuscating.email">obfuscating email addresses</link>.
</para>
</sect1>
<!-- Keep this comment at the end of the file
http://cvs.php.net/viewvc.cgi/smarty/docs/en/designers/language-custom-functions/language-function-popup-init.xml?r1=1.8&r2=1.9&diff_format=u
Index: smarty/docs/en/designers/language-custom-functions/language-function-popup-init.xml
diff -u smarty/docs/en/designers/language-custom-functions/language-function-popup-init.xml:1.8 smarty/docs/en/designers/language-custom-functions/language-function-popup-init.xml:1.9
--- smarty/docs/en/designers/language-custom-functions/language-function-popup-init.xml:1.8 Tue Sep 26 02:02:55 2006
+++ smarty/docs/en/designers/language-custom-functions/language-function-popup-init.xml Wed Sep 27 08:47:37 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
<sect1 id="language.function.popup.init">
<title>{popup_init}</title>
<para>
@@ -12,8 +12,8 @@
<itemizedlist>
<listitem><para>
- <varname>{popup_init}</varname> must be called
- <emphasis>only once</emphasis>, preferably within the <head> tag
+ <varname>{popup_init}</varname> must be called <emphasis>only once</emphasis>,
+ preferably within the <literal><head></literal> tag
within any page you plan on using the <link linkend="language.function.popup">
<varname>{popup}</varname></link> function.
</para></listitem>
http://cvs.php.net/viewvc.cgi/smarty/docs/en/designers/language-custom-functions/language-function-textformat.xml?r1=1.5&r2=1.6&diff_format=u
Index: smarty/docs/en/designers/language-custom-functions/language-function-textformat.xml
diff -u smarty/docs/en/designers/language-custom-functions/language-function-textformat.xml:1.5 smarty/docs/en/designers/language-custom-functions/language-function-textformat.xml:1.6
--- smarty/docs/en/designers/language-custom-functions/language-function-textformat.xml:1.5 Tue Sep 26 02:02:55 2006
+++ smarty/docs/en/designers/language-custom-functions/language-function-textformat.xml Wed Sep 27 08:47:37 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<sect1 id="language.function.textformat">
<title>{textformat}</title>
<para>
@@ -35,50 +35,49 @@
<entry>string</entry>
<entry>No</entry>
<entry><emphasis>n/a</emphasis></entry>
- <entry>preset style</entry>
+ <entry>Preset style</entry>
</row>
<row>
<entry>indent</entry>
<entry>number</entry>
<entry>No</entry>
<entry><emphasis>0</emphasis></entry>
- <entry>the number of chars to indent every line</entry>
+ <entry>The number of chars to indent every line</entry>
</row>
<row>
<entry>indent_first</entry>
<entry>number</entry>
<entry>No</entry>
<entry><emphasis>0</emphasis></entry>
- <entry>the number of chars to indent the first line</entry>
+ <entry>The number of chars to indent the first line</entry>
</row>
<row>
<entry>indent_char</entry>
<entry>string</entry>
<entry>No</entry>
<entry><emphasis>(single space)</emphasis></entry>
- <entry>the character (or string of chars) to indent with</entry>
+ <entry>The character (or string of chars) to indent with</entry>
</row>
<row>
<entry>wrap</entry>
<entry>number</entry>
<entry>No</entry>
<entry><emphasis>80</emphasis></entry>
- <entry>how many characters to wrap each line to</entry>
+ <entry>How many characters to wrap each line to</entry>
</row>
<row>
<entry>wrap_char</entry>
<entry>string</entry>
<entry>No</entry>
<entry><emphasis>\n</emphasis></entry>
- <entry>the character (or string of chars) to break each
- line with</entry>
+ <entry>The character (or string of chars) to break each line with</entry>
</row>
<row>
<entry>wrap_cut</entry>
<entry>boolean</entry>
<entry>No</entry>
<entry><emphasis>&false;</emphasis></entry>
- <entry>if &true;, wrap will break the line at the exact
+ <entry>If &true;, wrap will break the line at the exact
character instead of at a word boundary</entry>
</row>
<row>
@@ -86,8 +85,7 @@
<entry>string</entry>
<entry>No</entry>
<entry><emphasis>n/a</emphasis></entry>
- <entry>the template variable the output will be assigned
- to</entry>
+ <entry>The template variable the output will be assigned to</entry>
</row>
</tbody>
</tgroup>
@@ -269,9 +267,9 @@
</example>
<para>
See also
- <link linkend="language.function.strip"><varname>{strip}</varname></link>
- and
- <link linkend="language.modifier.wordwrap"><varname>wordwrap</varname></link>.
+ <link linkend="language.function.strip"><varname>{strip}</varname></link>
+ and
+ <link linkend="language.modifier.wordwrap"><varname>wordwrap</varname></link>.
</para>
</sect1>
http://cvs.php.net/viewvc.cgi/smarty/docs/en/designers/language-variables/language-config-variables.xml?r1=1.5&r2=1.6&diff_format=u
Index: smarty/docs/en/designers/language-variables/language-config-variables.xml
diff -u smarty/docs/en/designers/language-variables/language-config-variables.xml:1.5 smarty/docs/en/designers/language-variables/language-config-variables.xml:1.6
--- smarty/docs/en/designers/language-variables/language-config-variables.xml:1.5 Tue Sep 26 03:44:02 2006
+++ smarty/docs/en/designers/language-variables/language-config-variables.xml Wed Sep 27 08:47:37 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<sect1 id="language.config.variables">
<title>Variables loaded from config files</title>
<para>
@@ -95,7 +95,7 @@
<varname>{config_load}</varname></link>.
</para>
<para>
- See also <link linkend="language.syntax.variables">Variables</link> and
+ See also <link linkend="language.syntax.variables">variables</link> and
<link linkend="language.variables.smarty">$smarty reserved
variables</link>
</para>
http://cvs.php.net/viewvc.cgi/smarty/docs/en/designers/language-variables/language-variables-smarty.xml?r1=1.16&r2=1.17&diff_format=u
Index: smarty/docs/en/designers/language-variables/language-variables-smarty.xml
diff -u smarty/docs/en/designers/language-variables/language-variables-smarty.xml:1.16 smarty/docs/en/designers/language-variables/language-variables-smarty.xml:1.17
--- smarty/docs/en/designers/language-variables/language-variables-smarty.xml:1.16 Tue Sep 26 03:44:02 2006
+++ smarty/docs/en/designers/language-variables/language-variables-smarty.xml Wed Sep 27 08:47:37 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.16 $ -->
+<!-- $Revision: 1.17 $ -->
<sect1 id="language.variables.smarty">
<title>{$smarty} reserved variable</title>
<para>
@@ -74,19 +74,18 @@
<link linkend="language.modifier.date.format"><varname>date_format</varname>
</link> modifier for display. Note that
<ulink url="&url.php-manual;function.time"><varname>time()</varname></ulink>
- is called each invocation; eg a script that takes three seconds to execute
+ is called on each invocation; eg a script that takes three seconds to execute
with a call to <parameter>$smarty.now</parameter> at start and end
will show the three second difference.
- </para>
- <example>
- <title>Using {$smarty.now}</title>
+ <informalexample>
<programlisting>
<![CDATA[
{* use the date_format modifier to show current date and time *}
{$smarty.now|date_format:'%Y-%m-%d %H:%M:%S'}
]]>
</programlisting>
- </example>
+ </informalexample>
+ </para>
</sect2>
<sect2 id="language.variables.smarty.const">
@@ -94,9 +93,8 @@
<para>
You can access PHP constant values directly. See also <link
linkend="smarty.constants">smarty constants</link>.
- </para>
- <example>
- <title>Using {$smarty.const} to access a constant</title>
+ </para>
+ <informalexample>
<programlisting role="php">
<![CDATA[
<?php
@@ -105,13 +103,15 @@
?>
]]>
</programlisting>
+</informalexample>
<para>Output the constant in a template with</para>
+<informalexample>
<programlisting>
<![CDATA[
{$smarty.const.MY_CONST_VAL}
]]>
</programlisting>
- </example>
+</informalexample>
</sect2>
<sect2 id="language.variables.smarty.capture">
@@ -170,7 +170,7 @@
</para>
<programlisting>
<![CDATA[
-<b>Main page if container.tpl</b>
+<b>Main page is container.tpl</b>
banner.tpl
]]>
</programlisting>