[Zope-Checkins] CVS: Zope/lib/python/DocumentTemplate -
DT_In.py:1.62 DT_UI.py:1.15
Tres Seaver
tseaver at zope.com
Thu Jan 15 17:44:38 EST 2004
Update of /cvs-repository/Zope/lib/python/DocumentTemplate
In directory cvs.zope.org:/tmp/cvs-serv19785/lib/python/DocumentTemplate
Modified Files:
DT_In.py DT_UI.py
Log Message:
- Merge CGI-escape templating changes from 2.6 / 2.7 audit work.
=== Zope/lib/python/DocumentTemplate/DT_In.py 1.61 => 1.62 ===
--- Zope/lib/python/DocumentTemplate/DT_In.py:1.61 Tue Nov 18 08:17:00 2003
+++ Zope/lib/python/DocumentTemplate/DT_In.py Thu Jan 15 17:44:07 2004
@@ -179,10 +179,8 @@
... display rows
<!--#if sequence-end--> <!--#if next-sequence-->
- <a href="<!--#var URL-->/<!--#var sequence-query
- -->&batch_start=<!--#var
- next-sequence-start-number-->">
- (Next <!--#var next-sequence-size--> results)
+ <a href="&dtml-URL;/&dtml-sequence-query;batch_start=&dtml-next-sequence-start-number;">
+ (Next &dtml-next-sequence-size; results)
</a>
<!--#/if--> <!--#/if-->
@@ -191,7 +189,7 @@
If the original URL is: 'foo/bar?x=1&y=2', then the
rendered text (after row data are displayed) will be::
- <a href="foo/bar?x=1&y=2&batch_start=20">
+ <a href="foo/bar?x=1&y=2&batch_start=20">
(Next 20 results)
</a>
@@ -199,7 +197,7 @@
then the rendered text (after row data are displayed)
will be::
- <a href="foo/bar?x=1&y=2&batch_start=30">
+ <a href="foo/bar?x=1&y=2&batch_start=30">
(Next 20 results)
</a>
=== Zope/lib/python/DocumentTemplate/DT_UI.py 1.14 => 1.15 ===
--- Zope/lib/python/DocumentTemplate/DT_UI.py:1.14 Sun Jul 6 06:43:46 2003
+++ Zope/lib/python/DocumentTemplate/DT_UI.py Thu Jan 15 17:44:07 2004
@@ -33,7 +33,7 @@
<BODY bgcolor="#FFFFFF">
<!--#var document_template_edit_header-->
- <FORM name="editform" ACTION="<!--#var URL1-->/manage_edit" METHOD="POST">
+ <FORM name="editform" ACTION="&dtml-URL1;/manage_edit" METHOD="POST">
<!--#var document_template_form_header-->
Document template source:
<center>
@@ -51,19 +51,19 @@
<INPUT NAME=SUBMIT TYPE="SUBMIT" VALUE="Change">
<INPUT NAME=SUBMIT TYPE="RESET" VALUE="Reset">
<INPUT NAME="dt_edit_name" TYPE="HIDDEN"
- VALUE="<!--#var URL1-->">
+ VALUE="&dtml-URL1;">
<!--#if FactoryDefaultString-->
<INPUT NAME=SUBMIT TYPE="SUBMIT"
- VALUE="<!--#var FactoryDefaultString-->">
+ VALUE="&dtml-FactoryDefaultString;">
<!--#/if FactoryDefaultString-->
<INPUT NAME=SUBMIT TYPE="SUBMIT" VALUE="Cancel">
<!--#if HTTP_REFERER-->
<INPUT NAME="CANCEL_ACTION" TYPE="HIDDEN"
- VALUE="<!--#var HTTP_REFERER-->">
+ VALUE="&dtml-HTTP_REFERER;">
<!--#else HTTP_REFERER-->
<!--#if URL1-->
<INPUT NAME="CANCEL_ACTION" TYPE="HIDDEN"
- VALUE="<!--#var URL1-->">
+ VALUE="&dtml-URL1;">
<!--#/if URL1-->
<!--#/if HTTP_REFERER-->
</center>
@@ -78,14 +78,14 @@
HTML.editConfirmation=HTML(
"""<html><head><title>Change Successful</title></head><body>
<!--#if CANCEL_ACTION-->
- <form action="<!--#var CANCEL_ACTION-->" method="POST">
+ <form action="&dtml-CANCEL_ACTION;" method="POST">
<center>
- <em><!--#var dt_edit_name--></em><br>has been changed.<br><br>
+ <em>&dtml-dt_edit_name;</em><br>has been changed.<br><br>
<input type=submit name="SUBMIT" value="OK">
</center>
</form></body></html>
<!--#else CANCEL_ACTION-->
<center>
- <em><!--#var dt_edit_name--></em><br>has been changed.
+ <em>&dtml-dt_edit_name;</em><br>has been changed.
</center>
<!--#/if CANCEL_ACTION-->""")
More information about the Zope-Checkins
mailing list