[Zope3-checkins] SVN: Zope3/branches/philikon-simplify-skinning/src/zope/app/apidoc/ Make apidoc not use ILayer because it's deprecated. In fact, apidoc

[Philipp von Weitershausen]

Log message for revision 41683:
  Make apidoc not use ILayer because it's deprecated.  In fact, apidoc
  doesn't differentiate between a layer and another request interface
  anymore now.  It just shows the required interfaces.
  

Changed:
  U   Zope3/branches/philikon-simplify-skinning/src/zope/app/apidoc/ifacemodule/presentation_macros.pt
  U   Zope3/branches/philikon-simplify-skinning/src/zope/app/apidoc/presentation.py
  U   Zope3/branches/philikon-simplify-skinning/src/zope/app/apidoc/presentation.txt

-=-
Modified: Zope3/branches/philikon-simplify-skinning/src/zope/app/apidoc/ifacemodule/presentation_macros.pt
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zope/app/apidoc/ifacemodule/presentation_macros.pt	2006-02-19 10:26:38 UTC (rev 41682)
+++ Zope3/branches/philikon-simplify-skinning/src/zope/app/apidoc/ifacemodule/presentation_macros.pt	2006-02-19 10:29:10 UTC (rev 41683)
@@ -21,10 +21,10 @@
       </a>
     </div>
 
-    <div tal:define="ifaces python:View['required'][:-1]">
+    <div tal:define="ifaces python:View['required']">
       <i i18n:translate="">requires:</i>
       <tal:block repeat="iface ifaces">
-        <a href=""
+        <tal:block condition="not:iface">*</tal:block><a href=""
             tal:condition="iface"
             tal:attributes="
        href string:$rootURL/Interface/${iface/module}.${iface/name}/index.html">
@@ -46,16 +46,6 @@
       </a>
     </div>
 
-    <div tal:define="iface View/layer"
-         tal:condition="iface">
-      <i i18n:translate="">layer:</i>
-      <a href=""
-         tal:attributes="
-      href string:$rootURL/Interface/${iface/module}.${iface/name}/index.html">
-        <metal:block use-macro="context/@@interface_macros/ifacename" />
-      </a>
-    </div>
-
     <div condition="View/factory/path">
       <i i18n:translate="">factory path:</i>
       <a href=""

Modified: Zope3/branches/philikon-simplify-skinning/src/zope/app/apidoc/presentation.py
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zope/app/apidoc/presentation.py	2006-02-19 10:26:38 UTC (rev 41682)
+++ Zope3/branches/philikon-simplify-skinning/src/zope/app/apidoc/presentation.py	2006-02-19 10:29:10 UTC (rev 41683)
@@ -26,7 +26,7 @@
 from zope.app.apidoc.component import getInterfaceInfoDictionary
 from zope.app.publisher.browser.icon import IconViewFactory
 
-from zope.publisher.interfaces import IRequest, ILayer
+from zope.publisher.interfaces import IRequest
 from zope.publisher.interfaces.browser import IBrowserRequest
 from zope.publisher.interfaces.xmlrpc import IXMLRPCRequest
 from zope.publisher.interfaces.http import IHTTPRequest
@@ -164,19 +164,12 @@
         doc = None
         zcml = getParserInfoInfoDictionary(reg.doc)
 
-    # get layer
-    layer = None
-    if ILayer.providedBy(reg.required[-1]):
-        layer = getInterfaceInfoDictionary(reg.required[-1])
-
-
     info = {'name' : reg.name or '<i>no name</i>',
             'type' : getPythonPath(getPresentationType(reg.required[-1])),
             'factory' : getViewFactoryData(reg.value),
             'required': [getInterfaceInfoDictionary(iface)
                          for iface in reg.required],
             'provided' : getInterfaceInfoDictionary(reg.provided),
-            'layer': layer,
             'doc': doc,
             'zcml': zcml
             }

Modified: Zope3/branches/philikon-simplify-skinning/src/zope/app/apidoc/presentation.txt
===================================================================
--- Zope3/branches/philikon-simplify-skinning/src/zope/app/apidoc/presentation.txt	2006-02-19 10:26:38 UTC (rev 41682)
+++ Zope3/branches/philikon-simplify-skinning/src/zope/app/apidoc/presentation.txt	2006-02-19 10:29:10 UTC (rev 41683)
@@ -402,7 +402,6 @@
                'resource': None,
                'template': None,
                'url': '__builtin__/Factory'},
-   'layer': None,
    'name': 'view.html',
    'provided': {'module': 'zope.interface',
                 'name': 'Interface'},