[Zope-Checkins] CVS: Zope/lib/python/App/dtml - addFactory.dtml:1.3 cacheGC.dtml:1.6 cacheParameters.dtml:1.5 cpContents.dtml:1.5 dbMain.dtml:1.5 debug.dtml:1.6 distributionView.dtml:1.3 editFactory.dtml:1.3 editPermission.dtml:1.4 manage.dtml:1.10 manage_form_title.dtml:1.4 manage_page_header.dtml:1.12 manage_style_test.dtml:1.3 manage_tabs.dtml:1.11 manage_top_frame.dtml:1.14 menu.dtml:1.12 profile.dtml:1.6 traceback.dtml:1.3 undo.dtml:1.4 zope_quick_start.dtml:1.9
Florent Guillaume
fg@nuxeo.com
Sun, 22 Dec 2002 12:54:29 -0500
Update of /cvs-repository/Zope/lib/python/App/dtml
In directory cvs.zope.org:/tmp/cvs-serv14380/lib/python/App/dtml
Modified Files:
addFactory.dtml cacheGC.dtml cacheParameters.dtml
cpContents.dtml dbMain.dtml debug.dtml distributionView.dtml
editFactory.dtml editPermission.dtml manage.dtml
manage_form_title.dtml manage_page_header.dtml
manage_style_test.dtml manage_tabs.dtml manage_top_frame.dtml
menu.dtml profile.dtml traceback.dtml undo.dtml
zope_quick_start.dtml
Log Message:
Merged efge-death-to-dtml-var-branch into HEAD:
Removed most <dtml-var> to replace them with &dtml-foo;.
This corrects a number of potential XSS holes, and simplifies
auditability of the remaining legitimate <dtml-var>.
=== Zope/lib/python/App/dtml/addFactory.dtml 1.2 => 1.3 ===
--- Zope/lib/python/App/dtml/addFactory.dtml:1.2 Mon Jan 8 17:46:57 2001
+++ Zope/lib/python/App/dtml/addFactory.dtml Sun Dec 22 12:53:57 2002
@@ -61,7 +61,7 @@
<select name="initial">
<dtml-in objectItems>
<dtml-if "meta_type != 'Principia Factory'">
- <option><dtml-var sequence-key></option>
+ <option>&dtml-sequence-key;</option>
</dtml-if>
</dtml-in>
</select>
=== Zope/lib/python/App/dtml/cacheGC.dtml 1.5 => 1.6 ===
--- Zope/lib/python/App/dtml/cacheGC.dtml:1.5 Wed Apr 17 07:39:32 2002
+++ Zope/lib/python/App/dtml/cacheGC.dtml Sun Dec 22 12:53:57 2002
@@ -17,7 +17,7 @@
Remove all objects from all ZODB in-memory caches
</td>
<td>
- <form action="<dtml-var URL1>/manage_minimize" method=GET>
+ <form action="&dtml-URL1;/manage_minimize" method=GET>
<div class="form-element">
<input type="submit" name="submit" value="Minimize" />
</div>
@@ -32,8 +32,8 @@
<table>
<dtml-in cacheStatistics>
-<tr><th align=left><dtml-var sequence-key></th>
- <td><dtml-var sequence-item></td>
+<tr><th align=left>&dtml-sequence-key;</th>
+ <td>&dtml-sequence-item;</td>
</tr>
</dtml-in>
@@ -45,7 +45,7 @@
<table border><tr><th>Object Class</th><th>Count</th></tr>
<dtml-in cache_detail>
- <tr><td><dtml-var sequence-key></td><td><dtml-var sequence-item></td></tr>
+ <tr><td>&dtml-sequence-key;</td><td>&dtml-sequence-item;</td></tr>
</dtml-in>
</table>
</dtml-if>
@@ -59,10 +59,10 @@
<th>References</th>
</tr>
<dtml-in cache_extreme_detail mapping>
- <tr><td><dtml-var oid></td>
- <td><dtml-var klass></td>
- <td><dtml-var rc></td>
- <td><dtml-var references></td>
+ <tr><td>&dtml-oid;</td>
+ <td>&dtml-klass;</td>
+ <td>&dtml-rc;</td>
+ <td>&dtml-references;</td>
</tr>
</dtml-in>
</table>
=== Zope/lib/python/App/dtml/cacheParameters.dtml 1.4 => 1.5 ===
--- Zope/lib/python/App/dtml/cacheParameters.dtml:1.4 Wed Mar 27 05:14:00 2002
+++ Zope/lib/python/App/dtml/cacheParameters.dtml Sun Dec 22 12:53:57 2002
@@ -10,7 +10,7 @@
</td>
<td>
<div class="form-text">
- <dtml-var database_size>
+ &dtml-database_size;
</div>
</td>
</tr>
@@ -23,7 +23,7 @@
</td>
<td>
<div class="form-text">
- <dtml-var cache_length>
+ &dtml-cache_length;
</div>
</td>
</tr>
@@ -35,9 +35,8 @@
</div>
</td>
<td>
- <form action="<dtml-var URL1>/manage_cache_size" method="get">
- <input type="text" name="value:int" value="<dtml-var
- cache_size html_quote>" size="6" />
+ <form action="&dtml-URL1;/manage_cache_size" method="get">
+ <input type="text" name="value:int" value="&dtml-cache_size;" size="6" />
<span class="form-element">
<input type="submit" name="submit" value="Change">
</span>
@@ -49,10 +48,10 @@
<dtml-in cacheStatistics>
<tr>
<th align=left>
- <dtml-var sequence-key>
+ &dtml-sequence-key;
</th>
<td>
- <dtml-var sequence-item>
+ &dtml-sequence-item;
</td>
</tr>
</dtml-in>
@@ -73,14 +72,14 @@
<dtml-in cache_detail_length mapping>
<dtml-if name="sequence-odd"><tr class="row-normal">
<dtml-else><tr class="row-hilite"></dtml-if>
- <td><div class="form-text"><dtml-var connection html_quote></div></td>
- <td><div class="form-text"><dtml-var ngsize></div></td>
- <td><div class="form-text"><dtml-var size></div></td>
+ <td><div class="form-text">&dtml-connection;</div></td>
+ <td><div class="form-text">&dtml-ngsize;</div></td>
+ <td><div class="form-text">&dtml-size;</div></td>
</tr>
</dtml-in>
<tr class="row-hilite">
<td><div class="list-item">Total</div></td>
- <td><div class="list-item"><dtml-var cache_length></div></td>
+ <td><div class="list-item">&dtml-cache_length;</div></td>
<td><div class="list-item"></div></td>
</tr>
@@ -91,8 +90,7 @@
<table border><tr><th>Object Class</th><th>Count</th></tr>
<dtml-in cache_detail>
- <tr><td><dtml-var sequence-key></td><td><dtml-var
- sequence-item></td></tr>
+ <tr><td>&dtml-sequence-key;</td><td>&dtml-sequence-item;</td></tr>
</dtml-in>
</table>
</dtml-if>
@@ -106,10 +104,10 @@
<th>References</th>
</tr>
<dtml-in cache_extreme_detail mapping>
- <tr><td><dtml-var oid></td>
- <td><dtml-var klass></td>
- <td><dtml-var rc></td>
- <td><dtml-var references></td>
+ <tr><td>&dtml-oid;</td>
+ <td>&dtml-klass;</td>
+ <td>&dtml-rc;</td>
+ <td>&dtml-references;</td>
</tr>
</dtml-in>
</table>
=== Zope/lib/python/App/dtml/cpContents.dtml 1.4 => 1.5 ===
--- Zope/lib/python/App/dtml/cpContents.dtml:1.4 Tue Jul 9 11:14:51 2002
+++ Zope/lib/python/App/dtml/cpContents.dtml Sun Dec 22 12:53:57 2002
@@ -6,7 +6,7 @@
functions such as database and product management.
</p>
-<form action="<dtml-var URL1>" method="post" onSubmit="">
+<form action="&dtml-URL1;" method="post" onSubmit="">
<table cellspacing="0" cellpadding="2" border="0">
<tr>
<td align="left" valign="top">
@@ -16,7 +16,7 @@
</td>
<td align="left" valign="top">
<div class="form-text">
- <dtml-var version_txt>
+ &dtml-version_txt;
</div>
</td>
</tr>
@@ -28,7 +28,7 @@
</td>
<td align="left" valign="top">
<div class="form-text">
- <dtml-var sys_version>
+ &dtml-sys_version;
</div>
</td>
</tr>
@@ -40,7 +40,7 @@
</td>
<td align="left" valign="top">
<div class="form-text">
- <dtml-var sys_platform>
+ &dtml-sys_platform;
</div>
</td>
</tr>
@@ -52,7 +52,7 @@
</td>
<td align="left" valign="top">
<div class="form-text">
- <dtml-var getSOFTWARE_HOME>
+ &dtml-getSOFTWARE_HOME;
</div>
</td>
</tr>
@@ -64,7 +64,7 @@
</td>
<td align="left" valign="top">
<div class="form-text">
- <dtml-var getZOPE_HOME>
+ &dtml-getZOPE_HOME;
</div>
</td>
</tr>
@@ -76,7 +76,7 @@
</td>
<td align="left" valign="top">
<div class="form-text">
- <dtml-var getINSTANCE_HOME>
+ &dtml-getINSTANCE_HOME;
</div>
</td>
</tr>
@@ -88,7 +88,7 @@
</td>
<td align="left" valign="top">
<div class="form-text">
- <dtml-var getCLIENT_HOME>
+ &dtml-getCLIENT_HOME;
</div>
</td>
</tr>
@@ -100,7 +100,7 @@
</td>
<td align="left" valign="top">
<div class="form-text">
- <dtml-var process_id> (<dtml-var thread_get_ident>)
+ &dtml-process_id; (&dtml-thread_get_ident;)
</div>
</td>
</tr>
@@ -112,7 +112,7 @@
</td>
<td align="left" valign="top">
<div class="form-text">
- <dtml-var process_time>
+ &dtml-process_time;
</div>
</td>
</tr>
@@ -138,13 +138,13 @@
<dtml-in objectItems>
<tr>
<td width="16" align="left" valign="top">
- <a href="<dtml-var sequence-key url_quote>/manage_workspace">
- <img src="&dtml-BASEPATH1;/<dtml-var icon>" alt="" border="0" /></a>
+ <a href="&dtml.url_quote-sequence-key;/manage_workspace">
+ <img src="&dtml-BASEPATH1;/&dtml-icon;" alt="" border="0" /></a>
</td>
<td align="left" valign="top">
<div class="list-item">
- <a href="<dtml-var sequence-key url_quote>/manage_workspace">
- <dtml-var title>
+ <a href="&dtml.url_quote-sequence-key;/manage_workspace">
+ &dtml-title;
</a>
<dtml-if locked_in_version>
<dtml-if modified_in_version>
=== Zope/lib/python/App/dtml/dbMain.dtml 1.4 => 1.5 ===
--- Zope/lib/python/App/dtml/dbMain.dtml:1.4 Wed Jan 10 10:34:49 2001
+++ Zope/lib/python/App/dtml/dbMain.dtml Sun Dec 22 12:53:57 2002
@@ -16,7 +16,7 @@
</td>
<td align="left" valign="top">
<div class="form-text">
- <dtml-var db_name>
+ &dtml-db_name;
</div>
</td>
</tr>
@@ -28,7 +28,7 @@
</td>
<td align="left" valign="top">
<div class="form-text">
- <dtml-var db_size>
+ &dtml-db_size;
</div>
</td>
</tr>
=== Zope/lib/python/App/dtml/debug.dtml 1.5 => 1.6 ===
--- Zope/lib/python/App/dtml/debug.dtml:1.5 Wed Sep 19 21:43:03 2001
+++ Zope/lib/python/App/dtml/debug.dtml Sun Dec 22 12:53:57 2002
@@ -1,8 +1,8 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html>
<head>
-<title><dtml-if title><dtml-var title></dtml-if></title>
-<link rel="stylesheet" type="text/css" href="<dtml-var BASEPATH1>/manage_page_style.css">
+<title><dtml-if title>&dtml-title;</dtml-if></title>
+<link rel="stylesheet" type="text/css" href="&dtml-BASEPATH1;/manage_page_style.css">
<dtml-if debug_auto_reload>
<meta HTTP-EQUIV="Refresh"
CONTENT="&dtml-debug_auto_reload;;URL=&dtml-URL;?debug_auto_reload=&dtml-debug_auto_reload;">
@@ -38,20 +38,20 @@
<form action="&dtml-URL;" method="GET">
<p>
<ul>
-<li>Zope version: <dtml-var version_txt>
-<li>Python version: <dtml-var sys_version>
-<li>System Platform: <dtml-var sys_platform>
-<li>SOFTWARE_HOME: <dtml-var getSOFTWARE_HOME>
-<li>INSTANCE_HOME: <dtml-var getINSTANCE_HOME>
-<li>CLIENT_HOME: <dtml-var getCLIENT_HOME>
-<li>Process ID: <dtml-var process_id> (<dtml-var thread_get_ident>)
-<li>Running for: <dtml-var process_time>
+<li>Zope version: &dtml-version_txt;
+<li>Python version: &dtml-sys_version;
+<li>System Platform: &dtml-sys_platform;
+<li>SOFTWARE_HOME: &dtml-getSOFTWARE_HOME;
+<li>INSTANCE_HOME: &dtml-getINSTANCE_HOME;
+<li>CLIENT_HOME: &dtml-getCLIENT_HOME;
+<li>Process ID: &dtml-process_id; (&dtml-thread_get_ident;)
+<li>Running for: &dtml-process_time;
<li>sys.path: <dtml-in manage_getSysPath><br />
&dtml-sequence-item;
</dtml-in>
<li>Top Refcounts:<br><select name="foo" size="5"><dtml-in
- "refcount(100)"><option><dtml-var
- sequence-item>: <dtml-var sequence-key></option></dtml-in
+ "refcount(100)"><option>&dtml-sequence-item;:
+ &dtml-sequence-key;</option></dtml-in
></select><br><br>
<table border="1">
@@ -74,16 +74,16 @@
</dtml-if>
<tr>
<td class="cell" align="left" valign="top">
-<dtml-var name>
+&dtml-name;
</td>
<td class="cell" align="left" valign="top">
-<dtml-var pc>
+&dtml-pc;
</td>
<td class="cell" align="left" valign="top">
-<dtml-var rc>
+&dtml-rc;
</td>
<td class="cell" align="left" valign="top">
-+<dtml-var delta>
++&dtml-delta;
</td>
</tr>
</dtml-in>
@@ -92,11 +92,11 @@
<p><a href="../Database/cache_detail">Cache detail</a> |
<a href="../Database/cache_extreme_detail">Cache extreme detail</a>
</p>
-<p><a href="<dtml-var URL>?update_snapshot=1">Update Snapshot</a> |
+<p><a href="&dtml-URL;?update_snapshot=1">Update Snapshot</a> |
<dtml-if debug_auto_reload>
- <a href="<dtml-var URL>">Stop auto refresh</a>
+ <a href="&dtml-URL;">Stop auto refresh</a>
<dtml-else>
- <a href="<dtml-var URL>">Refresh</a> |
+ <a href="&dtml-URL;">Refresh</a> |
Auto refresh interval (seconds):
<input type="text" name="debug_auto_reload" size="3" value="10">
<input type="submit" value="Start auto refresh">
=== Zope/lib/python/App/dtml/distributionView.dtml 1.2 => 1.3 ===
--- Zope/lib/python/App/dtml/distributionView.dtml:1.2 Mon Jan 8 17:46:57 2001
+++ Zope/lib/python/App/dtml/distributionView.dtml Sun Dec 22 12:53:57 2002
@@ -15,7 +15,7 @@
</div>
</td>
<td align="left" valign="top">
- <input type="text" name="version" value="<dtml-var new_version html_quote>">
+ <input type="text" name="version" value="&dtml-new_version;">
</td>
</tr>
<tr>
@@ -41,9 +41,9 @@
<td align="left" valign="top">
<select name="configurable_objects:list" size=10 multiple>
<dtml-in objectItems>
- <option value="<dtml-var sequence-key html_quote>" <dtml-
+ <option value="&dtml-sequence-key;" <dtml-
if "_['sequence-key'] in configurable_objects_"
- >SELECTED</dtml-if>><dtml-var title_and_id></option>
+ >SELECTED</dtml-if>>&dtml-title_and_id;</option>
</dtml-in>
</select>
</td>
=== Zope/lib/python/App/dtml/editFactory.dtml 1.2 => 1.3 ===
--- Zope/lib/python/App/dtml/editFactory.dtml:1.2 Mon Jan 8 17:46:57 2001
+++ Zope/lib/python/App/dtml/editFactory.dtml Sun Dec 22 12:53:57 2002
@@ -17,7 +17,7 @@
</td>
<td align="left" valign="top">
<div class="form-text">
- <dtml-var id>
+ &dtml-id;
</div>
</td>
</tr>
@@ -29,8 +29,7 @@
</div>
</td>
<td align="left" valign="top">
- <input type="TEXT" name="title"size="40" value="<dtml-var
- title html_quote>" />
+ <input type="TEXT" name="title"size="40" value="&dtml-title;" />
</td>
</tr>
@@ -41,8 +40,7 @@
</div>
</td>
<td align="left" valign="top">
- <input type="TEXT" name="object_type" size="40" value="<dtml-var
- object_type html_quote>" />
+ <input type="TEXT" name="object_type" size="40" value="&dtml-object_type;" />
</td>
</tr>
@@ -58,7 +56,7 @@
<dtml-in objectIds>
<option <dtml-if
expr="_.string.strip(_['sequence-item'])==initial"> selected</dtml-if
- >><dtml-var sequence-item></option>
+ >>&dtml-sequence-item;</option>
</dtml-in>
</select>
</div>
@@ -77,7 +75,7 @@
<dtml-in possible_permissions>
<option <dtml-if
"_['sequence-item']==permission">selected</dtml-if
- >><dtml-var sequence-item></option>
+ >>&dtml-sequence-item;</option>
</dtml-in>
</select>
</td>
=== Zope/lib/python/App/dtml/editPermission.dtml 1.3 => 1.4 ===
--- Zope/lib/python/App/dtml/editPermission.dtml:1.3 Tue Jan 30 11:02:22 2001
+++ Zope/lib/python/App/dtml/editPermission.dtml Sun Dec 22 12:53:57 2002
@@ -11,7 +11,7 @@
</td>
<td align="left" valign="top">
<div class="form-text">
- <dtml-var id>
+ &dtml-id;
</div>
</td>
</tr>
@@ -23,8 +23,7 @@
</div>
</td>
<td align="left" valign="top">
- <input type="text" name="title"size="40" value="<dtml-var
- title html_quote>" />
+ <input type="text" name="title"size="40" value="&dtml-title;" />
</td>
</tr>
@@ -35,8 +34,7 @@
</div>
</td>
<td align="left" valign="top">
- <input type="text" name="name" size="40" value="<dtml-var
- name html_quote>" />
+ <input type="text" name="name" size="40" value="&dtml-name;" />
</td>
</tr>
=== Zope/lib/python/App/dtml/manage.dtml 1.9 => 1.10 ===
--- Zope/lib/python/App/dtml/manage.dtml:1.9 Thu Feb 8 14:17:15 2001
+++ Zope/lib/python/App/dtml/manage.dtml Sun Dec 22 12:53:57 2002
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html>
<head>
-<title>Zope on <dtml-var BASE0></title>
+<title>Zope on &dtml-BASE0;</title>
<script type="text/javascript">
<!--
function update_menu() {
@@ -19,14 +19,14 @@
<dtml-else>
<frameset rows="34, *">
</dtml-if>
- <frame src="<dtml-var URL1>/manage_top_frame" name="manage_top_frame"
+ <frame src="&dtml-URL1;/manage_top_frame" name="manage_top_frame"
marginheight="0" scrolling="no"/>
</dtml-if>
<frameset cols="175,*">
- <frame src="<dtml-var URL1>/manage_menu" name="manage_menu"
+ <frame src="&dtml-URL1;/manage_menu" name="manage_menu"
marginwidth="2" marginheight="2" scrolling="auto"/>
- <frame src="<dtml-var URL1>/manage_workspace" name="manage_main"
+ <frame src="&dtml-URL1;/manage_workspace" name="manage_main"
marginwidth="2" marginheight="2" scrolling="auto"/>
</frameset>
=== Zope/lib/python/App/dtml/manage_form_title.dtml 1.3 => 1.4 ===
--- Zope/lib/python/App/dtml/manage_form_title.dtml:1.3 Tue Jan 9 18:41:30 2001
+++ Zope/lib/python/App/dtml/manage_form_title.dtml Sun Dec 22 12:53:57 2002
@@ -3,7 +3,7 @@
<tr class="location-bar">
<td align="left" valign="top">
<div class="form-title">
- <dtml-var form_title>
+ &dtml-form_title;
</div>
</td>
<td align="right" valign="top">
=== Zope/lib/python/App/dtml/manage_page_header.dtml 1.11 => 1.12 ===
--- Zope/lib/python/App/dtml/manage_page_header.dtml:1.11 Wed Mar 27 05:14:00 2002
+++ Zope/lib/python/App/dtml/manage_page_header.dtml Sun Dec 22 12:53:57 2002
@@ -4,9 +4,9 @@
<dtml-unless management_page_charset>
<dtml-call "REQUEST.set('management_page_charset','iso-8859-1')">
</dtml-unless>
-<meta http-equiv="content-type" content="text/html;charset=<dtml-var management_page_charset>">
+<meta http-equiv="content-type" content="text/html;charset=&dtml-management_page_charset;">
<dtml-call "RESPONSE.setHeader('content-type','text/html;charset='+management_page_charset)">
-<title><dtml-if title><dtml-var title></dtml-if></title>
+<title><dtml-if title>&dtml-title;</dtml-if></title>
<dtml-let ag="REQUEST.get('HTTP_USER_AGENT', '')"
is_nav4="ag[:9] == 'Mozilla/4' and _.string.find(ag, 'MSIE') < 0"
use_css="REQUEST.get('zmi_use_css', '1')"
@@ -21,8 +21,7 @@
-->
</style>
<dtml-else>
-<link rel="stylesheet" type="text/css" href="<dtml-var
- BASEPATH1>/manage_page_style.css">
+<link rel="stylesheet" type="text/css" href="&dtml-BASEPATH1;/manage_page_style.css">
</dtml-if>
</dtml-if>
</dtml-let>
=== Zope/lib/python/App/dtml/manage_style_test.dtml 1.2 => 1.3 ===
--- Zope/lib/python/App/dtml/manage_style_test.dtml:1.2 Mon Jan 8 17:46:57 2001
+++ Zope/lib/python/App/dtml/manage_style_test.dtml Sun Dec 22 12:53:57 2002
@@ -2,11 +2,11 @@
<html lang="en">
<head>
<title>System Stylesheet Test</title>
-<link rel="stylesheet" type="text/css" href="<dtml-var SCRIPT_NAME>/manage_style_css">
+<link rel="stylesheet" type="text/css" href="&dtml.url_quote-SCRIPT_NAME;/manage_style_css">
</head>
<body bgcolor="#ffffff" link="#000099" alink="#000099" vlink="#555555">
-<dtml-var HTTP_USER_AGENT>
+&dtml-HTTP_USER_AGENT;
<h3>Text Styles</h3>
=== Zope/lib/python/App/dtml/manage_tabs.dtml 1.10 => 1.11 ===
--- Zope/lib/python/App/dtml/manage_tabs.dtml:1.10 Wed Aug 14 15:34:00 2002
+++ Zope/lib/python/App/dtml/manage_tabs.dtml Sun Dec 22 12:53:57 2002
@@ -59,16 +59,14 @@
size="1" color="#000000"> <a <dtml-if
action>href="&dtml-action;"<dtml-else>href="&dtml-URL1;"</dtml-if
><dtml-if target> target="&dtml-target;"</dtml-if
- >><span style="color: #000000;"><strong><dtml-var
- label></strong></span></a> </font></td>
+ >><span style="color: #000000;"><strong>&dtml-label;</strong></span></a> </font></td>
<dtml-else>
<td bgcolor="#efefef" valign="bottom" class="tab-small"
align="center"><font face="Verdana, Arial, Helvetica"
size="1" color="#000000"> <a <dtml-if
action>href="&dtml-action;"<dtml-else>href="&dtml-URL1;"</dtml-if
><dtml-if target> target="&dtml-target;"</dtml-if
- >><span style="color: #000000;"><strong><dtml-var
- label></strong></span></a> </font></td>
+ >><span style="color: #000000;"><strong>&dtml-label;</strong></span></a> </font></td>
</dtml-if>
</dtml-in>
</tr>
@@ -127,7 +125,7 @@
<dtml-else>
<img src="&dtml-BASEPATH1;/p_/lockedo"
alt="This item has been modified in another version" />
- (<em><dtml-var locked_in_version html_quote></em>)
+ (<em>&dtml-locked_in_version;</em>)
</dtml-if>
</dtml-if>
<dtml-if wl_isLocked>
@@ -161,7 +159,7 @@
<dtml-if Zope-Version>
<div class="system-msg">
-<em>You are currently working in version <a href="&dtml-SERVER_URL;&dtml-Zope-Version;/manage_main"><dtml-var Zope-Version html_quote></a></em>
+<em>You are currently working in version <a href="&dtml-SERVER_URL;&dtml-Zope-Version;/manage_main">&dtml-Zope-Version;</a></em>
</div>
</dtml-if>
</dtml-unless>
=== Zope/lib/python/App/dtml/manage_top_frame.dtml 1.13 => 1.14 ===
--- Zope/lib/python/App/dtml/manage_top_frame.dtml:1.13 Mon Jan 22 10:00:16 2001
+++ Zope/lib/python/App/dtml/manage_top_frame.dtml Sun Dec 22 12:53:57 2002
@@ -2,8 +2,7 @@
<html>
<head>
<title></title>
-<link rel="stylesheet" type="text/css" href="<dtml-var
- BASEPATH1>/manage_page_style.css">
+<link rel="stylesheet" type="text/css" href="&dtml-BASEPATH1;/manage_page_style.css">
</head>
<body bgcolor="#6699cc" link="#000099" alink="#000099" vlink="#000099"
marginwidth="0" marginheight="0">
@@ -11,14 +10,13 @@
<table width="100%" cellpadding="0" cellspacing="0" border="0">
<tr>
<td width="180" align="left" valign="top"><a
-href="http://www.zope.org/" target="_new"><img src="<dtml-var
-BASEPATH1>/p_/zopelogo_jpg" height="32" width="90" border="0" alt="" />
+href="http://www.zope.org/" target="_new"><img src="&dtml-BASEPATH1;/p_/zopelogo_jpg"
+height="32" width="90" border="0" alt="" />
</td>
<td align="right" valign="top">
<div class="form-element">
-<form action="<dtml-var BASEPATH1>/" method="POST" target="manage_main">
-<span class="std-text">Logged in as <strong><dtml-var
- AUTHENTICATED_USER></strong></span>
+<form action="&dtml-BASEPATH1;/" method="POST" target="manage_main">
+<span class="std-text">Logged in as <strong>&dtml-AUTHENTICATED_USER;</strong></span>
<select class="form-element" name=":action" onChange="window.parent.manage_main.location.href='&dtml-BASEPATH1;/'+this.options[this.selectedIndex].value">
<option value="zope_quick_start">Zope Quick Start</option>
=== Zope/lib/python/App/dtml/menu.dtml 1.11 => 1.12 ===
--- Zope/lib/python/App/dtml/menu.dtml:1.11 Wed Aug 15 15:00:12 2001
+++ Zope/lib/python/App/dtml/menu.dtml Sun Dec 22 12:53:57 2002
@@ -26,7 +26,7 @@
<dtml-if expr="URLPATH1==BASEPATH1">
Root Folder
<dtml-else>
- <dtml-var id>
+ &dtml-id;
</dtml-if>
</font>
</a>
@@ -36,11 +36,11 @@
</table>
<dtml-tree nowrap=1>
<dtml-if icon>
-<a href="<dtml-var tree-item-url fmt=url-quote>/manage_workspace"
+<a href="&dtml.url_quote-tree-item-url;/manage_workspace"
target="manage_main"><img src="&dtml-BASEPATH1;/&dtml-icon;" border="0"
title="Click to open this item" alt="&dtml-meta_type;" /></a>
</dtml-if>
-<a href="<dtml-var tree-item-url fmt=url-quote>/manage_workspace"
+<a href="&dtml.url_quote-tree-item-url;/manage_workspace"
target="manage_main">&dtml-id;</a>
</dtml-tree>
<table cellspacing="0">
@@ -69,9 +69,8 @@
<tr>
<td valign="top" align="center">
<div class="form-element">
-<form action="<dtml-var BASEPATH1>/" method="POST" target="manage_main">
-<span class="std-text">Logged in as <strong><dtml-var
- AUTHENTICATED_USER></strong></span>
+<form action="&dtml-BASEPATH1;/" method="POST" target="manage_main">
+<span class="std-text">Logged in as <strong>&dtml-AUTHENTICATED_USER;</strong></span>
<br />
<select class="form-element" name=":action" onChange="window.parent.manage_main.location.href='&dtml-BASEPATH1;/'+this.options[this.selectedIndex].value">
<option value="zope_quick_start">Zope Quick Start</option>
=== Zope/lib/python/App/dtml/profile.dtml 1.5 => 1.6 ===
--- Zope/lib/python/App/dtml/profile.dtml:1.5 Wed Nov 13 05:27:18 2002
+++ Zope/lib/python/App/dtml/profile.dtml Sun Dec 22 12:53:57 2002
@@ -14,7 +14,7 @@
Python profiler documentation</a>.
</p>
<br />
-<form action="<dtml-var URL>" method="POST">
+<form action="&dtml-URL;" method="POST">
<table>
<tr>
<td><strong>Sort</strong>:
@@ -22,18 +22,16 @@
<dtml-in "('time', 'cumulative', 'calls', 'pcalls',
'name', 'file', 'module', 'line',
'nfl', 'stdname')">
- <option value="<dtml-var sequence-item>"<dtml-if
- "sort==_['sequence-item']"> selected</dtml-if>><dtml-var
- sequence-item>
+ <option value="&dtml-sequence-item;"<dtml-if
+ "sort==_['sequence-item']"> selected</dtml-if>>&dtml-sequence-item;
</dtml-in>
</select>
</td>
<td><strong>Limit</strong>:
<select name="limit:int">
<dtml-in "(100, 200, 300, 400, 500)">
- <option value="<dtml-var sequence-item>"<dtml-if
- "limit==_['sequence-item']"> selected</dtml-if>><dtml-var
- sequence-item>
+ <option value="&dtml-sequence-item;"<dtml-if
+ "limit==_['sequence-item']"> selected</dtml-if>>&dtml-sequence-item;
</dtml-in>
</select>
</td>
@@ -58,7 +56,7 @@
</form>
<hr>
<pre>
-<dtml-var stats>
+&dtml-stats;
</pre>
<dtml-else>
=== Zope/lib/python/App/dtml/traceback.dtml 1.2 => 1.3 ===
--- Zope/lib/python/App/dtml/traceback.dtml:1.2 Mon Jan 8 17:46:57 2001
+++ Zope/lib/python/App/dtml/traceback.dtml Sun Dec 22 12:53:57 2002
@@ -3,6 +3,6 @@
<h3>Import Traceback</h3>
-<pre><dtml-var import_error_></pre>
+<pre>&dtml-import_error_;</pre>
<dtml-var manage_page_footer>
=== Zope/lib/python/App/dtml/undo.dtml 1.3 => 1.4 ===
--- Zope/lib/python/App/dtml/undo.dtml:1.3 Thu Apr 12 14:41:57 2001
+++ Zope/lib/python/App/dtml/undo.dtml Sun Dec 22 12:53:57 2002
@@ -28,11 +28,8 @@
<td align="left" valign="top">
<div class="list-nav">
<dtml-if first_transaction>
- <a href="manage_UndoForm?first_transaction:int=<dtml-var
- expr="first_transaction*2-last_transaction"
- >&last_transaction:int=<dtml-var first_transaction
- >&PrincipiaUndoBatchSize:int=<dtml-var PrincipiaUndoBatchSize
- >"
+ <a href="manage_UndoForm?first_transaction:int=<dtml-var expr="first_transaction*2-last_transaction"
+ >&last_transaction:int=&dtml-first_transaction;&PrincipiaUndoBatchSize:int=&dtml-PrincipiaUndoBatchSize;"
onMouseOver="window.status='View later transactions'; return true"
onMouseOut="window.status=''; return true">< Later Transactions</a>
<dtml-else>
@@ -44,11 +41,8 @@
<td align="right" valign="top" nowrap>
<div class="list-nav">
<dtml-if expr="_.len(undoable_transactions) == PrincipiaUndoBatchSize">
- <a href="manage_UndoForm?first_transaction:int=<dtml-var
- last_transaction>&last_transaction:int=<dtml-var
- expr="last_transaction+PrincipiaUndoBatchSize"
- >&PrincipiaUndoBatchSize:int=<dtml-var PrincipiaUndoBatchSize
- >"
+ <a href="manage_UndoForm?first_transaction:int=&dtml-last_transaction;&last_transaction:int=<dtml-var expr="last_transaction+PrincipiaUndoBatchSize"
+ >&PrincipiaUndoBatchSize:int=&dtml-PrincipiaUndoBatchSize;"
onMouseOver="window.status='View earlier transactions'; return true"
onMouseOut="window.status=''; return true">Earlier Transactions ></a>
<dtml-else>
@@ -72,8 +66,8 @@
</td>
<td align="left" valign="top">
<div class="list-item">
- <dtml-var description html_quote> by <strong><dtml-if
- user_name><dtml-var user_name html_quote><dtml-else
+ &dtml-description; by <strong><dtml-if
+ user_name>&dtml-user_name;<dtml-else
><em>Zope</em></dtml-if></strong>
</div>
</td>
=== Zope/lib/python/App/dtml/zope_quick_start.dtml 1.8 => 1.9 ===
--- Zope/lib/python/App/dtml/zope_quick_start.dtml:1.8 Mon May 20 14:30:20 2002
+++ Zope/lib/python/App/dtml/zope_quick_start.dtml Sun Dec 22 12:53:57 2002
@@ -14,8 +14,7 @@
-->
</style>
<dtml-else>
-<link rel="stylesheet" type="text/css" href="<dtml-var
- BASEPATH1>/manage_page_style.css">
+<link rel="stylesheet" type="text/css" href="&dtml-BASEPATH1;/manage_page_style.css">
</dtml-if>
</dtml-let>
</head>
@@ -88,7 +87,7 @@
<li>
<p>
-Go directly to the <a href="<dtml-var BASEPATH1>/manage" target="_top">
+Go directly to the <a href="&dtml-BASEPATH1;/manage" target="_top">
Zope Management Interface</a> if you'd like to start working with Zope
right away. <strong>NOTE: Some versions of Microsoft Internet Explorer,
(specifically IE 5.01 and early versions of IE 5.5) may have problems