[CMF-checkins] CVS: CMF/CMFCollector/skins/collector - collector_macros.pt:1.28.20.1

[Shane Hathaway]

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

Modified Files:
      Tag: cmf-pre-1_3-branch
	collector_macros.pt 
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/CMFCollector/skins/collector/collector_macros.pt 1.28 => 1.28.20.1 ===
          <tr>
            <td align="right">Status:</td>
-           <td tal:define="base python: split(here.status(), '_')[0];
-                           paren here/confidential">
+           <td tal:define="statpair python: split(here.status(), '_');
+                           base python: statpair[0];
+                           paren python: len(statpair) > 1">
                 <span tal:replace="python: '%s%s%s'
                                            % ((paren and '(') or '',
                                               base,