[Plone-cvs] CMFPlone/skins/plone_templates folder_contents.pt,1.4.2.9,1.4.2.10

[<ru...@us...>]

Update of /cvsroot/plone/CMFPlone/skins/plone_templates
In directory sc8-pr-cvs1:/tmp/cvs-serv20465

Modified Files:
      Tag: Plone-1_0
	folder_contents.pt 
Log Message:
doh! cant metal:define and tal:define in same block


Index: folder_contents.pt
===================================================================
RCS file: /cvsroot/plone/CMFPlone/skins/plone_templates/folder_contents.pt,v
retrieving revision 1.4.2.9
retrieving revision 1.4.2.10
diff -C2 -d -r1.4.2.9 -r1.4.2.10
*** folder_contents.pt	27 Nov 2002 17:49:09 -0000	1.4.2.9
--- folder_contents.pt	27 Nov 2002 20:15:52 -0000	1.4.2.10
***************
*** 73,93 ****
              <!-- Navigation -->
              <div metal:use-macro="here/batch_macros/macros/navigation" />
!             
              <table id="sortable"
                     class="listing"
                     summary="Content listing"
!                    cellpadding="0" cellspacing="0"
!                    metal:define-macro="folder_listing"
!                    tal:define="locked here/lock_icon.gif;
!                                pencil_icon here/edit.gif;
!                                use_folder_contents here/portal_properties/site_properties/use_folder_contents;
!                                filterOut python:('Favorite',);
!                                filterValues decodedFilter/keys | nothing;
!                                types python:here.sortObjects(here.allowedContentTypes());
!                                no_types python:len(types);
!                                filterTypes python:test( filterValues==nothing, types, here.filterTypes(filter));
!                                isExpired nocall:here/isExpired;
!                                toPortalTime nocall:here/toPortalTime;
!                                getObjSize nocall:here/getObjSize;">
                     
                  <thead>
--- 73,93 ----
              <!-- Navigation -->
              <div metal:use-macro="here/batch_macros/macros/navigation" />
!             <metal:block metal:define-macro="folder_listing"
!                               tal:define="locked here/lock_icon.gif;
!                                           pencil_icon here/edit.gif;
!                                           use_folder_contents here/portal_properties/site_properties/use_folder_contents;
!                                           filterOut python:('Favorite',);
!                                           filterValues decodedFilter/keys | nothing;
!                                           types python:here.sortObjects(here.allowedContentTypes());
!                                           no_types python:len(types);
!                                           filterTypes python:test( filterValues==nothing, types, here.filterTypes(filter));
!                                           isExpired nocall:here/isExpired;
!                                           toPortalTime nocall:here/toPortalTime;
!                                           getObjSize nocall:here/getObjSize;">
!                                                                                                                                                                                                                                                                                                                                                     
              <table id="sortable"
                     class="listing"
                     summary="Content listing"
!                    cellpadding="0" cellspacing="0">
                     
                  <thead>
***************
*** 251,254 ****
--- 251,255 ----
                  </metal:block> 
              </table>
+             </metal:block>
      
              <!-- Navigation -->