fixup CM dtml

AcceleratedHTTPCacheManager.py

@@ -230,7 +230,7 @@ def getSettings(self):
         ' '
         return self._settings.copy()  # Don't let DTML modify it.
 
-    manage_main = HTMLFile('propsAccel', globals())
+    manage_main = HTMLFile('dtml/propsAccel', globals())
 
     def manage_editProps(self, title, settings=None, REQUEST=None):
         ' '
@@ -247,7 +247,7 @@ def manage_editProps(self, title, settings=None, REQUEST=None):
             return self.manage_main(
                 self, REQUEST, manage_tabs_message='Properties changed.')
 
-    manage_stats = HTMLFile('statsAccel', globals())
+    manage_stats = HTMLFile('dtml/statsAccel', globals())
 
     def _getSortInfo(self):
         """
@@ -295,7 +295,8 @@ def sort_link(self, name, id):
 Globals.default__class_init__(AcceleratedHTTPCacheManager)
 
 
-manage_addAcceleratedHTTPCacheManagerForm = HTMLFile('addAccel', globals())
+manage_addAcceleratedHTTPCacheManagerForm = HTMLFile('dtml/addAccel',
+                                                     globals())
 
 def manage_addAcceleratedHTTPCacheManager(self, id, REQUEST=None):
     ' '

RAMCacheManager.py

@@ -412,7 +412,7 @@ def getSettings(self):
         'Returns the current cache settings.'
         return self._settings.copy()
 
-    manage_main = HTMLFile('propsRCM', globals())
+    manage_main = HTMLFile('dtml/propsRCM', globals())
 
     def manage_editProps(self, title, settings=None, REQUEST=None):
         'Changes the cache settings.'
@@ -431,7 +431,7 @@ def manage_editProps(self, title, settings=None, REQUEST=None):
             return self.manage_main(
                 self, REQUEST, manage_tabs_message='Properties changed.')
 
-    manage_stats = HTMLFile('statsRCM', globals())
+    manage_stats = HTMLFile('dtml/statsRCM', globals())
 
     def _getSortInfo(self):
         """
@@ -473,7 +473,7 @@ def sort_link(self, name, id):
 Globals.default__class_init__(RAMCacheManager)
 
 
-manage_addRAMCacheManagerForm = HTMLFile('addRCM', globals())
+manage_addRAMCacheManagerForm = HTMLFile('dtml/addRCM', globals())
 
 def manage_addRAMCacheManager(self, id, REQUEST=None):
     'Adds a RAM cache manager to the folder.'

dtml/addAccel.dtml

@@ -0,0 +1,31 @@
+<dtml-var manage_page_header>
+
+<dtml-var "manage_form_title(this(), _,
+           form_title='Add Accelerated HTTP Cache Manager',
+	   )">
+<form action="manage_addAcceleratedHTTPCacheManager" method="POST">
+<table cellspacing="0" cellpadding="2" border="0">
+  <tr>
+    <td align="left" valign="top">
+    <div class="form-label">
+    Id
+    </div>
+    </td>
+    <td align="left" valign="top">
+    <input type="text" name="id" size="40" />
+    </td>
+  </tr>
+  <tr>
+    <td align="left" valign="top">
+    </td>
+    <td align="left" valign="top">
+    <div class="form-element">
+    <input class="form-element" type="submit" name="submit" 
+     value=" Add " /> 
+    </div>
+    </td>
+  </tr>
+</table>
+</form>
+
+<dtml-var manage_page_footer>

dtml/addRCM.dtml

@@ -0,0 +1,31 @@
+<dtml-var manage_page_header>
+
+<dtml-var "manage_form_title(this(), _,
+           form_title='Add RAM Cache Manager',
+	   )">
+<form action="manage_addRAMCacheManager" method="POST">
+<table cellspacing="0" cellpadding="2" border="0">
+  <tr>
+    <td align="left" valign="top">
+    <div class="form-label">
+    Id
+    </div>
+    </td>
+    <td align="left" valign="top">
+    <input type="text" name="id" size="40" />
+    </td>
+  </tr>
+  <tr>
+    <td align="left" valign="top">
+    </td>
+    <td align="left" valign="top">
+    <div class="form-element">
+    <input class="form-element" type="submit" name="submit" 
+     value=" Add " /> 
+    </div>
+    </td>
+  </tr>
+</table>
+</form>
+
+<dtml-var manage_page_footer>

dtml/propsAccel.dtml

@@ -0,0 +1,65 @@
+<dtml-var manage_page_header>
+<dtml-var manage_tabs>
+
+<form action="manage_editProps" method="POST">
+<dtml-with getSettings mapping>
+<table cellspacing="0" cellpadding="2" border="0">
+  <tr>
+    <td align="left" valign="top">
+    <div class="form-optional">
+    Title
+    </div>
+    </td>
+    <td align="left" valign="top">
+    <input type="text" name="title" size="40" 
+     value="&dtml-title;" />
+    </td>
+  </tr>
+  <tr>
+    <td align="left" valign="top">
+    <div class="form-label">
+    Interval (seconds)
+    </div>
+    </td>
+    <td align="left" valign="top">
+    <input type="text" name="interval" size="40" 
+     value="&dtml-interval;" />
+    </td>
+  </tr>
+  <tr>
+    <td align="left" valign="top">
+    <div class="form-label">
+    Cache anonymous <br />connections only?
+    </div>
+    </td>
+    <td align="left" valign="top">
+    <input type="checkbox" name="anonymous_only" value="1"<dtml-if 
+     anonymous_only> checked="checked"</dtml-if> />
+    </td>
+  </tr>
+  <tr>
+    <td align="left" valign="top">
+    <div class="form-label">
+    Notify URLs (via PURGE)
+    </div>
+    </td>
+    <td align="left" valign="top">
+    <textarea name="notify_urls:lines" rows="5" cols="30"><dtml-in 
+     notify_urls>&dtml-sequence-item;</dtml-in></textarea>
+    </td>
+  </tr>
+  <tr>
+    <td align="left" valign="top">
+    </td>
+    <td align="left" valign="top">
+    <div class="form-element">
+    <input class="form-element" type="submit" name="submit" 
+     value="Save Changes" /> 
+    </div>
+    </td>
+  </tr>
+</table>
+</dtml-with>
+</form>
+
+<dtml-var manage_page_footer>

dtml/propsRCM.dtml

@@ -0,0 +1,66 @@
+<dtml-var manage_page_header>
+<dtml-var manage_tabs>
+
+<form action="manage_editProps" method="POST">
+<dtml-with getSettings mapping>
+<table cellspacing="0" cellpadding="2" border="0">
+  <tr>
+    <td align="left" valign="top">
+    <div class="form-optional">
+    Title
+    </div>
+    </td>
+    <td align="left" valign="top">
+    <input type="text" name="title" size="40" 
+     value="&dtml-title;" />
+    </td>
+  </tr>
+  <tr>
+    <td align="left" valign="top">
+    <div class="form-label">
+    REQUEST Variables
+    </div>
+    </td>
+    <td align="left" valign="top">
+    <textarea name="request_vars:lines" rows="5" cols="30"><dtml-in
+     request_vars>&dtml-sequence-item;</dtml-in></textarea>
+    </td>
+  </tr>
+  <tr>
+    <td align="left" valign="top">
+    <div class="form-label">
+    Threshold Entries
+    </div>
+    </td>
+    <td align="left" valign="top">
+    <input type="text" name="threshold" size="40" 
+     value="&dtml-threshold;" />
+    </td>
+  </tr>
+  <tr>
+    <td align="left" valign="top">
+    <div class="form-label">
+    Cleanup Interval (Seconds)
+    </div>
+    </td>
+    <td align="left" valign="top">
+    <input type="text" name="cleanup_interval" size="40" 
+     value="&dtml-cleanup_interval;" />
+    </td>
+  </tr>
+  <tr>
+    <td align="left" valign="top">
+    </td>
+    <td align="left" valign="top">
+    <div class="form-element">
+    <input class="form-element" type="submit" name="submit" 
+     value="Save Changes" /> 
+    </div>
+    </td>
+  </tr>
+</table>
+</dtml-with>
+</form>
+
+<dtml-var manage_page_footer>
+

dtml/statsAccel.dtml

@@ -0,0 +1,61 @@
+<dtml-var manage_page_header>
+<dtml-var manage_tabs>
+
+<p class="form-help">
+Cache manager hits generally correspond to HTTP accelerator misses. 
+A hit is counted in the "authenticated hits" column even if headers 
+are only set for anonymous requests.
+</p>
+
+<dtml-if getCacheReport>
+<table width="100%" cellspacing="0" cellpadding="2" border="0">
+<tr class="list-header">
+  <td align="left" valign="top">
+  <div class="list-nav">
+  <dtml-var expr="sort_link('Path', 'path')">
+  </div>
+  </td>
+  <td align="left" valign="top">
+  <div class="list-nav">
+  <dtml-var expr="sort_link('Anonymous hits', 'anon')">
+  </div>
+  </td>
+  <td align="left" valign="top">
+  <div class="list-nav">
+  <dtml-var expr="sort_link('Authenticated hits', 'auth')">
+  </div>
+  </td>
+</tr>
+<dtml-in getCacheReport mapping>
+<dtml-if sequence-odd>
+<tr class="row-normal">
+<dtml-else>
+<tr class="row-hilite">
+</dtml-if>
+  <td align="left" valign="top">
+  <div class="list-item">
+  <a href="&dtml-path;/ZCacheable_manage">&dtml-path;</a>
+  </div>
+  </td>
+  <td align="left" valign="top">
+  <div class="list-item">
+  &dtml-anon;
+  </div>
+  </td>
+  <td align="left" valign="top">
+  <div class="list-item">
+  &dtml-auth;
+  </div>
+  </td>
+</tr>
+</dtml-in>
+</table>
+
+<dtml-else>
+<p class="form-text">
+<strong>Nothing is in the cache.</strong>
+</p>
+</dtml-if>
+
+<dtml-var manage_page_footer>
+