[Zope3-checkins] CVS: zopeproducts/NewsSite/skin - configure.zcml:1.2 newssitemacros.py:1.2 template.pt:1.3

[Philipp von Weitershausen]

Update of /cvs-repository/zopeproducts/NewsSite/skin
In directory cvs.zope.org:/tmp/cvs-serv4672/skin

Modified Files:
	configure.zcml newssitemacros.py template.pt 
Log Message:
Made the NewsSite product work again (don't expect too much, though):

- update according to changes in Zope3 head (configuration
  -> registration)

- use new-style implements

- use zapi convenience module

- disable some faulty unit tests

- whitespace normalization (please stop using tabs!)


=== zopeproducts/NewsSite/skin/configure.zcml 1.1 => 1.2 ===
--- zopeproducts/NewsSite/skin/configure.zcml:1.1	Thu Mar 27 11:41:09 2003
+++ zopeproducts/NewsSite/skin/configure.zcml	Wed Jun 25 11:30:34 2003
@@ -3,12 +3,11 @@
    xmlns:browser='http://namespaces.zope.org/browser'
 >
 
- 
 <browser:page
     for="*"
     name="newssite_macros"
     permission="zope.View"
-    class=".newssitemacros.StandardMacros"
+    class=".newssitemacros.StandardMacros" />
     allowed_interface="zope.interface.common.mapping.IItemMapping"
     />
 


=== zopeproducts/NewsSite/skin/newssitemacros.py 1.1 => 1.2 ===
--- zopeproducts/NewsSite/skin/newssitemacros.py:1.1	Thu Mar 27 11:41:09 2003
+++ zopeproducts/NewsSite/skin/newssitemacros.py	Wed Jun 25 11:30:34 2003
@@ -1,7 +1,6 @@
 from zope.app.browser.skins.basic.standardmacros import StandardMacros as BaseMacros
 
 class StandardMacros(BaseMacros):
-    __implements__ = BaseMacros.__implements__
     macro_pages = ('newssite_skin_macros',
                    'newssite_view_macros',
                    'newssite_dialog_macros')


=== zopeproducts/NewsSite/skin/template.pt 1.2 => 1.3 ===
--- zopeproducts/NewsSite/skin/template.pt:1.2	Tue Apr  1 10:55:27 2003
+++ zopeproducts/NewsSite/skin/template.pt	Wed Jun 25 11:30:34 2003
@@ -51,11 +51,9 @@
               'id' -- the principal's ID.
               'title' -- the principal's real name, or title.
         </tal:comment>
-        <metal:block define-macro="logged_user"
-                     tal:define="info view/getUserInfo"
-        >
-          User: <span tal:replace="info/title">TITLE</span>
-                (<span tal:replace="info/id">LOGIN</span>)
+        <metal:block define-macro="logged_user">
+          User: <span tal:replace="request/user/getTitle">TITLE</span>
+                (<span tal:replace="request/user/getId">LOGIN</span>)
         </metal:block>
   		
   		</div>