cvs: smarty /docs/en getting-started.xml /docs/en/designers language-basic-syntax.xml /docs/en/designers/language-custom-functions language-function-popup-init.xml /docs/en/designers/language-modifiers language-modifier-escape.xml /docs/en/programmers/api-functions api-display.xml /docs/en/programmers/plugins plugins-inserts.xml
[email protected] ("Peter 'Mash' Morgan") Mon, 09 Oct 2006 23:28:03 -0000
| Newsgroups | php.smarty.cvs |
|---|---|
| Message-ID | <cvspete_morgan1160436483@cvsserver> |
pete_morgan Mon Oct 9 23:28:03 2006 UTC
Modified files:
/smarty/docs/en getting-started.xml
/smarty/docs/en/designers language-basic-syntax.xml
/smarty/docs/en/designers/language-custom-functions
language-function-popup-init.xml
/smarty/docs/en/designers/language-modifiers
language-modifier-escape.xml
/smarty/docs/en/programmers/api-functions api-display.xml
/smarty/docs/en/programmers/plugins plugins-inserts.xml
Log:
Minor changes and corrections
http://cvs.php.net/viewvc.cgi/smarty/docs/en/getting-started.xml?r1=1.16&r2=1.17&diff_format=u
Index: smarty/docs/en/getting-started.xml
diff -u smarty/docs/en/getting-started.xml:1.16 smarty/docs/en/getting-started.xml:1.17
--- smarty/docs/en/getting-started.xml:1.16 Mon Oct 9 22:07:53 2006
+++ smarty/docs/en/getting-started.xml Mon Oct 9 23:28:03 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.16 $ -->
+<!-- $Revision: 1.17 $ -->
<part id="getting.started">
<title>Getting Started</title>
@@ -528,6 +528,9 @@
$smarty->assign('name','Ned');
+//** un-comment the following line to show the debug console
+//$smarty->debugging = true;
+
$smarty->display('index.tpl');
?>
http://cvs.php.net/viewvc.cgi/smarty/docs/en/designers/language-basic-syntax.xml?r1=1.7&r2=1.8&diff_format=u
Index: smarty/docs/en/designers/language-basic-syntax.xml
diff -u smarty/docs/en/designers/language-basic-syntax.xml:1.7 smarty/docs/en/designers/language-basic-syntax.xml:1.8
--- smarty/docs/en/designers/language-basic-syntax.xml:1.7 Mon Oct 9 22:50:41 2006
+++ smarty/docs/en/designers/language-basic-syntax.xml Mon Oct 9 23:28:03 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<chapter id="language.basic.syntax">
<title>Basic Syntax</title>
<para>
@@ -8,7 +8,7 @@
<literal>}</literal>, but they can be <link linkend="variable.left.delimiter">changed</link>.
</para>
<para>
- For examples, we will assume that you are using the default
+ For the examples in this manual, we will assume that you are using the default
delimiters. In Smarty, all content outside of delimiters is displayed as
static content, or unchanged. When Smarty encounters template tags, it
attempts to interpret them, and displays the appropriate output in their
http://cvs.php.net/viewvc.cgi/smarty/docs/en/designers/language-custom-functions/language-function-popup-init.xml?r1=1.9&r2=1.10&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.9 smarty/docs/en/designers/language-custom-functions/language-function-popup-init.xml:1.10
--- smarty/docs/en/designers/language-custom-functions/language-function-popup-init.xml:1.9 Wed Sep 27 08:47:37 2006
+++ smarty/docs/en/designers/language-custom-functions/language-function-popup-init.xml Mon Oct 9 23:28:03 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
<sect1 id="language.function.popup.init">
<title>{popup_init}</title>
<para>
@@ -51,6 +51,17 @@
</programlisting>
</example>
+<note>
+<title>XHTML validation</title>
+<para>The <literal>{popup_init}</literal> does not validate with
+strict and you will get the error
+<literal>document type does not allow element "div" here;</literal>
+(ie a <literal><div></literal> tag in the <literal><head></literal>).
+
+This means you will need to include the <literal><script></literal> and
+<literal><div></literal> tags manually.
+</para>
+</note>
</sect1>
<!-- Keep this comment at the end of the file
http://cvs.php.net/viewvc.cgi/smarty/docs/en/designers/language-modifiers/language-modifier-escape.xml?r1=1.17&r2=1.18&diff_format=u
Index: smarty/docs/en/designers/language-modifiers/language-modifier-escape.xml
diff -u smarty/docs/en/designers/language-modifiers/language-modifier-escape.xml:1.17 smarty/docs/en/designers/language-modifiers/language-modifier-escape.xml:1.18
--- smarty/docs/en/designers/language-modifiers/language-modifier-escape.xml:1.17 Mon Oct 9 22:50:41 2006
+++ smarty/docs/en/designers/language-modifiers/language-modifier-escape.xml Mon Oct 9 23:28:03 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.17 $ -->
+<!-- $Revision: 1.18 $ -->
<sect1 id="language.modifier.escape">
<title>escape</title>
<para>
@@ -121,10 +121,10 @@
<link linkend="language.function.mailto">
<varname>{mailto}</varname></link></para>
<screen>
- <![CDATA[
- {* email address mangled *}
- <a href="mailto:{$EmailAddress|escape:'hex'}">{$EmailAddress|escape:'mail'}</a>
- ]]>
+<![CDATA[
+{* email address mangled *}
+<a href="mailto:{$EmailAddress|escape:'hex'}">{$EmailAddress|escape:'mail'}</a>
+]]>
</screen>
</example>
http://cvs.php.net/viewvc.cgi/smarty/docs/en/programmers/api-functions/api-display.xml?r1=1.7&r2=1.8&diff_format=u
Index: smarty/docs/en/programmers/api-functions/api-display.xml
diff -u smarty/docs/en/programmers/api-functions/api-display.xml:1.7 smarty/docs/en/programmers/api-functions/api-display.xml:1.8
--- smarty/docs/en/programmers/api-functions/api-display.xml:1.7 Tue Sep 26 23:29:02 2006
+++ smarty/docs/en/programmers/api-functions/api-display.xml Mon Oct 9 23:28:03 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<refentry id="api.display">
<refnamediv>
<refname>display()</refname>
@@ -37,15 +37,15 @@
if(!$smarty->is_cached('index.tpl')) {
// dummy up some data
- $address = "245 N 50th";
+ $address = '245 N 50th';
$db_data = array(
- "City" => "Lincoln",
- "State" => "Nebraska",
- "Zip" => "68502"
+ 'City' => 'Lincoln',
+ 'State' => 'Nebraska',
+ 'Zip' => '68502'
);
- $smarty->assign("Name","Fred");
- $smarty->assign("Address",$address);
+ $smarty->assign('Name', 'Fred');
+ $smarty->assign('Address', $address);
$smarty->assign('data', $db_data);
}
http://cvs.php.net/viewvc.cgi/smarty/docs/en/programmers/plugins/plugins-inserts.xml?r1=1.4&r2=1.5&diff_format=u
Index: smarty/docs/en/programmers/plugins/plugins-inserts.xml
diff -u smarty/docs/en/programmers/plugins/plugins-inserts.xml:1.4 smarty/docs/en/programmers/plugins/plugins-inserts.xml:1.5
--- smarty/docs/en/programmers/plugins/plugins-inserts.xml:1.4 Wed Sep 27 03:26:52 2006
+++ smarty/docs/en/programmers/plugins/plugins-inserts.xml Mon Oct 9 23:28:03 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<sect1 id="plugins.inserts"><title>Inserts</title>
<para>
Insert plugins are used to implement functions that are invoked by
@@ -42,9 +42,7 @@
$smarty->trigger_error("insert time: missing 'format' parameter");
return;
}
-
- $datetime = strftime($params['format']);
- return $datetime;
+ return strftime($params['format']);
}
?>
]]>