[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_generic - logged_in.pt:1.8 login_form.pt:1.6

Yvo Schubbe schubbe@web.de
Fri, 13 Jun 2003 13:12:15 -0400


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

Modified Files:
	logged_in.pt login_form.pt 
Log Message:
- made 'never' a string
- cleanup

=== CMF/CMFDefault/skins/zpt_generic/logged_in.pt 1.7 => 1.8 ===
--- CMF/CMFDefault/skins/zpt_generic/logged_in.pt:1.7	Mon Jun  2 12:18:50 2003
+++ CMF/CMFDefault/skins/zpt_generic/logged_in.pt	Fri Jun 13 13:12:15 2003
@@ -1,8 +1,6 @@
-<div tal:condition="exists: here/portal_skins | nothing">
-  <div tal:condition="here/portal_skins/updateSkinCookie | nothing"
-        tal:define="dummy here/setupCurrentSkin">
-  </div>
-</div>
+<tal:block tal:condition="here/portal_skins/updateSkinCookie | nothing"
+           tal:define="dummy here/setupCurrentSkin" />
+
 <html xmlns:tal="http://xml.zope.org/namespaces/tal"
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       metal:use-macro="here/main_template/macros/master">
@@ -16,7 +14,7 @@
                   isAnon mtool/isAnonymousUser|nothing;
                   member mtool/getAuthenticatedMember;
                   now here/ZopeTime;
-                  never python: here.ZopeTime( '2000/01/01' );
+                  never string:2000/01/01;
                  "
  >
 
@@ -53,7 +51,7 @@
 
     <p class="Desktop" i18n:translate="">
        This is the first time that you've logged in to
-       <span replace="p_props/title" i18n:name="portal_title">Here</span>.
+       <span tal:replace="p_props/title" i18n:name="portal_title">Here</span>.
        Before you start exploring you need to change your original password.
        This will ensure that the password we sent you via email cannot be
        used in a malicious manner.</p>


=== CMF/CMFDefault/skins/zpt_generic/login_form.pt 1.5 => 1.6 ===
--- CMF/CMFDefault/skins/zpt_generic/login_form.pt:1.5	Thu Mar  6 05:31:26 2003
+++ CMF/CMFDefault/skins/zpt_generic/login_form.pt	Fri Jun 13 13:12:15 2003
@@ -23,7 +23,7 @@
   <strong i18n:translate="">Name</strong>
   </td>
   <td align="left" valign="top">
-  <input type="TEXT" name="__ac_name" size="20" value=""
+  <input type="text" name="__ac_name" size="20" value=""
          tal:attributes="value python: request.get('__ac_name') or ''" />
   </td>
 </tr>
@@ -32,7 +32,7 @@
   <strong i18n:translate="">Password</strong>
   </td>
   <td align="left" valign="top">
-  <input type="PASSWORD" name="__ac_password" size="20" />
+  <input type="password" name="__ac_password" size="20" />
   </td>
 </tr>