[Checkins] SVN: Products.ExternalEditor/trunk/ update template monkeypatches to include Zope 2.12 fixes
David Glick
davidglick at onenw.org
Sun Jun 27 18:06:21 EDT 2010
Log message for revision 113950:
update template monkeypatches to include Zope 2.12 fixes
Changed:
U Products.ExternalEditor/trunk/CHANGES.txt
U Products.ExternalEditor/trunk/Products/ExternalEditor/findResult.dtml
U Products.ExternalEditor/trunk/Products/ExternalEditor/manage_main.dtml
U Products.ExternalEditor/trunk/Products/ExternalEditor/manage_tabs.dtml
-=-
Modified: Products.ExternalEditor/trunk/CHANGES.txt
===================================================================
--- Products.ExternalEditor/trunk/CHANGES.txt 2010-06-27 18:54:27 UTC (rev 113949)
+++ Products.ExternalEditor/trunk/CHANGES.txt 2010-06-27 22:06:20 UTC (rev 113950)
@@ -4,7 +4,10 @@
1.0b1 - Unreleased
------------------
+- Update manage_main, manage_tabs, and findResult monkey patches to include
+ fixes from Zope 2.12.
+
1.0a2 - 2009-11-13
------------------
Modified: Products.ExternalEditor/trunk/Products/ExternalEditor/findResult.dtml
===================================================================
--- Products.ExternalEditor/trunk/Products/ExternalEditor/findResult.dtml 2010-06-27 18:54:27 UTC (rev 113949)
+++ Products.ExternalEditor/trunk/Products/ExternalEditor/findResult.dtml 2010-06-27 22:06:20 UTC (rev 113950)
@@ -60,13 +60,13 @@
<td width="50%">
<div class="list-item">
<dtml-in name="results" previous size="batch_size" start="query_start">
- <strong> <a href="&dtml-URL;&dtml-sequence-query;query_start=&dtml-previous-sequence-start-number;">< Previous</a></strong>
+ <strong> <a href="<dtml-var "REQUEST.URL" html_quote>&dtml-sequence-query;query_start=&dtml-previous-sequence-start-number;">< Previous</a></strong>
<dtml-else> </dtml-in></div>
</td>
<td align="right" width="50%">
<div class="list-item">
<dtml-in name="results" next size=batch_size start=query_start>
- <strong><a href="&dtml-URL;&dtml-sequence-query;query_start=&dtml-next-sequence-start-number;">Next ></a></strong>
+ <strong><a href="<dtml-var "REQUEST.URL" html_quote>&dtml-sequence-query;query_start=&dtml-next-sequence-start-number;">Next ></a></strong>
<dtml-else> </dtml-in></div>
</td>
</tr>
@@ -129,12 +129,7 @@
</div>
</TD>
<TD ALIGN="LEFT" VALIGN="TOP">
- <INPUT TYPE="TEXT" NAME="obj_ids:tokens" SIZE="30" VALUE="<dtml-unless "REQUEST.obj_ids == []">
-<dtml-in expr="REQUEST.obj_ids">
-&dtml-sequence-item;
-
-</dtml-in>
-</dtml-unless>">
+ <INPUT TYPE="TEXT" NAME="obj_ids:tokens" SIZE="30" VALUE="<dtml-var "' '.join(obj_ids or [])">">
</TD>
</TR>
Modified: Products.ExternalEditor/trunk/Products/ExternalEditor/manage_main.dtml
===================================================================
--- Products.ExternalEditor/trunk/Products/ExternalEditor/manage_main.dtml 2010-06-27 18:54:27 UTC (rev 113949)
+++ Products.ExternalEditor/trunk/Products/ExternalEditor/manage_main.dtml 2010-06-27 22:06:20 UTC (rev 113950)
@@ -34,10 +34,10 @@
<td align="left" valign="top"> </td>
<td align="right" valign="top">
<div class="form-element">
- <form action="&dtml-URL1;/" method="get">
+ <form action="<dtml-var "REQUEST.URL1" html_quote>/" method="get">
<dtml-if "_.len(filtered_meta_types) > 1">
<select class="form-element" name=":action"
- onChange="location.href='&dtml-URL1;/'+this.options[this.selectedIndex].value">
+ onChange="location.href='<dtml-var "REQUEST.URL1" html_quote>/'+this.options[this.selectedIndex].value">
<option value="manage_workspace" disabled>Select type to add...</option>
<dtml-in filtered_meta_types mapping sort=name>
<dtml-if action>
@@ -59,7 +59,7 @@
</table>
</dtml-if>
-<form action="&dtml-URL1;/" name="objectItems" method="post">
+<form action="<dtml-var "REQUEST.URL1" html_quote>/" name="objectItems" method="post">
<dtml-if objectItems>
<dtml-let hasOrderSupport="_.getattr(this().aq_explicit, 'has_order_support', 0)">
<dtml-unless skey>
@@ -133,7 +133,7 @@
<a href="&dtml.url_quote-sequence-key;/manage_workspace">
<dtml-in om_icons mapping>
<img src="&dtml-BASEPATH1;/&dtml.url_quote-path;" alt="&dtml.missing-alt;"
- title="&dtml.missing-title;" border="0" /></dtml-in></a>
+ title="&dtml.missing-title;" border="0" width="16" height="16"/></dtml-in></a>
<dtml-else>
<dtml-if icon>
@@ -154,16 +154,6 @@
<a href="&dtml.url_quote-sequence-key;/manage_workspace">
&dtml-sequence-key; <dtml-if title>(&dtml-title;)</dtml-if>
</a>
- <dtml-if locked_in_version>
- <dtml-if modified_in_version>
- <img src="&dtml-BASEPATH1;/p_/locked"
- alt="This item has been modified in this version" />
- <dtml-else>
- <img src="&dtml-BASEPATH1;/p_/lockedo"
- alt="This item has been modified in another version" />
- (<em>&dtml-locked_in_version;</em>)
- </dtml-if>
- </dtml-if>
<dtml-try>
<dtml-if "wl_isLocked()==1">
<img src="/p_/davlocked">
Modified: Products.ExternalEditor/trunk/Products/ExternalEditor/manage_tabs.dtml
===================================================================
--- Products.ExternalEditor/trunk/Products/ExternalEditor/manage_tabs.dtml 2010-06-27 18:54:27 UTC (rev 113949)
+++ Products.ExternalEditor/trunk/Products/ExternalEditor/manage_tabs.dtml 2010-06-27 22:06:20 UTC (rev 113950)
@@ -59,7 +59,7 @@
align="center"><font face="Verdana, Arial, Helvetica"
size="1" color="#000000"> <a <dtml-if "s_item.get('action')"
>href="&dtml-action;"<dtml-else
- >href="&dtml-URL1;"</dtml-if
+ >href="<dtml-var "REQUEST.URL1" html_quote>"</dtml-if
><dtml-if "s_item.get('target')"> target="&dtml-target;"</dtml-if
>><span style="color: #000000;"><strong><dtml-var "s_item['label']"
></strong></span></a> </font></td>
@@ -68,7 +68,7 @@
align="center"><font face="Verdana, Arial, Helvetica"
size="1" color="#000000"> <a <dtml-if "s_item.get('action')"
>href="&dtml-action;"<dtml-else
- >href="&dtml-URL1;"</dtml-if
+ >href="<dtml-var "REQUEST.URL1" html_quote>"</dtml-if
><dtml-if "s_item.get('target')"> target="&dtml-target;"</dtml-if
>><span style="color: #000000;"><strong><dtml-var "s_item['label']"
></strong></span></a> </font></td>
@@ -113,27 +113,12 @@
</dtml-if>
<strong>
<dtml-if meta_type>
- <dtml-if class_manage_path>
- <a href="&dtml-BASEPATH1;&dtml-class_manage_path;"
- title="Manage the ZClass of this object">&dtml-meta_type;</a>
- <dtml-else>
- &dtml-meta_type;
- </dtml-if>
+ &dtml-meta_type;
<dtml-else>
Object
</dtml-if>
at <dtml-var expr="tabs_path_default(REQUEST)">
</strong>
- <dtml-if locked_in_version>
- <dtml-if modified_in_version>
- <img src="&dtml-BASEPATH1;/p_/locked"
- alt="This item has been modified in this version" />
- <dtml-else>
- <img src="&dtml-BASEPATH1;/p_/lockedo"
- alt="This item has been modified in another version" />
- (<em>&dtml-locked_in_version;</em>)
- </dtml-if>
- </dtml-if>
<dtml-try>
<dtml-var expr="externalEditLink_(this())">
<dtml-except>
@@ -146,32 +131,31 @@
</div>
</td>
<dtml-if "_.has_key('help_topic') and _.has_key('help_product')">
+ <dtml-if "HelpSys.helpLink(help_product, help_topic)">
<td align="right" valign="top">
<div class="std-text">
<dtml-var "HelpSys.helpLink(help_product, help_topic)">
</div>
</td>
+ </dtml-if>
<dtml-else>
<dtml-if manage_options>
<dtml-with "_(option=manage_options[a_])">
<dtml-if "option.has_key('help')">
+ <dtml-if "HelpSys.helpLink(option['help'][0], option['help'][1])">
<td align="right" valign="top">
<div class="std-text">
<dtml-var "HelpSys.helpLink(option['help'][0], option['help'][1])">
</div>
</td>
</dtml-if>
+ </dtml-if>
</dtml-with>
</dtml-if>
</dtml-if>
</tr>
</table>
-<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-Zope-Version;</a></em>
-</div>
-</dtml-if>
</dtml-unless>
<dtml-if manage_tabs_message>
More information about the checkins
mailing list