[CMF-checkins] CVS: CMF/CMFDecor/skins/zpt_generic - logged_in.pt:1.5

Andrew Sawyers andrew@zope.com
Tue, 13 Nov 2001 17:45:50 -0500


Update of /cvs-repository/CMF/CMFDecor/skins/zpt_generic
In directory cvs.zope.org:/tmp/cvs-serv1439

Modified Files:
	logged_in.pt 
Log Message:

*fixed a define getting evaluated when it shouldn't have been due
to a condition check on the same element.


=== CMF/CMFDecor/skins/zpt_generic/logged_in.pt 1.4 => 1.5 ===
    <div tal:condition="python: not(here.portal_membership.isAnonymousUser())"
         tal:define="member python: here.portal_membership.getAuthenticatedMember()">
-		  <div tal:condition="python: member.login_time == here.ZopeTime('2000/01/01') and p_props.validate_email"
-		       tal:define="dum_reg python: here.portal_registration.setProperties(last_login_time=here.ZopeTime(),login_time=here.ZopeTime())">
+		  <div tal:condition="python: member.login_time == here.ZopeTime('2000/01/01') and p_props.validate_email">
+		      <div tal:define="dum_reg python: here.portal_registration.setProperties(last_login_time=here.ZopeTime(),login_time=here.ZopeTime())" />
 			   <h1 class="DesktopTitle">Welcome!</h1>
 			   <p class="Desktop">This is the first time that you've logged in to <span replace="p_props/title">Here</span>. 
 			   Before you start exploring you need to change your original password.