[Zope-Checkins] CVS: Zope/lib/python/Products/Sessions/dtml - addIdManager.dtml:1.5 manageIdManager.dtml:1.7

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/Products/Sessions/dtml
In directory cvs.zope.org:/tmp/cvs-serv24326/dtml

Modified Files:
	addIdManager.dtml manageIdManager.dtml 
Log Message:
Added the capability for browser ids to be encoded in URLs.

When a set of knobs is set on the browser_id_manager "settings" screen,
("look for browser id name in..." and 'automatically encode browser ids..."),
a traversal hook is installed in the browser id manager's container which
causes a) the request to be searched for a browser id name and a browser
id as the first two elements of the URL path and b) for Zope-generated URLs
to contain these path elements.

Various documentation and interface updates.  No interface methods
were harmed in the filming of this checkin, but a few were added or extended
with defaults.



=== Zope/lib/python/Products/Sessions/dtml/addIdManager.dtml 1.4 => 1.5 ===
--- Zope/lib/python/Products/Sessions/dtml/addIdManager.dtml:1.4	Sat Nov 17 11:07:40 2001
+++ Zope/lib/python/Products/Sessions/dtml/addIdManager.dtml	Mon Aug 19 15:50:17 2002
@@ -6,7 +6,6 @@
 	   )">
 
 <FORM ACTION="constructBrowserIdManager" METHOD="POST">
-<input type=hidden name="id" value="browser_id_manager">
 <TABLE CELLSPACING="2">
 <tr>
 <td>&nbsp;</td>
@@ -60,30 +59,25 @@
 </tr>
 <tr>
 <td>
-<div align=left class="form-label">Look for Browser Id Name in</th>
+<div align=left class="form-label">Look for Browser Id in</th>
 </td>
 <td>
 <table border=0>
 <tr>
    <td align=left>
-    <input type="radio" name="location" value="cookiesonly"> Cookies only
+    <input type="checkbox" name="location:list" value="cookies" CHECKED> Cookies
    </td>
 </tr>
 <tr>
    <td align=left>
-    <input type="radio" name="location" value="cookiesthenform" CHECKED> Cookies then form
+    <input type="checkbox" name="location:list" value="form" CHECKED> Forms and Query Strings
    </td>
 </tr>
 <tr>
    <td align=left>
-    <input type="radio" name="location" value="formonly"> Form only
+    <input type="checkbox" name="location:list" value="url" CHECKED> URLs
    </td> 
 </tr>
-<tr>
-   <td align=left>
-    <input type="radio" name="location" value="formthencookies"> Form then cookies
-   </td>
-</tr>
 </table>
 </td>
 </tr>
@@ -93,6 +87,16 @@
 <td>&nbsp;</td>
 </tr>
 
+<TR>
+  <TD ALIGN="LEFT" VALIGN="TOP">
+    <div class="form-label">
+      Automatically Encode Zope-Generated<br>URLs With A Browser Id
+    </div>
+  </TD>
+  <TD ALIGN="LEFT" VALIGN="TOP">
+    <INPUT TYPE="checkbox" NAME="auto_url_encoding" SIZE="20">
+  </TD>
+</TR>
 <TR>
   <TD ALIGN="LEFT" VALIGN="TOP">
     <div class="form-label">


=== Zope/lib/python/Products/Sessions/dtml/manageIdManager.dtml 1.6 => 1.7 ===
--- Zope/lib/python/Products/Sessions/dtml/manageIdManager.dtml:1.6	Mon Nov 19 13:44:27 2001
+++ Zope/lib/python/Products/Sessions/dtml/manageIdManager.dtml	Mon Aug 19 15:50:17 2002
@@ -37,42 +37,47 @@
   </TD>
 </TR>
 
-<dtml-let loc=getBrowserIdLocation>
+<dtml-let namespaces=getBrowserIdNamespaces>
 <tr valign="top">
 <td>
-<div align=left class="form-label">Look for Browser Id Name in</th>
+<div align=left class="form-label">Look for Browser Id in</th>
 </td>
 <td>
 <table border=0>
 <tr>
    <td align=left>
-    <input type="radio" name="location" value="cookiesonly"
-     <dtml-if "loc=='cookiesonly'">CHECKED</dtml-if>> Cookies only
+    <input type="checkbox" name="location:list" value="cookies"
+     <dtml-if "'cookies' in namespaces">CHECKED</dtml-if>> Cookies
    </td>
 </tr>
 <tr>
    <td align=left>
-    <input type="radio" name="location" value="cookiesthenform"
-    <dtml-if "loc=='cookiesthenform'">CHECKED</dtml-if>> Cookies then form
+    <input type="checkbox" name="location:list" value="form"
+    <dtml-if "'form' in namespaces">CHECKED</dtml-if>> Forms and Query Strings
    </td>
 </tr>
 <tr>
    <td align=left>
-    <input type="radio" name="location" value="formonly"
-     <dtml-if "loc=='formonly'">CHECKED</dtml-if>> Form only
+    <input type="checkbox" name="location:list" value="url"
+     <dtml-if "'url' in namespaces">CHECKED</dtml-if>> URLs
    </td> 
 </tr>
-<tr>
-   <td align=left>
-    <input type="radio" name="location" value="formthencookies"
-     <dtml-if "loc=='formthencookies'">CHECKED</dtml-if>> Form then cookies
-   </td>
-</tr>
 </table>
 </td>
 </tr>
 </dtml-let>
 
+<TR>
+  <TD ALIGN="LEFT" VALIGN="TOP">
+    <div class="form-label">
+      Automatically Encode Zope-Generated<br>URLs With A Browser Id
+    </div>
+  </TD>
+  <TD ALIGN="LEFT" VALIGN="TOP">
+    <INPUT TYPE="checkbox" NAME="auto_url_encoding"
+     <dtml-if getAutoUrlEncoding>CHECKED</dtml-if>>
+  </TD>
+</TR>
 <TR>
   <TD ALIGN="LEFT" VALIGN="TOP">
     <div class="form-label">