[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/ApplicationControl/Views/Browser - RuntimeInfoView.py:1.1.2.2.4.2 browser.zcml:1.1.2.5.2.1 index.pt:1.1.2.1.10.1 ApplicationControlView.py:NONE

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/ApplicationControl/Views/Browser
In directory cvs.zope.org:/tmp/cvs-serv29793/lib/python/Zope/App/OFS/ApplicationControl/Views/Browser

Modified Files:
      Tag: Zope3InWonderland-branch
	RuntimeInfoView.py browser.zcml index.pt 
Removed Files:
      Tag: Zope3InWonderland-branch
	ApplicationControlView.py 
Log Message:
- Added template attribute to allow views to be created from a
  template source file.

- Added beginnings of a Zope debugger. This required seperating site
  and server configuration.

- Added the ability to specify a config file package in the
  zopeConfigure directive. Made "config.zcml" a default for the file
  attribute in the include directive.

- Fixed mapply to unwrap proxied objects. This was necessary once
  views became wrapped in proxies. We need to investigate why they
  weren't being wrapped before. 

- I updated enough system page templates and zcml directives so that:

  - Zope now starts. :)

  - The root folder contents listing can be viewed.

  Many more templates and zcml files need to be updated to reflect the
  way views are now handled.



=== Zope3/lib/python/Zope/App/OFS/ApplicationControl/Views/Browser/RuntimeInfoView.py 1.1.2.2.4.1 => 1.1.2.2.4.2 ===
 
         seconds = uptime
-        formatted['Uptime'] = "%s%02d:%02d:%02d" % (((days or "") and "%d days, " % days), hours, minutes, seconds)
+        formatted['Uptime'] = "%s%02d:%02d:%02d" % (
+            ((days or "") and "%d days, " % days), hours, minutes, seconds)
 
         return formatted
         


=== Zope3/lib/python/Zope/App/OFS/ApplicationControl/Views/Browser/browser.zcml 1.1.2.5 => 1.1.2.5.2.1 ===
 
   <!-- ApplicationControl View Directives -->
-
-  <browser:defaultView name="index"
+  <browser:defaultView
+    name="index.html"
     for="Zope.App.OFS.ApplicationControl.IApplicationControl."
-    factory=".ApplicationControlView." />
-
-  <security:protectClass 
-    class=".ApplicationControlView."
     permission_id="Zope.ManageApplication"
-    names="index" />
-
+    template="index.pt"
+    />
 
   <!-- RuntimeInfo View Directives -->
-  <browser:view name="runtimeinfo"
+  <browser:view 
     for="Zope.App.OFS.ApplicationControl.IApplicationControl."
-    factory=".RuntimeInfoView." />
+    factory=".RuntimeInfoView." 
+    permission_id="Zope.ManageApplication" >
 
-  <!-- Hint: also register the 'runtimeinfo' view as ApplicationControl plugin -->
-  <application-control:registerView name="runtimeinfo"
-    title="Runtime Information" />
+    <browser:page name="RuntimeInfo.html" attribute="runtimeInfo" />
+  </browser:view> 
+    
 
-  <security:protectClass 
-    class=".RuntimeInfoView."
-    permission_id="Zope.ManageApplication"
-    names="index, runtimeInfo" />
+  <!-- Hint: 
+       also register the 'runtimeinfo' view as ApplicationControl plugin -->
+  <application-control:registerView
+      name="RuntimeInfo.html"
+      title="Runtime Information" />
 
-    
 </zopeConfigure>


=== Zope3/lib/python/Zope/App/OFS/ApplicationControl/Views/Browser/index.pt 1.1.2.1 => 1.1.2.1.10.1 ===
   <!-- XXX /ApplicationController;etc/${info/name} is a workaround for the unavailable
        absolute_url function. -->
-  <li tal:repeat="info context/getListOfViews"><a tal:attributes="href string:/ApplicationController;;etc/${info/name};;view" tal:content="info/title">Foo Title</a></li>
+  <li tal:repeat="info context/getListOfViews"><a 
+     tal:attributes="href
+                     string:/etc::ApplicationController/view::${info/name}"
+   tal:content="info/title"
+   >Foo Title</a></li>
 </ul>
 
 </div>

=== Removed File Zope3/lib/python/Zope/App/OFS/ApplicationControl/Views/Browser/ApplicationControlView.py ===