[CMF-checkins] CVS: Products/CMFDefault/skins/zpt_generic - main_template.pt:1.15

[Grégoire Weber]

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

Modified Files:
	main_template.pt 
Log Message:
- errors in showing the permalink are now ignored


=== Products/CMFDefault/skins/zpt_generic/main_template.pt 1.14 => 1.15 ===
--- Products/CMFDefault/skins/zpt_generic/main_template.pt:1.14	Fri Aug  6 19:01:27 2004
+++ Products/CMFDefault/skins/zpt_generic/main_template.pt	Sun Aug  8 20:24:48 2004
@@ -301,11 +301,11 @@
  <!-- end main slot -->
  </div>
 
- <p tal:define="isFolderish here/isPrincipiaFolderish | nothing"
-    tal:condition="python: uidtool and not isFolderish">Permalink: 
+ <div tal:condition="not:here/isPrincipiaFolderish | nothing">
+ <p tal:define="uid python:uidtool.register(here);"
+    tal:on-error="nothing">Permalink: 
   <a href=""
-     tal:define="uid python:uidtool.register(here);
-                 url string:${portal_url}/permalink/${uid};"
+     tal:define="url string:${portal_url}/permalink/${uid};"
      tal:content="url"
      tal:attributes="href url">
   the unique id</a>