[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_generic - folder_factories.pt:1.2.26.1 index_html.pt:1.2.26.1 zpt_stylesheet.css:1.3.26.1

[Shane Hathaway]

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

Modified Files:
      Tag: cmf-pre-1_3-branch
	folder_factories.pt index_html.pt zpt_stylesheet.css 
Log Message:
Merged changes from head, with a small change: the types tool does not need
to be extended in such a complex way.  I took out the type_type registry and
the __bobo_traverse__ hook and replaced it with the original code with only
minor mods that give you the same extensibility without all the hacking.
(If anyone actually wants to use the extensibility, which I suspect no one
is actually interested in doing, I will happily provide instructions and
will create a corrected unit test.)


=== CMF/CMFDefault/skins/zpt_generic/folder_factories.pt 1.2 => 1.2.26.1 ===
 <table class="FormLayout">
 <tr>
-<td>
-<table width="100%" class="FormLayout" tal:repeat="item here/allowedContentTypes">
+<td tal:define="allowedContentTypes python:modules['ZTUtils'].LazyFilter(here.allowedContentTypes(),skip='')">
+<table width="100%" class="FormLayout" tal:repeat="item allowedContentTypes">
 <tr valign="top">
   <td align="left" width="2%" NOWRAP><input type="radio" name="type_name" value="" id="" tal:attributes="value item/getId; id string:cb_${repeat/item/number}"/>
   </td>
@@ -27,7 +27,8 @@
   <td align="left" class="ListDefinition" tal:content="item/Description"></td>
  </tr>
  </table>
- </td></tr></table>
+ </td>
+</tr></table>
 
 <table class="FormLayout">
  <tr valign="top">


=== CMF/CMFDefault/skins/zpt_generic/index_html.pt 1.2 => 1.2.26.1 ===
 
   <div tal:define="items python: here.contentValues(
-                                            filter={'Type':( 'Folder', 'CMF Collector') } );
+                            filter={ 'Type': 'Folder' } );
                   ">
   <div tal:condition="items">
-  <h4> Collectors and Folders </h4>
+  <h4> Folders </h4>
 
   <ul>
    <li tal:repeat="item items"> 


=== CMF/CMFDefault/skins/zpt_generic/zpt_stylesheet.css 1.3 => 1.3.26.1 ===
     color: #FFFFFF;
     font-weight: bold;
-    verticle-align: middle;
+    vertical-align: middle;
 }
 
 table.FormLayout td.ListDefinition {