[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_generic - folder_filter_form.pt:1.2.28.2 logged_in.pt:1.3.2.2 mail_password_form.pt:1.2.28.2 personalize_form.pt:1.3.2.2 undo_form.pt:1.3.2.2

[Tres Seaver]

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

Modified Files:
      Tag: tseaver-tracker_468-branch
	folder_filter_form.pt logged_in.pt mail_password_form.pt 
	personalize_form.pt undo_form.pt 
Log Message:


  - Repair breakage induced in yesterday's mass edit.


=== CMF/CMFDefault/skins/zpt_generic/folder_filter_form.pt 1.2.28.1 => 1.2.28.2 ===
 </span>
 <span tal:condition="python:request.get('open_filter_form', 0)">
-    <span tal:define="
-        dummy1 python:request.RESPONSE.setCookie('show_filter_form', path='/', expires='Wed, 19 Feb 2020 14:28:00 GMT', value='1');
-        dummy2 python:request.set('show_filter_form', '1')
-        " />
+    <span tal:define="dummy1 python:request.RESPONSE.setCookie(
+                                      'show_filter_form',
+                                      path='/',
+                                      expires='Wed, 19 Feb 2020 14:28:00 GMT',
+                                      value='1');
+                      dummy2 python:request.set('show_filter_form', '1');
+                     " />
 </span>
 <form action="" method="POST"
       tal:define="showfilter request/show_filter_form|nothing;
@@ -19,29 +22,38 @@
 >
 <table class="FormLayout"
     tal:condition="showfilter"
-    tal:define="Type python:(); Subject python:'';filter python:here.decodeFolderFilter(request.get('folderfilter', ''))">
+    tal:define="filter python:here.decodeFolderFilter(
+                                        request.get('folderfilter', '') );
+                Type python:filter.get( 'Type', [] );
+                Subject python:filter.get( 'Subject', () );
+               ">
 <tr>
     <td colspan="2" align="left" valign="top">
-        Contents View Filter
+        Contents View Filter <em tal:content="filter">filter here</em>
     </td>
 </tr>
 <tr>
     <td align="left" valign="top" width="*">Subject:</td>
     <td align="left" valign="top">
-     <input type="text" name="filter_by_Subject:tokens"
-      value="" tal:attributes="value python:modules['string'].join(Subject, ' ')" />
+     <input type="text" name="filter_by_Subject:tokens" value=""
+            tal:attributes="value python:modules['string'].join(Subject, ' ');
+                           " />
     </td>
 </tr>
 <tr>
     <td align="left" valign="top" width="*">Content Type:</td>
     <td align="left" valign="top">
         <select name="filter_by_Type:list" multiple size="3"
-            tal:define="types python:here.portal_types.listContentTypes( container=container )">
-            <option value="&dtml-sequence-item;"
+            tal:define="types python:here.portal_types.listContentTypes()">
+                                        container=here )">
+            <option value="type"
                 tal:repeat="type types"
-                tal:attributes="value type"
-                >
-            <span tal:replace="type" /></option>
+                tal:attributes="value type;
+                                selected python:type in Type;
+                               "
+                tal:content="type"
+                > type </option>
+            <option tal:condition="nothing">Foo</option>
         </select>
     </td>
 </tr>


=== CMF/CMFDefault/skins/zpt_generic/logged_in.pt 1.3.2.1 => 1.3.2.2 ===
 
   <div tal:condition="not: isAnon"
-       tal:define="first_time python:( member.login_time == never
+       tal:define="first_time python:(
+                    member.getProperty( 'login_time', None ) == never
                                        and p_props.validate_email )">
-  >
+  
 
    <div tal:condition="first_time">
     <div tal:define="dum_reg python:member.setProperties(
@@ -100,13 +101,14 @@
     <div tal:define="d_reg python:member.setProperties(
                                             last_login_time=member.login_time); 
                      ereg python:member.setProperties(
-                                            login_time=here.ZopeTime())" />
+                                            login_time=here.ZopeTime());
+                    " />
 
-    <div tal:condition="request/came_from | nothing "
-    >
+    <div tal:condition="request/came_from | nothing ">
       <div tal:define="came_from python:request.get('came_from');
-                       respose: request/RESPONSE;
-                       dredirect python: response.redirect(came_from)" />
+                       response request/RESPONSE;
+                       dredirect python: response.redirect(came_from);
+                      " />
     </div>
 
     <h1 class="DesktopTitle">Login success</h1>


=== CMF/CMFDefault/skins/zpt_generic/mail_password_form.pt 1.2.28.1 => 1.2.28.2 ===
 
  <div class="Desktop"
-      tal:attributes="ptool here/portal_properties">
+      tal:define="ptool here/portal_properties">
 
   <h1> Don't panic!</h1>
 


=== CMF/CMFDefault/skins/zpt_generic/personalize_form.pt 1.3.2.1 => 1.3.2.2 ===
 <div metal:fill-slot="main">
 
- <div tal:define="mtool: here/portal_membership;
+ <div tal:define="mtool here/portal_membership;
                   member mtool/getAuthenticatedMember;
                  ">
 
@@ -54,7 +54,7 @@
 
         <input type="radio" name="listed" 
                tal:attributes="checked python:( hasattr(member,'listed')
-                                      and not(member.getProperty( 'listed' ) )"
+                                  and not(member.getProperty( 'listed' ) ) )"
                value="" id="cb_unlisted" />
        <label for="cb_unlisted">Unlisted</label>
         <dl class="FieldHelp">


=== CMF/CMFDefault/skins/zpt_generic/undo_form.pt 1.3.2.1 => 1.3.2.2 ===
 
   <form action="undo" method="POST"
-        tal:attributes="action string:${here/portal_url}/undo"
+        tal:attributes="action_xxx string:${here/absolute_url}/undo"
   >
 
    <p> This application's transactional feature allows you to easily