[Zope-Checkins] CVS: Zope/lib/python/ZClasses/dtml - addPropertyInterface.dtml:1.2.210.1 addZClass.dtml:1.3.182.1 classPermissions.dtml:1.4.168.1 contents.dtml:1.2.210.1 itemProp.dtml:1.3.168.1 subobjects.dtml:1.3.168.1 views.dtml:1.3.168.1
Chris McDonough
chrism@zope.com
Fri, 3 Jan 2003 01:35:53 -0500
Update of /cvs-repository/Zope/lib/python/ZClasses/dtml
In directory cvs.zope.org:/tmp/cvs-serv28237/dtml
Modified Files:
Tag: chrism-install-branch
addPropertyInterface.dtml addZClass.dtml classPermissions.dtml
contents.dtml itemProp.dtml subobjects.dtml views.dtml
Log Message:
Merging chrism-install-branch with HEAD (hopefully for one of the last
times).
=== Zope/lib/python/ZClasses/dtml/addPropertyInterface.dtml 1.2 => 1.2.210.1 ===
--- Zope/lib/python/ZClasses/dtml/addPropertyInterface.dtml:1.2 Mon Jan 8 17:47:07 2001
+++ Zope/lib/python/ZClasses/dtml/addPropertyInterface.dtml Fri Jan 3 01:35:49 2003
@@ -39,8 +39,8 @@
<div class="form-element">
<select name=":method">
<dtml-in "propertysheets.common.objectValues()">
- <option value="<dtml-var id html_quote>/manage_createView"
- ><dtml-var title_and_id html_quote></option>
+ <option value="&dtml-id;/manage_createView"
+ >&dtml-title_and_id;</option>
</dtml-in>
</select>
</div>
=== Zope/lib/python/ZClasses/dtml/addZClass.dtml 1.3 => 1.3.182.1 ===
--- Zope/lib/python/ZClasses/dtml/addZClass.dtml:1.3 Thu Jan 25 16:15:49 2001
+++ Zope/lib/python/ZClasses/dtml/addZClass.dtml Fri Jan 3 01:35:49 2003
@@ -22,7 +22,7 @@
),
)">
<dtml-with "_(unselected=_.reorder(all, without=selected))">
-<form action="<dtml-var URL1>" method="get">
+<form action="&dtml-URL1;" method="get">
<table cellspacing="0" cellpadding="2" border="0">
<tr>
<td align="left" valign="top">
@@ -31,8 +31,7 @@
</div>
</td>
<td align="left" valign="top" colspan="3">
- <input type="text" name="id" value="<dtml-var
- id html_quote>" size="40" />
+ <input type="text" name="id" value="&dtml-id;" size="40" />
</td>
</tr>
<tr>
@@ -42,8 +41,7 @@
</div>
</td>
<td align="left" valign="top" colspan="3">
- <input type="text" name="title" value="<dtml-var
- title html_quote>" size="40" />
+ <input type="text" name="title" value="&dtml-title;" size="40" />
</td>
</tr>
<tr>
@@ -53,8 +51,7 @@
</div>
</td>
<td align="left" valign="top" colspan="3">
- <input type="text" name="meta_type" value="<dtml-var
- meta_type html_quote>" size="40" />
+ <input type="text" name="meta_type" value="&dtml-meta_type;" size="40" />
</td>
</tr>
<tr>
@@ -87,8 +84,8 @@
<br />
<SELECT NAME="unselected:list" size=9 multiple>
<dtml-in unselected>
- <OPTION VALUE="<dtml-var sequence-key html_quote>"
- ><dtml-var sequence-item></OPTION>
+ <OPTION VALUE="&dtml-sequence-key;"
+ >&dtml-sequence-item;</OPTION>
</dtml-in>
</SELECT>
</div>
@@ -98,8 +95,7 @@
<td align="left" valign="middle">
<div class="form-element">
<dtml-in selected>
- <input type=hidden name="baseclasses:list" value="<dtml-var
- sequence-key html_quote>"></dtml-in>
+ <input type=hidden name="baseclasses:list" value="&dtml-sequence-key;"></dtml-in>
<INPUT class="form-element" TYPE="SUBMIT"
NAME="manage_addZClassForm:method" VALUE=" >> ">
<BR />
@@ -115,8 +111,8 @@
<br />
<SELECT NAME="selected:list" size=9 multiple>
<dtml-in selected>
- <OPTION VALUE="<dtml-var sequence-key html_quote>"
- ><dtml-var sequence-item></OPTION>
+ <OPTION VALUE="&dtml-sequence-key;"
+ >&dtml-sequence-item;</OPTION>
</dtml-in>
</SELECT>
</div>
=== Zope/lib/python/ZClasses/dtml/classPermissions.dtml 1.4 => 1.4.168.1 ===
--- Zope/lib/python/ZClasses/dtml/classPermissions.dtml:1.4 Fri Apr 13 10:21:32 2001
+++ Zope/lib/python/ZClasses/dtml/classPermissions.dtml Fri Jan 3 01:35:49 2003
@@ -42,7 +42,7 @@
<td align="left" valign="top">
<div class="form-text">
<dtml-in classInheritedPermissions sort>
- <dtml-var sequence-item><br />
+ &dtml-sequence-item;<br />
</dtml-in>
</div>
</td>
=== Zope/lib/python/ZClasses/dtml/contents.dtml 1.2 => 1.2.210.1 ===
--- Zope/lib/python/ZClasses/dtml/contents.dtml:1.2 Mon Jan 8 17:47:07 2001
+++ Zope/lib/python/ZClasses/dtml/contents.dtml Fri Jan 3 01:35:49 2003
@@ -13,29 +13,29 @@
<dtml-in objectItems sort>
<TR>
<TD ALIGN="LEFT" VALIGN="TOP" WIDTH="16">
- <INPUT TYPE="CHECKBOX" NAME="ids:list" VALUE="<dtml-var sequence-key html_quote>">
+ <INPUT TYPE="CHECKBOX" NAME="ids:list" VALUE="&dtml-sequence-key;">
</TD>
<TD ALIGN="LEFT" VALIGN="TOP">
<dtml-if icon>
- <A HREF="<dtml-var sequence-key>/manage_workspace">
- <IMG SRC="<dtml-var SCRIPT_NAME>/<dtml-var icon>"
- ALT="[<dtml-var meta_type>]" BORDER="0"></A>
+ <A HREF="&dtml.url_quote-sequence-key;/manage_workspace">
+ <IMG SRC="&dtml.url_quote-SCRIPT_NAME;/&dtml.url_quote-icon;"
+ ALT="[&dtml-meta_type;]" BORDER="0"></A>
</dtml-if icon>
</TD>
<TD ALIGN="LEFT" VALIGN="TOP">
- <A HREF="<dtml-var sequence-key>/manage_workspace">
+ <A HREF="&dtml.url_quote-sequence-key;/manage_workspace">
<dtml-if "_['sequence-key'][:10]=='instance__'">
- <dtml-var "_['sequence-key'][10:]">
- <dtml-else ><dtml-var sequence-key>
+ <dtml-var "_['sequence-key'][10:]" html_quote>
+ <dtml-else >&dtml-sequence-key;
</dtml-if>
- <dtml-if title>(<dtml-var title>)</dtml-if>
+ <dtml-if title>(&dtml-title;)</dtml-if>
</A>
<dtml-if locked_in_version>
<dtml-if modified_in_version>
- <IMG SRC="<dtml-var SCRIPT_NAME>/p_/locked"
+ <IMG SRC="&dtml.url_quote-SCRIPT_NAME;/p_/locked"
ALT="This item has been modified in this version">
<dtml-else>
- <IMG SRC="<dtml-var SCRIPT_NAME>/p_/lockedo"
+ <IMG SRC="&dtml.url_quote-SCRIPT_NAME;/p_/lockedo"
ALT="This item has been modified in another version">
</dtml-if>
</dtml-if>
@@ -63,7 +63,7 @@
<TABLE BORDER="0" CELLSPACING="0" CELLPADDING="2">
<TR>
<TD>
-There are currently no items in <EM><dtml-var title_or_id></EM>
+There are currently no items in <EM>&dtml-title_or_id;</EM>
<P>
<dtml-if cb_dataValid>
<INPUT TYPE="SUBMIT" NAME="manage_pasteObjects:method" VALUE="Paste">
@@ -82,7 +82,7 @@
<FORM ACTION="." METHOD="GET">
<SELECT NAME=":method">
<dtml-in all_meta_types mapping>
- <OPTION value="<dtml-var action html_quote>"><dtml-var name html_quote>
+ <OPTION value="&dtml-action;">&dtml-name;
</dtml-in all_meta_types>
</SELECT><BR>
<INPUT TYPE="SUBMIT" VALUE=" Add ">
=== Zope/lib/python/ZClasses/dtml/itemProp.dtml 1.3 => 1.3.168.1 ===
--- Zope/lib/python/ZClasses/dtml/itemProp.dtml:1.3 Thu Apr 12 22:20:21 2001
+++ Zope/lib/python/ZClasses/dtml/itemProp.dtml Fri Jan 3 01:35:49 2003
@@ -25,7 +25,7 @@
Base Classes
</div>
</td>
- <TD ALIGN="LEFT" VALIGN="TOP"><dtml-var "_.string.join(ZClassBaseClassNames(), ', ')">
+ <TD ALIGN="LEFT" VALIGN="TOP"><dtml-var "_.string.join(ZClassBaseClassNames(), ', ')" html_quote>
</TD>
</TR>
<TR>
@@ -36,7 +36,7 @@
</td>
<TD ALIGN="LEFT" VALIGN="TOP">
<INPUT TYPE="TEXT" NAME="title" SIZE="40"
- value="<dtml-var zClassTitle html_quote>">
+ value="&dtml-zClassTitle;">
</TD>
</TR>
<TR>
@@ -47,7 +47,7 @@
</td>
<TD ALIGN="LEFT" VALIGN="TOP">
<INPUT TYPE="TEXT" NAME="meta_type" SIZE="40"
- value="<dtml-var classMetaType html_quote>">
+ value="&dtml-classMetaType;">
</TD>
</TR>
<dtml-if show_class_id>
@@ -59,7 +59,7 @@
</td>
<TD ALIGN="LEFT" VALIGN="TOP">
<INPUT TYPE="TEXT" NAME="class_id" SIZE="40"
- value="<dtml-var class_id html_quote>">
+ value="&dtml-class_id;">
</TD>
</TR>
</dtml-if>
@@ -71,7 +71,7 @@
</td>
<TD ALIGN="LEFT" VALIGN="TOP">
<INPUT TYPE="TEXT" NAME="icon" SIZE="40"
- value="<dtml-var classIcon html_quote>">
+ value="&dtml-classIcon;">
</TD>
</TR>
<TR>
@@ -82,8 +82,7 @@
</td>
<TD ALIGN="LEFT" VALIGN="TOP">
<dtml-if classIcon>
- <img src="<dtml-var SCRIPT_NAME>/<dtml-var classIcon
- >?t=<dtml-var ZopeTime fmt=second>" border="0"><br>
+ <img src="&dtml.url_quote-SCRIPT_NAME;/&dtml.url_quote-classIcon;?t=<dtml-var ZopeTime fmt=second>" border="0"><br>
</dtml-if>
<INPUT TYPE="file" NAME="file" SIZE="25" VALUE="">
</TD>
=== Zope/lib/python/ZClasses/dtml/subobjects.dtml 1.3 => 1.3.168.1 ===
--- Zope/lib/python/ZClasses/dtml/subobjects.dtml:1.3 Thu Apr 12 22:20:21 2001
+++ Zope/lib/python/ZClasses/dtml/subobjects.dtml Fri Jan 3 01:35:50 2003
@@ -32,7 +32,7 @@
<dtml-in possible_meta_types mapping>
<option
<dtml-if "name in selected">selected</dtml-if>
- ><dtml-var name></option>
+ >&dtml-name;</option>
</dtml-in>
</dtml-with>
</select>
=== Zope/lib/python/ZClasses/dtml/views.dtml 1.3 => 1.3.168.1 ===
--- Zope/lib/python/ZClasses/dtml/views.dtml:1.3 Thu Apr 12 22:20:21 2001
+++ Zope/lib/python/ZClasses/dtml/views.dtml Fri Jan 3 01:35:50 2003
@@ -3,7 +3,7 @@
<dtml-var manage_tabs>
</dtml-with>
-<form action="<dtml-var URL1>" method="post">
+<form action="&dtml-URL1;" method="post">
<table width="100%" cellspacing="0" cellpadding="2" border="0">
<tr class="list-header">
<td align="left" valign="top">
@@ -28,11 +28,11 @@
<tr>
<td align="left" valign="top">
<input type="checkbox" name="selected:list"
- value="<dtml-var label html_quote>" />
+ value="&dtml-label;" />
</td>
<td align="left" valign="top">
<div class="form-text">
- <dtml-var label html_quote>
+ &dtml-label;
</div>
</td>
<td align="left" valign="top">
@@ -41,7 +41,7 @@
<dtml-in zclass_candidate_view_actions>
<option
<dtml-if "_['sequence-item'] == action">SELECTED
- </dtml-if>><dtml-var sequence-item></option>
+ </dtml-if>>&dtml-sequence-item;</option>
</dtml-in>
</select>
</div>
@@ -52,8 +52,7 @@
<option></option>
<dtml-in "getProductHelp().helpValues()">
<option
- <dtml-if "_.has_key('help') and (_.len(help) >= 2) and _.getitem('sequence-item').id() == help[1]">SELECTED</dtml-if>><dtml-var
- id></option>
+ <dtml-if "_.has_key('help') and (_.len(help) >= 2) and _.getitem('sequence-item').id() == help[1]">SELECTED</dtml-if>>&dtml-id;</option>
</dtml-in>
</select>
</div>
@@ -105,7 +104,7 @@
<div class="form-element">
<select name="action">
<dtml-in zclass_candidate_view_actions>
- <option><dtml-var sequence-item></option>
+ <option>&dtml-sequence-item;</option>
</dtml-in>
</select>
</div>
@@ -123,7 +122,7 @@
<select name="help">
<option></option>
<dtml-in "getProductHelp().helpValues()">
- <option><dtml-var id></option>
+ <option>&dtml-id;</option>
</dtml-in>
</select>
</div>