[Zope-CVS] CVS: Products/ExternalEditor - CHANGES.txt:1.52
manage_main.dtml:1.5
Casey Duncan
casey at zope.com
Mon Jul 12 14:00:37 EDT 2004
Update of /cvs-repository/Products/ExternalEditor
In directory cvs.zope.org:/tmp/cvs-serv23541
Modified Files:
CHANGES.txt manage_main.dtml
Log Message:
Add support for Zope 2.7 ordered folders. This was done by simply copying the current main.dtml from the 2.7 branch and adding the EE icon in the appropriate place. The dtml code works with both ordered and unordered folders, and checks out fine with Zope 2.6 as well 8^)
=== Products/ExternalEditor/CHANGES.txt 1.51 => 1.52 ===
--- Products/ExternalEditor/CHANGES.txt:1.51 Wed Jul 7 16:08:36 2004
+++ Products/ExternalEditor/CHANGES.txt Mon Jul 12 14:00:37 2004
@@ -2,6 +2,8 @@
Next release
+ - Add ZMI support for Zope 2.7's ordered folder objects.
+
- Fix bug detecting basic auth info from older versions of CookieCrumber.
Thanks to David D. Smith and Federico Sevilla III.
=== Products/ExternalEditor/manage_main.dtml 1.4 => 1.5 ===
--- Products/ExternalEditor/manage_main.dtml:1.4 Tue Aug 20 00:48:43 2002
+++ Products/ExternalEditor/manage_main.dtml Mon Jul 12 14:00:37 2004
@@ -1,267 +1,332 @@
-<dtml-var manage_page_header>
-<dtml-var manage_tabs>
-
-<script type="text/javascript">
-<!--
-
-isSelected = false;
-
-function toggleSelect() {
- if (isSelected == false) {
- for (i = 0; i < document.objectItems.length; i++)
- document.objectItems.elements[i].checked = true ;
- isSelected = true;
- document.objectItems.selectButton.value = "Deselect All";
- return isSelected;
- }
- else {
- for (i = 0; i < document.objectItems.length; i++)
- document.objectItems.elements[i].checked = false ;
- isSelected = false;
- document.objectItems.selectButton.value = "Select All";
- return isSelected;
- }
-}
-
-//-->
-</script>
-
-<dtml-unless skey><dtml-call expr="REQUEST.set('skey', 'id')"></dtml-unless>
-<dtml-unless rkey><dtml-call expr="REQUEST.set('rkey', '')"></dtml-unless>
-
-<!-- Add object widget -->
-<br />
-<dtml-if filtered_meta_types>
- <table width="100%" cellspacing="0" cellpadding="0" border="0">
- <tr>
- <td align="left" valign="top"> </td>
- <td align="right" valign="top">
- <div class="form-element">
- <form action="&dtml-URL1;/" 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">
- <option value="manage_workspace" disabled>Select type to add...</option>
- <dtml-in filtered_meta_types mapping sort=name>
- <option value="&dtml.url_quote-action;">&dtml-name;</option>
- </dtml-in>
- </select>
- <input class="form-element" type="submit" name="submit" value=" Add " />
- <dtml-else>
- <dtml-in filtered_meta_types mapping sort=name>
- <input type="hidden" name=":method" value="&dtml.url_quote-action;" />
- <input class="form-element" type="submit" name="submit" value=" Add &dtml-name;" />
- </dtml-in>
- </dtml-if>
- </form>
- </div>
- </td>
- </tr>
- </table>
-</dtml-if>
-
-<form action="&dtml-URL1;/" name="objectItems" method="post">
-<dtml-if objectItems>
-<table width="100%" cellspacing="0" cellpadding="2" border="0">
-<tr class="list-header">
- <td width="5%" align="right" colspan="2"><div
- class="list-item"><a href="./manage_main?skey=meta_type<dtml-if
- "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' 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
- "rkey == ''">&rkey=id</dtml-if>"
- onMouseOver="window.status='Sort objects by name'; return true"
- onMouseOut="window.status=''; return true"><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
- "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' or rkey == 'get_size'"
- ><strong>Size</strong><dtml-else>Size</dtml-if></a></div>
- </td>
- <td width="29%" align="left"><div class="list-item"><a
- href="./manage_main?skey=bobobase_modification_time<dtml-if
- "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>
-</tr>
-<dtml-in objectItems sort_expr="skey" reverse_expr="rkey">
-<dtml-if sequence-odd>
-<tr class="row-normal">
-<dtml-else>
-<tr class="row-hilite">
-</dtml-if>
- <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" /></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>
- <td align="left" valign="top">
- <div class="list-item">
- <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-var expr="externalEditLink_(this())">
- </div>
- </td>
-
- <dtml-with sequence-key>
- <td>
- <div class="list-item">
- <dtml-try>
- <dtml-if get_size>
- <dtml-let ob_size=get_size>
- <dtml-if "ob_size < 1024">
- 1 Kb
- <dtml-elif "ob_size > 1048576">
- <dtml-var "ob_size / 1048576.0" fmt="%0.02f"> Mb
- <dtml-else>
- <dtml-var "_.int(ob_size / 1024)"> Kb
- </dtml-if>
- </dtml-let>
- <dtml-else>
-
- </dtml-if>
- <dtml-except>
-
- </dtml-try>
- </div>
- </td>
-
- <td>
- <div class="list-item">
- <dtml-var bobobase_modification_time fmt="%Y-%m-%d %H:%M">
- </div>
- </td>
- </dtml-with>
-</tr>
-</dtml-in>
-</table>
-
-<table cellspacing="0" cellpadding="2" border="0">
-<tr>
- <td align="left" valign="top" width="16"></td>
- <td align="left" valign="top">
- <div class="form-element">
- <dtml-unless dontAllowCopyAndPaste>
- <input class="form-element" type="submit" name="manage_renameForm:method"
- value="Rename" />
- <input class="form-element" type="submit" name="manage_cutObjects:method"
- value="Cut" />
- <input class="form-element" type="submit" name="manage_copyObjects:method"
- value="Copy" />
- <dtml-if cb_dataValid>
- <input class="form-element" type="submit" name="manage_pasteObjects:method"
- value="Paste" />
- </dtml-if>
- </dtml-unless>
- <dtml-if "_.SecurityCheckPermission('Delete objects',this())">
- <input class="form-element" type="submit" name="manage_delObjects:method"
- value="Delete" />
- </dtml-if>
- <dtml-if "_.SecurityCheckPermission('Import/Export objects', this())">
- <input class="form-element" type="submit"
- name="manage_importExportForm:method"
- value="Import/Export" />
- </dtml-if>
-<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">')
- }
-//-->
-</script>
- </div>
- </td>
-</tr>
-</table>
-
-<dtml-else>
-<table cellspacing="0" cellpadding="2" border="0">
-<tr>
-<td>
-<div class="std-text">
-There are currently no items in <em>&dtml-title_or_id;</em>
-<br /><br />
-</div>
-<dtml-unless dontAllowCopyAndPaste>
-<dtml-if cb_dataValid>
-<div class="form-element">
-<input class="form-element" type="submit" name="manage_pasteObjects:method"
- value="Paste" />
-</div>
-</dtml-if>
-</dtml-unless>
-<dtml-if "_.SecurityCheckPermission('Import/Export objects', this())">
-<input class="form-element" type="submit"
- name="manage_importExportForm:method" value="Import/Export" />
-</dtml-if>
-</td>
-</tr>
-</table>
-</dtml-if>
-</form>
-
-<dtml-if update_menu>
-<script type="text/javascript">
-<!--
-window.parent.update_menu();
-//-->
-</script>
-</dtml-if>
-
-<dtml-var manage_page_footer>
-
-
-
-
-
-
-
-
-
-
-
-
-
+<dtml-var manage_page_header>
+<dtml-var manage_tabs>
+
+<script type="text/javascript">
+<!--
+
+isSelected = false;
+
+function toggleSelect() {
+ if (isSelected == false) {
+ for (i = 0; i < document.objectItems.length; i++)
+ document.objectItems.elements[i].checked = true ;
+ isSelected = true;
+ document.objectItems.selectButton.value = "Deselect All";
+ return isSelected;
+ }
+ else {
+ for (i = 0; i < document.objectItems.length; i++)
+ document.objectItems.elements[i].checked = false ;
+ isSelected = false;
+ document.objectItems.selectButton.value = "Select All";
+ return isSelected;
+ }
+}
+
+//-->
+</script>
+
+<!-- Add object widget -->
+<br />
+<dtml-if filtered_meta_types>
+ <table width="100%" cellspacing="0" cellpadding="0" border="0">
+ <tr>
+ <td align="left" valign="top"> </td>
+ <td align="right" valign="top">
+ <div class="form-element">
+ <form action="&dtml-URL1;/" 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">
+ <option value="manage_workspace" disabled>Select type to add...</option>
+ <dtml-in filtered_meta_types mapping sort=name>
+ <option value="&dtml.url_quote-action;">&dtml-name;</option>
+ </dtml-in>
+ </select>
+ <input class="form-element" type="submit" name="submit" value=" Add " />
+ <dtml-else>
+ <dtml-in filtered_meta_types mapping sort=name>
+ <input type="hidden" name=":method" value="&dtml.url_quote-action;" />
+ <input class="form-element" type="submit" name="submit" value="Add &dtml-name;" />
+ </dtml-in>
+ </dtml-if>
+ </form>
+ </div>
+ </td>
+ </tr>
+ </table>
+</dtml-if>
+
+<form action="&dtml-URL1;/" name="objectItems" method="post">
+<dtml-if objectItems>
+ <dtml-let hasOrderSupport="_.hasattr(this().aq_self, 'has_order_support')">
+ <dtml-unless skey>
+ <dtml-if hasOrderSupport>
+ <dtml-call expr="REQUEST.set('skey', getDefaultSorting()[0])">
+ <dtml-call expr="REQUEST.set('rkey', getDefaultSorting()[1])">
+ <dtml-else>
+ <dtml-call expr="REQUEST.set('skey', 'id')">
+ </dtml-if>
+ </dtml-unless>
+ <dtml-unless rkey><dtml-call expr="REQUEST.set('rkey', '')"></dtml-unless>
+
+<table width="100%" cellspacing="0" cellpadding="2" border="0">
+<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' 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' 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' 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
+ "skey == 'position'"
+ ><strong>Position</strong><dtml-else>Position</dtml-if></a></div>
+ </td>
+ </dtml-if>
+</tr>
+
+<dtml-in objectItems sort_expr="skey+'/cmp/asc'" reverse_expr="rkey">
+<dtml-if sequence-odd>
+<tr class="row-normal">
+<dtml-else>
+<tr class="row-hilite">
+</dtml-if>
+ <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" /></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>
+
+ <td align="left" valign="top">
+ <div class="list-item">
+ <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">
+ </dtml-if>
+ <dtml-except>
+ </dtml-try>
+ <dtml-var expr="externalEditLink_(this())">
+ </div>
+ </td>
+
+ <dtml-with sequence-key>
+ <td>
+ <div class="list-item">
+ <dtml-try>
+ <dtml-if get_size>
+ <dtml-let ob_size=get_size>
+ <dtml-if "ob_size < 1024">
+ 1 Kb
+ <dtml-elif "ob_size > 1048576">
+ <dtml-var "ob_size / 1048576.0" fmt="%0.02f"> Mb
+ <dtml-else>
+ <dtml-var "_.int(ob_size / 1024)"> Kb
+ </dtml-if>
+ </dtml-let>
+ <dtml-else>
+
+ </dtml-if>
+ <dtml-except>
+
+ </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>
+ <td>
+ <div class="list-item">
+ <dtml-if "skey == 'position'">
+ <dtml-var sequence-number>
+ <dtml-else>
+ ...
+ </dtml-if>
+ </div>
+ </td>
+ </dtml-if>
+</tr>
+</dtml-in>
+</table>
+
+<table cellspacing="0" cellpadding="2" border="0">
+<tr>
+ <td align="left" valign="top" width="16"></td>
+ <td align="left" valign="top">
+ <div class="form-element">
+ <dtml-unless dontAllowCopyAndPaste>
+ <input class="form-element" type="submit" name="manage_renameForm:method"
+ value="Rename" />
+ <dtml-if "_.SecurityCheckPermission('Delete objects',this())">
+ <input class="form-element" type="submit" name="manage_cutObjects:method"
+ value="Cut" />
+ </dtml-if>
+ <input class="form-element" type="submit" name="manage_copyObjects:method"
+ value="Copy" />
+ <dtml-if cb_dataValid>
+ <input class="form-element" type="submit" name="manage_pasteObjects:method"
+ value="Paste" />
+ </dtml-if>
+ </dtml-unless>
+ <dtml-if "_.SecurityCheckPermission('Delete objects',this())">
+ <input class="form-element" type="submit" name="manage_delObjects:method"
+ value="Delete" />
+ </dtml-if>
+ <dtml-if "_.SecurityCheckPermission('Import/Export objects', this())">
+ <input class="form-element" type="submit"
+ name="manage_importExportForm:method"
+ value="Import/Export" />
+ </dtml-if>
+<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">')
+ }
+//-->
+</script>
+ </div>
+ </td>
+</tr>
+<dtml-if "hasOrderSupport and
+ _.SecurityCheckPermission( 'Manage properties', this() )">
+<tr>
+ <td align="left" valign="top" width="16"></td>
+ <td align="left" valign="top">
+ <div class="form-element">
+ <dtml-if expr="skey == 'position' and _.len(objectItems) > 1">
+ <input class="form-element" type="submit"
+ name="manage_move_objects_up:method" value="Up" />
+ /
+ <input class="form-element" type="submit"
+ name="manage_move_objects_down:method" value="Down" />
+ by
+ <select name="delta:int">
+ <dtml-in "_.range(1,_.min(5,_.len(objectIds())))">
+ <option>&dtml-sequence-item;</option>
+ </dtml-in>
+ <dtml-in "_.range(5,_.len(objectIds()),5)">
+ <option>&dtml-sequence-item;</option>
+ </dtml-in>
+ </select>
+ <input class="form-element" type="submit"
+ name="manage_move_objects_to_top:method" value="Top" />
+ <input class="form-element" type="submit"
+ name="manage_move_objects_to_bottom:method" value="Bottom" />
+ </dtml-if>
+ <dtml-unless expr="(skey, rkey and 1 or 0) == getDefaultSorting()">
+ <input type="hidden" name="key" value="&dtml-skey;">
+ <input type="hidden" name="reverse" value="&dtml-rkey;">
+ <input class="form-element" type="submit"
+ name="manage_set_default_sorting:method"
+ value="Set View as Default" />
+ </dtml-unless>
+ </div>
+ </td>
+</tr>
+</dtml-if>
+</table>
+
+ </dtml-let>
+<dtml-else>
+<table cellspacing="0" cellpadding="2" border="0">
+<tr>
+<td>
+<div class="std-text">
+There are currently no items in <em>&dtml-title_or_id;</em>
+<br /><br />
+</div>
+<dtml-unless dontAllowCopyAndPaste>
+<dtml-if cb_dataValid>
+<div class="form-element">
+<input class="form-element" type="submit" name="manage_pasteObjects:method"
+ value="Paste" />
+</div>
+</dtml-if>
+</dtml-unless>
+<dtml-if "_.SecurityCheckPermission('Import/Export objects', this())">
+<input class="form-element" type="submit"
+ name="manage_importExportForm:method" value="Import/Export" />
+</dtml-if>
+</td>
+</tr>
+</table>
+</dtml-if>
+</form>
+
+<dtml-if update_menu>
+<script type="text/javascript">
+<!--
+window.parent.update_menu();
+//-->
+</script>
+</dtml-if>
+
+<dtml-var manage_page_footer>
More information about the Zope-CVS
mailing list