[Zope-Checkins] CVS: Zope2 - addUser.dtml:1.3.4.2 editUser.dtml:1.4.4.2

chrism@serenade.digicool.com chrism@serenade.digicool.com
Thu, 5 Jul 2001 12:01:14 -0400


Update of /cvs-repository/Zope2/lib/python/AccessControl/dtml
In directory serenade:/home/chrism/sandboxes/Zope24Branch/lib/python/AccessControl/dtml

Modified Files:
      Tag: Zope-2_4-branch
	addUser.dtml editUser.dtml 
Log Message:
Reverting "dont show domains box" patch on branch.



--- Updated File addUser.dtml in package Zope2 --
--- addUser.dtml	2001/07/03 20:12:48	1.3.4.1
+++ addUser.dtml	2001/07/05 16:01:13	1.3.4.2
@@ -9,8 +9,7 @@
 <p class="form-help">
 To add a new user, enter the name <dtml-unless remote_user_mode__>
 ,password, confirmation</dtml-unless> and roles for the new user and 
-click &quot;Add&quot;. <dtml-if domainAuthModeEnabled>
-<em>Domains</em> is an optional list of domains</dtml-if>
+click &quot;Add&quot;. <em>Domains</em> is an optional list of domains 
 from which the user is allowed to login. 
 </p>
 
@@ -55,8 +54,6 @@
 
 <tr>
 <td align="left" valign="top">
-
-<dtml-if domainAuthModeEnabled>
 <div class="form-optional">
 Domains
 </div>
@@ -65,9 +62,6 @@
 <input type="text" name="domains:tokens" size="30" value="" />
 </td>
 </tr>
-<dtml-else>
-<input type="hidden" name="domains:tokens" value=""/>
-</dtml-if>
 
 <tr>
   <td align="left" valign="top">

--- Updated File editUser.dtml in package Zope2 --
--- editUser.dtml	2001/07/03 20:13:16	1.4.4.1
+++ editUser.dtml	2001/07/05 16:01:13	1.4.4.2
@@ -50,8 +50,6 @@
 </dtml-if>
 <TR>
 <TD VALIGN="TOP">
-
-<dtml-if domainAuthModeEnabled>
 <div class="form-optional">
 Domains
 </div>
@@ -61,10 +59,7 @@
   VALUE="<dtml-if expr="user.domains"><dtml-in expr="user.domains"><dtml-var sequence-item html_quote> </dtml-in></dtml-if>" />
 </TD>
 </TR>
-<dtml-else>
-<input type="hidden" name="domains:tokens"
-  value="<dtml-if expr="user.domains"><dtml-in expr="user.domains"><dtml-var sequence-item html_quote> </dtml-in></dtml-if>" />
-</dtml-if>
+
 <TR>
 <TD VALIGN="TOP">
 <div class="form-label">