[Zope3-checkins] CVS: Zope3/src/zope/app/browser - onlinehelp.py:1.9 onlinehelp.zcml:1.5 onlinehelptopic.pt:1.2

[Stephan Richter]

Update of /cvs-repository/Zope3/src/zope/app/browser
In directory cvs.zope.org:/tmp/cvs-serv23758/src/zope/app/browser

Modified Files:
	onlinehelp.py onlinehelp.zcml onlinehelptopic.pt 
Log Message:
Fixed OnlineHelp after it was broken from a sprint. Context-aware help 
works again. I also took the oppurtunity to clean up the ZCML directives.


=== Zope3/src/zope/app/browser/onlinehelp.py 1.8 => 1.9 ===
--- Zope3/src/zope/app/browser/onlinehelp.py:1.8	Fri Jun 13 13:41:11 2003
+++ Zope3/src/zope/app/browser/onlinehelp.py	Tue Jul  1 21:27:58 2003
@@ -42,7 +42,6 @@
         return self._makeSubTree(onlinehelp)
 
 
-
 class FindRelevantHelpTopics(BrowserView):
     """This object is used as a view on a view, so that we can get all the
     required information."""


=== Zope3/src/zope/app/browser/onlinehelp.zcml 1.4 => 1.5 ===
--- Zope3/src/zope/app/browser/onlinehelp.zcml:1.4	Mon Jun 23 12:54:58 2003
+++ Zope3/src/zope/app/browser/onlinehelp.zcml	Tue Jul  1 21:27:58 2003
@@ -3,38 +3,24 @@
 <!-- OnlineHelp -->
 
   <page
-      for="*"
       name="find_help_topics"
+      for="*"
       class=".onlinehelp.FindRelevantHelpTopics"
       permission="zope.Public"
       allowed_attributes="__call__" 
       />
 
-  <page
-       for="*"
-       name="getTopicTree"
-       class=".onlinehelp.OnlineHelpTopicView"
-       permission="zope.Public"
-       allowed_attributes="getTopicTree" 
-       />
-
-  <page
-      name="+"
-      menu="zmi_actions" title="Add"
+  <pages
       for="zope.app.interfaces.onlinehelp.IOnlineHelpTopic"
-      permission="zope.View"
-      template="onlinehelptopic.pt"
-      class="zope.app.browser.onlinehelp.OnlineHelpTopicView"
-      />
+      permission="zope.Public"
+      class=".onlinehelp.OnlineHelpTopicView">
+
+      <page name="index.html" template="onlinehelptopic.pt"/>
+      <page name="getTopicTree" attribute="getTopicTree"/>
+
+  </pages>
+
 
-  <page
-      name="index.html"
-      for="zope.app.interfaces.onlinehelp.IOnlineHelpTopic"
-      permission="zope.View"
-      template="onlinehelptopic.pt"
-      class="zope.app.browser.onlinehelp.OnlineHelpTopicView"
-      />
-      
   <menuItem
       for="*"
       filter="python:request.getURL().find('++help++')==-1"


=== Zope3/src/zope/app/browser/onlinehelptopic.pt 1.1 => 1.2 ===
--- Zope3/src/zope/app/browser/onlinehelptopic.pt:1.1	Tue Jan  7 07:27:40 2003
+++ Zope3/src/zope/app/browser/onlinehelptopic.pt	Tue Jul  1 21:27:58 2003
@@ -11,9 +11,6 @@
 
 </div>
 
-<div metal:fill-slot="commonTasks" 
-     tal:content="structure view/getTopicTree" />
-
 </body>
 </html>