[Checkins] SVN: Products.ExternalEditor/trunk/ Update dtml to Zope trunk
Laurence Rowe
l at lrowe.co.uk
Tue Nov 1 23:00:00 UTC 2011
Log message for revision 123241:
Update dtml to Zope trunk
Changed:
U Products.ExternalEditor/trunk/CHANGES.txt
U Products.ExternalEditor/trunk/Products/ExternalEditor/manage_main.dtml
U Products.ExternalEditor/trunk/Products/ExternalEditor/manage_tabs.dtml
U Products.ExternalEditor/trunk/setup.py
-=-
Modified: Products.ExternalEditor/trunk/CHANGES.txt
===================================================================
--- Products.ExternalEditor/trunk/CHANGES.txt 2011-11-01 22:53:36 UTC (rev 123240)
+++ Products.ExternalEditor/trunk/CHANGES.txt 2011-11-01 23:00:00 UTC (rev 123241)
@@ -1,6 +1,11 @@
Changelog
=========
+2.0.0 - unreleased
+------------------
+
+- Update dtml to Zope trunk.
+
1.1.0 - 2010-12-01
------------------
Modified: Products.ExternalEditor/trunk/Products/ExternalEditor/manage_main.dtml
===================================================================
--- Products.ExternalEditor/trunk/Products/ExternalEditor/manage_main.dtml 2011-11-01 22:53:36 UTC (rev 123240)
+++ Products.ExternalEditor/trunk/Products/ExternalEditor/manage_main.dtml 2011-11-01 23:00:00 UTC (rev 123241)
@@ -37,8 +37,8 @@
<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-var "REQUEST.URL1" html_quote>/'+this.options[this.selectedIndex].value">
- <option value="manage_workspace" disabled>Select type to add...</option>
+ onchange="location.href='<dtml-var "REQUEST.URL1" html_quote>/'+this.options[this.selectedIndex].value">
+ <option value="manage_workspace" disabled="disabled">Select type to add...</option>
<dtml-in filtered_meta_types mapping sort=name>
<dtml-if action>
<option value="&dtml.html_quote-action;">&dtml-name;</option>
@@ -76,42 +76,25 @@
<tr class="list-header">
<td width="5%" align="right" colspan="2"><div
class="list-item"><a href="./manage_main?skey=meta_type<dtml-if
- "skey == 'meta_type' and not rkey">&rkey=meta_type</dtml-if>"
- onMouseOver="window.status='Sort objects by type'; return true"
- onMouseOut="window.status=''; return true"><dtml-if
+ "skey == 'meta_type' and not rkey">&rkey=meta_type</dtml-if>"><dtml-if
"skey == 'meta_type' or rkey == 'meta_type'"
><strong>Type</strong><dtml-else>Type</dtml-if></a></div>
</td>
<td width="50%" align="left"><div class="list-item"><a
href="./manage_main?skey=id<dtml-if
- "skey == 'id' and not rkey">&rkey=id</dtml-if>"
- onMouseOver="window.status='Sort objects by name'; return true"
- onMouseOut="window.status=''; return true"><dtml-if
+ "skey == 'id' and not rkey">&rkey=id</dtml-if>"><dtml-if
"skey == 'id' or rkey == 'id'"
><strong>Name</strong><dtml-else>Name</dtml-if></a></div>
</td>
<td width="15%" align="left"><div class="list-item"><a
href="./manage_main?skey=get_size<dtml-if
- "skey == 'get_size' and not rkey">&rkey=get_size</dtml-if>"
- onMouseOver="window.status='Sort objects by size'; return true"
- onMouseOut="window.status=''; return true"><dtml-if
+ "skey == 'get_size' and not rkey">&rkey=get_size</dtml-if>"><dtml-if
"skey == 'get_size' or rkey == 'get_size'"
><strong>Size</strong><dtml-else>Size</dtml-if></a></div>
</td>
- <td width="19%" align="left"><div class="list-item"><a
- href="./manage_main?skey=bobobase_modification_time<dtml-if
- "skey == 'bobobase_modification_time' and not rkey"
- >&rkey=bobobase_modification_time</dtml-if>"
- onMouseOver="window.status='Sort objects by modification time'; return true"
- onMouseOut="window.status=''; return true"><dtml-if
- "skey == 'bobobase_modification_time' or rkey == 'bobobase_modification_time'"
- ><strong>Last Modified</strong><dtml-else>Last Modified</dtml-if></a></div>
- </td>
<dtml-if hasOrderSupport>
<td width="10%" align="left"><div class="list-item"><a
- href="./manage_main?skey=position"
- onMouseOver="window.status='Sort objects by position'; return true"
- onMouseOut="window.status=''; return true"><dtml-if
+ href="./manage_main?skey=position"><dtml-if
"skey == 'position'"
><strong>Position</strong><dtml-else>Position</dtml-if></a></div>
</td>
@@ -127,26 +110,8 @@
<td align="left" valign="top" width="16">
<input type="checkbox" name="ids:list" value="&dtml-sequence-key;" />
</td>
- <td align="left" valign="top" nowrap="1">
-
- <dtml-if om_icons>
- <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" width="16" height="16"/></dtml-in></a>
- <dtml-else>
-
- <dtml-if icon>
- <a href="&dtml.url_quote-sequence-key;/manage_workspace">
- <img src="&dtml-BASEPATH1;/&dtml-icon;" alt="&dtml-meta_type;"
- title="&dtml-meta_type;" border="0" /></a>
- <dtml-else>
-
- </dtml-if>
-
- </dtml-if>
-
-
+ <td align="left" valign="top" nowrap="nowrap">
+ <i>&dtml-meta_type;</i>
</td>
<td align="left" valign="top">
@@ -156,7 +121,7 @@
</a>
<dtml-try>
<dtml-if "wl_isLocked()==1">
- <img src="/p_/davlocked">
+ Locked
</dtml-if>
<dtml-except>
</dtml-try>
@@ -186,12 +151,6 @@
</dtml-try>
</div>
</td>
-
- <td>
- <div class="list-item">
- <dtml-var bobobase_modification_time fmt="%Y-%m-%d %H:%M">
- </div>
- </td>
</dtml-with>
<dtml-if hasOrderSupport>
@@ -240,7 +199,7 @@
<script type="text/javascript">
<!--
if (document.forms[0]) {
- document.write('<input class="form-element" type="submit" name="selectButton" value="Select All" onClick="toggleSelect(); return false">')
+ document.write('<input class="form-element" type="submit" name="selectButton" value="Select All" onclick="toggleSelect(); return false">')
}
//-->
</script>
Modified: Products.ExternalEditor/trunk/Products/ExternalEditor/manage_tabs.dtml
===================================================================
--- Products.ExternalEditor/trunk/Products/ExternalEditor/manage_tabs.dtml 2011-11-01 22:53:36 UTC (rev 123240)
+++ Products.ExternalEditor/trunk/Products/ExternalEditor/manage_tabs.dtml 2011-11-01 23:00:00 UTC (rev 123241)
@@ -16,38 +16,21 @@
<table cellpadding="0" cellspacing="0" width="100%" border="0">
<tr>
- <td bgcolor="#000000" rowspan="5" width="10%" valign="bottom"
- align="left"> <img src="&dtml-BASEPATH1;/p_/sp"
- width="2" height="1" alt="" />
- </td>
- <td bgcolor="#000000" colspan="<dtml-var "4 * (n_ + 1)">"><img
- src="&dtml-BASEPATH1;/p_/sp" width="1" height="5" alt="" /></td>
+ <td bgcolor="#000000" rowspan="5" width="1%"></td>
</tr>
<tr>
<dtml-in manage_options>
<dtml-if "_['sequence-index']==a_">
- <td bgcolor="#ffffff" rowspan="2" valign="top"
- align="left"><img src="&dtml-BASEPATH1;/p_/ltab" width="5"
- height="5" alt="" /></td>
- <td bgcolor="#ffffff"><img src="&dtml-BASEPATH1;/p_/sp"
- width="1" height="2" alt="" /></td>
- <td bgcolor="#ffffff" rowspan="2" valign="top"
- align="right"><img src="&dtml-BASEPATH1;/p_/rtab" width="5"
- height="5" alt="" /></td>
- <td bgcolor="#000000" rowspan="4"><img src="&dtml-BASEPATH1;/p_/sp"
- width="2" height="1" alt="" /></td>
+ <td bgcolor="#ffffff" rowspan="2"></td>
+ <td></td>
+ <td bgcolor="#ffffff" rowspan="2"></td>
+ <td bgcolor="#000000" rowspan="4"> </td>
<dtml-else>
- <td bgcolor="#efefef" rowspan="2" valign="top"
- align="left"><img src="&dtml-BASEPATH1;/p_/ltab" width="5"
- height="5" alt="" /></td>
- <td bgcolor="#efefef"><img src="&dtml-BASEPATH1;/p_/sp"
- width="1" height="2" alt="" /></td>
- <td bgcolor="#efefef" rowspan="2" valign="top"
- align="right"><img src="&dtml-BASEPATH1;/p_/rtab" width="5"
- height="5" alt="" /></td>
- <td bgcolor="#000000" rowspan="4"><img src="&dtml-BASEPATH1;/p_/sp"
- width="2" height="1" alt="" /></td>
+ <td bgcolor="#efefef" rowspan="2"></td>
+ <td bgcolor="#efefef"><span style="font-size:10%;"> </span></td>
+ <td bgcolor="#efefef" rowspan="2"></td>
+ <td bgcolor="#000000" rowspan="4"> </td>
</dtml-if>
</dtml-in>
</tr>
@@ -79,25 +62,12 @@
<tr>
<dtml-in manage_options>
<dtml-if "_['sequence-index']==a_">
- <td colspan="3" bgcolor="#ffffff"><img src="&dtml-BASEPATH1;/p_/sp"
- width="2" height="1" alt="" /></td>
+ <td colspan="3" bgcolor="#ffffff"><span style="font-size:30%;"> </span></td>
<dtml-else>
- <td colspan="3" bgcolor="#efefef"><img src="&dtml-BASEPATH1;/p_/sp"
- width="2" height="1" alt="" /></td>
+ <td colspan="3" bgcolor="#c0c0c0"><span style="font-size:30%;"> </span></td>
</dtml-if>
</dtml-in>
</tr>
-<tr>
-<dtml-in manage_options>
-<dtml-if "_['sequence-index']==a_">
- <td colspan="3" bgcolor="#ffffff"><img src="&dtml-BASEPATH1;/p_/sp"
- width="2" height="1" alt="" /></td>
-<dtml-else>
- <td colspan="3" bgcolor="#c0c0c0"><img src="&dtml-BASEPATH1;/p_/sp"
- width="2" height="1" alt="" /></td>
-</dtml-if>
-</dtml-in>
-</tr>
</table>
</dtml-if>
@@ -107,10 +77,6 @@
<tr class="location-bar">
<td align="left" valign="top">
<div class="std-text">
- <dtml-if icon>
- <img src="&dtml-BASEPATH1;/&dtml-icon;"
- alt="&dtml-meta_type;" border="0" />
- </dtml-if>
<strong>
<dtml-if meta_type>
&dtml-meta_type;
@@ -124,35 +90,10 @@
<dtml-except>
</dtml-try>
<dtml-if wl_isLocked>
- <img src="&dtml-BASEPATH1;/p_/davlocked"
- alt="This item has been locked by WebDAV"
- title="This item has been locked by WebDAV" />
+ Locked
</dtml-if wl_isLocked>
</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>
Modified: Products.ExternalEditor/trunk/setup.py
===================================================================
--- Products.ExternalEditor/trunk/setup.py 2011-11-01 22:53:36 UTC (rev 123240)
+++ Products.ExternalEditor/trunk/setup.py 2011-11-01 23:00:00 UTC (rev 123241)
@@ -2,7 +2,7 @@
setup(name='Products.ExternalEditor',
- version='1.1.0dev',
+ version='2.0.0dev',
description="Zope External Editor",
long_description=open("README.txt").read() + "\n" + \
open("CHANGES.txt").read(),
More information about the checkins
mailing list