[Zope-Checkins] CVS: Zope/lib/python/Products/OFSP/dtml - draftAdd.dtml:1.2.210.1 draftApprove.dtml:1.2.210.1 version.dtml:1.2.210.1 versionEdit.dtml:1.2.210.1 versionEnd.dtml:1.3.4.1
Chris McDonough
chrism@zope.com
Fri, 3 Jan 2003 01:33:55 -0500
Update of /cvs-repository/Zope/lib/python/Products/OFSP/dtml
In directory cvs.zope.org:/tmp/cvs-serv27194/OFSP/dtml
Modified Files:
Tag: chrism-install-branch
draftAdd.dtml draftApprove.dtml version.dtml versionEdit.dtml
versionEnd.dtml
Log Message:
Merging chrism-install-branch with HEAD (hopefully for one of the last
times).
=== Zope/lib/python/Products/OFSP/dtml/draftAdd.dtml 1.2 => 1.2.210.1 ===
--- Zope/lib/python/Products/OFSP/dtml/draftAdd.dtml:1.2 Mon Jan 8 17:47:02 2001
+++ Zope/lib/python/Products/OFSP/dtml/draftAdd.dtml Fri Jan 3 01:32:51 2003
@@ -33,11 +33,11 @@
<select name="baseid" size="7">
<dtml-in objectValues sort=title_or_id>
<dtml-unless "meta_type in ('Version', 'Principia Draft', 'User Folder')">
- <option value="<dtml-var id html_quote>">
+ <option value="&dtml-id;">
<dtml-if title>
- <dtml-var title size="25"> (<dtml-var id>)
+ <dtml-var title size="25" html_quote> (&dtml-id;)
<dtml-else>
- <dtml-var id>
+ &dtml-id;
</dtml-if>
</option>
</dtml-unless>
=== Zope/lib/python/Products/OFSP/dtml/draftApprove.dtml 1.2 => 1.2.210.1 ===
--- Zope/lib/python/Products/OFSP/dtml/draftApprove.dtml:1.2 Mon Jan 8 17:47:02 2001
+++ Zope/lib/python/Products/OFSP/dtml/draftApprove.dtml Fri Jan 3 01:32:51 2003
@@ -6,7 +6,7 @@
<h3>Approve</h3>
<p class="form-text">
-You can make work done in <dtml-var id> (<dtml-var title>) permanent by
+You can make work done in &dtml-id; (&dtml-title;) permanent by
entering a remark in the space below and then clicking on the <em>approve</em>
button.
<br />
@@ -19,7 +19,7 @@
<h3>Discard</h3>
<p class="form-text">
-You can throw away work done in <dtml-var id> (<dtml-var title>) by
+You can throw away work done in &dtml-id; (&dtml-title;) by
clicking on the <em>discard</em> button.
<br />
<input type=submit value="Discard">
=== Zope/lib/python/Products/OFSP/dtml/version.dtml 1.2 => 1.2.210.1 ===
--- Zope/lib/python/Products/OFSP/dtml/version.dtml:1.2 Mon Jan 8 17:47:02 2001
+++ Zope/lib/python/Products/OFSP/dtml/version.dtml Fri Jan 3 01:32:51 2003
@@ -8,15 +8,15 @@
<p class="form-text">
You cannot start working in this version while another version,
- <strong><dtml-var Zope-Version></strong> is active.
- Leave <strong><dtml-var Zope-Version></strong> first and then
+ <strong>&dtml-Zope-Version;</strong> is active.
+ Leave <strong>&dtml-Zope-Version;</strong> first and then
you may work in this version.
</p>
<div class="form-element">
<form action="leave_another" method="post">
<input class="form-element" type="submit" name="submit"
- value="Quit working in <dtml-var Zope-Version html_quote>">
+ value="Quit working in &dtml-Zope-Version;">
</form>
</div>
@@ -25,13 +25,13 @@
<p class="form-text">
You <strong>are</strong> currently working in the
- <dtml-var Zope-Version> version.
+ &dtml-Zope-Version; version.
</p>
<div class="form-element">
<form action="leave" method="post">
<input class="form-element" type="submit" name="submit"
- value="Quit working in <dtml-var Zope-Version html_quote>">
+ value="Quit working in &dtml-Zope-Version;">
</form>
</div>
</dtml-if>
@@ -41,14 +41,14 @@
<p class="form-text">
You <strong>are not</strong> currently working in the
- <dtml-var title_and_id>
+ &dtml-title_and_id;
version.
</p>
<div class="form-element">
<form action="enter" method="POST">
<input class="form-element" type="submit" name="submit"
- value="Start working in <dtml-var title_or_id html_quote>">
+ value="Start working in &dtml-title_or_id;">
</form>
</div>
=== Zope/lib/python/Products/OFSP/dtml/versionEdit.dtml 1.2 => 1.2.210.1 ===
--- Zope/lib/python/Products/OFSP/dtml/versionEdit.dtml:1.2 Mon Jan 8 17:47:02 2001
+++ Zope/lib/python/Products/OFSP/dtml/versionEdit.dtml Fri Jan 3 01:32:51 2003
@@ -11,7 +11,7 @@
</td>
<td align="left" valign="top">
<div class="form-text">
- <dtml-var id>
+ &dtml-id;
</div>
</td>
</tr>
@@ -23,7 +23,7 @@
</td>
<td align="left" valign="top">
<input type="text" name="title" size="40"
- value="<dtml-var title html_quote>" />
+ value="&dtml-title;" />
</td>
</tr>
<tr>
=== Zope/lib/python/Products/OFSP/dtml/versionEnd.dtml 1.3 => 1.3.4.1 ===
--- Zope/lib/python/Products/OFSP/dtml/versionEnd.dtml:1.3 Wed Aug 14 13:32:34 2002
+++ Zope/lib/python/Products/OFSP/dtml/versionEnd.dtml Fri Jan 3 01:32:51 2003
@@ -4,11 +4,11 @@
<dtml-if nonempty>
<p class="form-help">
To save work done in version
-<dtml-var id><dtml-if Zope-Version><dtml-if "_vars['Zope-Version'] != cookie">
+&dtml-id;<dtml-if Zope-Version><dtml-if "_vars['Zope-Version'] != cookie">
<strong>to version
-<em><dtml-var Zope-Version></em></strong></dtml-if></dtml-if>,
+<em>&dtml-Zope-Version;</em></strong></dtml-if></dtml-if>,
click on the "Save" button. To discard work done in
-version <dtml-var id>, click on the "Discard" button.
+version &dtml-id;, click on the "Discard" button.
In either case, enter a comment to document the reason for
saving or discarding the version.
</p>