[Zope-Checkins] CVS: Zope/lib/python/App/dtml - activity.dtml:1.2.8.1 davLockManager.dtml:1.2.184.1

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/App/dtml
In directory cvs.zope.org:/tmp/cvs-serv31373/lib/python/App/dtml

Modified Files:
      Tag: chrism-install-branch
	activity.dtml davLockManager.dtml 
Log Message:
Merge with HEAD.  Again, sorry for the spew (what's left of it... someone seems to have filtered some of this branch's checkins out).


=== Zope/lib/python/App/dtml/activity.dtml 1.2 => 1.2.8.1 ===
--- Zope/lib/python/App/dtml/activity.dtml:1.2	Mon Jun 10 16:20:43 2002
+++ Zope/lib/python/App/dtml/activity.dtml	Sat Oct 26 15:51:37 2002
@@ -49,10 +49,10 @@
 <tr>
  <th align="left"><font color="#ff0000">Object stores</font></th>
 <dtml-in divs mapping>
- <td align="right"><dtml-let url="REQUEST['URL'] +
+ <th align="right"><dtml-let url="REQUEST['URL'] +
      ('?chart_start=%s&chart_end=%s'
      % (start, end))"><a href="&dtml-url;"><font
-     color="#ff0000">&dtml-store_count;</font></a></dtml-let></td>
+     color="#ff0000">&dtml-store_count;</font></a></dtml-let></th>
 </dtml-in>
  <th align="left">&nbsp; Total:
    <font color="#ff0000">&dtml-total_store_count;</font>
@@ -63,17 +63,35 @@
 <tr>
  <th align="left" valign="top"><font color="#000080">Object loads</font></th>
 <dtml-in divs mapping>
- <td align="right"><dtml-let url="REQUEST['URL'] +
+ <th align="right"><dtml-let url="REQUEST['URL'] +
      ('?chart_start=%s&chart_end=%s'
      % (start, end))"><a href="&dtml-url;"><font
-     color="#000080">&dtml-load_count;</font></a></dtml-let><br />
-     <font size="-2">&dtml-time_offset;</font></td>
+     color="#000080">&dtml-load_count;</font></a></dtml-let></th>
 </dtml-in>
  <th align="left" valign="top">&nbsp; Total:
    <font color="#000080">&dtml-total_load_count;</font>
  </th>
 </tr>
 
+
+<tr>
+ <th align="left">Connections</th>
+<dtml-in divs mapping>
+ <th align="right">&dtml-connections;</th>
+</dtml-in>
+ <th align="left">&nbsp; Total:
+   &dtml-total_connections;
+ </th>
+</tr>
+
+
+<tr>
+ <th></th>
+<dtml-in divs mapping>
+ <th align="right"><font size="-2">&dtml-time_offset;</font></th>
+</dtml-in>
+ <th></th>
+</tr>
 
 
 </table>


=== Zope/lib/python/App/dtml/davLockManager.dtml 1.2 => 1.2.184.1 ===
--- Zope/lib/python/App/dtml/davLockManager.dtml:1.2	Wed Jan 31 16:26:51 2001
+++ Zope/lib/python/App/dtml/davLockManager.dtml	Sat Oct 26 15:51:37 2002
@@ -25,7 +25,7 @@
 //-->
 </script>
 
-<dtml-let lockedobjs="findLockedObjects(frompath=REQUEST.get('frompath',''))">
+<dtml-let lockedobjs="REQUEST.form.has_key('frompath','') and findLockedObjects(frompath=REQUEST.get('frompath','')) or []">
 
 <dtml-if lockedobjs>
  <p class="std-text">All locked objects