[Zope3-checkins] SVN: Zope3/branches/ZopeX3-3.0/src/zope/app/rotterdam/template.pt Synchronize Rotterdam's main template with the trunk, especially

[Philipp von Weitershausen]

Log message for revision 26888:
  Synchronize Rotterdam's main template with the trunk, especially
  r26887.
  


Changed:
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/rotterdam/template.pt


-=-
Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/rotterdam/template.pt
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/rotterdam/template.pt	2004-08-03 22:58:27 UTC (rev 26887)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/rotterdam/template.pt	2004-08-03 22:59:11 UTC (rev 26888)
@@ -27,7 +27,7 @@
     <metal:block define-slot="style_slot" />
     <metal:block define-slot="ecmascript_slot" />
 
-    <!-- Popup sript for the OnlineHelp -->
+    <!-- Popup script for the OnlineHelp -->
     <script type="text/javascript" src="onlinehelp.js"
             tal:attributes="src string:${context/++resource++onlinehelp.js}" >
     </script>
@@ -50,16 +50,16 @@
           </tal:block>
         </metal:block>
         <metal:block define-slot="login_logout">
+          <metal:macro define-macro="login_logout">
           <a href=""
             tal:attributes="href string:@@logout.html?nextURL=${request/URL/url:quote}"
             tal:condition="python: hasattr(request.principal, 'getLogin')"
-            i18n:translate="">
-            [Logout]</a>
+            i18n:translate="">[Logout]</a>
           <a href=""
             tal:attributes="href string:@@login.html?nextURL=${request/URL/url:quote}"
             tal:condition="python: not hasattr(request.principal, 'getLogin')"
-            i18n:translate="">
-            [Login]</a>
+            i18n:translate="">[Login]</a>
+          </metal:macro>
         </metal:block>
       </div>
       <img tal:attributes="src context/++resource++zope3logo.gif" />