[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/ApplicationControl/ServerControl/Views/Browser - ServerControlView.py:1.1.2.4.4.2 browser.zcml:1.1.2.3.2.1 server-control.pt:1.1.2.1.10.1

[Jim Fulton]

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

Modified Files:
      Tag: Zope3InWonderland-branch
	ServerControlView.py browser.zcml server-control.pt 
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/ServerControl/Views/Browser/ServerControlView.py 1.1.2.4.4.1 => 1.1.2.4.4.2 ===
 
     index = ViewPageTemplateFile('server-control.pt')
+


=== Zope3/lib/python/Zope/App/OFS/ApplicationControl/ServerControl/Views/Browser/browser.zcml 1.1.2.3 => 1.1.2.3.2.1 ===
 
   <!-- ServerControl View Directives -->
-  <browser:view name="servercontrol"
+  <browser:view
     for="Zope.App.OFS.ApplicationControl.IApplicationControl."
-    factory=".ServerControlView." />
-
-  <application-control:registerView name="servercontrol"
-    title="Server control" />
-
-  <security:protectClass 
-    class=".ServerControlView."
     permission_id="Zope.ManageApplication"
-    names="index, action" />
+    factory=".ServerControlView.">
+    
+    <browser:page name="ServerControlForm.html" attribute="index" />
+    <browser:page name="ServerControl.html"     attribute="action" />
+  </browser:view>
+    
 
+  <application-control:registerView name="ServerControlForm.html"
+    title="Server control" />
     
 </zopeConfigure>


=== Zope3/lib/python/Zope/App/OFS/ApplicationControl/ServerControl/Views/Browser/server-control.pt 1.1.2.1 => 1.1.2.1.10.1 ===
 <div metal:fill-slot="body">
 
-  <!-- XXX /ApplicationController;etc/servercontrol;view/restart is a workaround for the unavailable
-       absolute_url function. -->
-
- <form name="servercontrol" tal:attributes="action string:/ApplicationController;;etc/servercontrol;;view/action" method="post">
+ <form name="servercontrol" action="ServerControl.html" method="post">
   <input type="submit" name="restart" value="Restart server" /> <br />
   <input type="submit" name="shutdown" value="Shutdown server" /> <br />
  </form>