[CalendarServer-changes] [12669] CalendarServer/trunk/calendarserver/webadmin

[source_changes at macosforge.org]

Revision: 12669
          http://trac.calendarserver.org//changeset/12669
Author:   wsanchez at apple.com
Date:     2014-02-11 22:29:34 -0800 (Tue, 11 Feb 2014)
Log Message:
-----------
Add principals page

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/webadmin/landing.py
    CalendarServer/trunk/calendarserver/webadmin/landing.xhtml
    CalendarServer/trunk/calendarserver/webadmin/logs.py
    CalendarServer/trunk/calendarserver/webadmin/resource.py

Modified: CalendarServer/trunk/calendarserver/webadmin/landing.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/landing.py	2014-02-12 05:55:02 UTC (rev 12668)
+++ CalendarServer/trunk/calendarserver/webadmin/landing.py	2014-02-12 06:29:34 UTC (rev 12669)
@@ -26,7 +26,9 @@
 # from twisted.web.template import renderer
 
 from .resource import PageElement, TemplateResource
+from .resource import WebAdminResource
 from .logs import LogsResource
+from .principals import PrincipalsResource
 
 
 
@@ -54,7 +56,7 @@
     addSlash = True
 
     def __init__(self, path, root, directory, store, principalCollections=()):
-        TemplateResource.__init__(self, WebAdminLandingPageElement())
+        TemplateResource.__init__(self, WebAdminLandingPageElement)
 
         self._path = path
         self._root = root
@@ -63,3 +65,11 @@
         self._principalCollections = principalCollections
 
         self.putChild("logs", LogsResource())
+        self.putChild("principals", PrincipalsResource())
+
+        self.putChild(
+            "old",
+            WebAdminResource(
+                path, root, directory, store, principalCollections
+            )
+        )

Modified: CalendarServer/trunk/calendarserver/webadmin/landing.xhtml
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/landing.xhtml	2014-02-12 05:55:02 UTC (rev 12668)
+++ CalendarServer/trunk/calendarserver/webadmin/landing.xhtml	2014-02-12 06:29:34 UTC (rev 12669)
@@ -12,6 +12,7 @@
 
     <ul>
       <li><a href="logs">Server Logs</a></li>
+      <li><a href="principals">Principal Management</a></li>
     </ul>
 
   </body>

Modified: CalendarServer/trunk/calendarserver/webadmin/logs.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/logs.py	2014-02-12 05:55:02 UTC (rev 12668)
+++ CalendarServer/trunk/calendarserver/webadmin/logs.py	2014-02-12 06:29:34 UTC (rev 12669)
@@ -1,6 +1,6 @@
-# -*- test-case-name: calendarserver.webadmin.test.test_log -*-
+# -*- test-case-name: calendarserver.webadmin.test.test_logs -*-
 ##
-# Copyright (c) 2009-2014 Apple Inc. All rights reserved.
+# Copyright (c) 2014 Apple Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 from __future__ import print_function
 
 """
-Calendar Server Web Admin UI.
+Calendar Server log viewing web UI.
 """
 
 __all__ = [
@@ -69,16 +69,12 @@
 
 
     def __init__(self):
-        TemplateResource.__init__(self, LogsPageElement())
+        TemplateResource.__init__(self, LogsPageElement)
 
         self.putChild("events", LogEventsResource())
 
 
-    def render(self, request):
-        return TemplateResource.render(self, request)
 
-
-
 class LogEventsResource(Resource):
     """
     Log event vending resource.

Modified: CalendarServer/trunk/calendarserver/webadmin/resource.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/resource.py	2014-02-12 05:55:02 UTC (rev 12668)
+++ CalendarServer/trunk/calendarserver/webadmin/resource.py	2014-02-12 06:29:34 UTC (rev 12669)
@@ -783,10 +783,10 @@
     #     return request.args.get(arguments, [])
 
 
-    def __init__(self, element):
+    def __init__(self, elementClass):
         Resource.__init__(self)
 
-        self.element = element
+        self.elementClass = elementClass
 
 
     # def handleQueryArguments(self, request):
@@ -795,13 +795,9 @@
 
     @inlineCallbacks
     def render(self, request):
-        """
-        Create a L{WebAdminPage} to render HTML content for this request, and
-        return a response.
-        """
         # yield self.handleQueryArguments(request)
 
-        htmlContent = yield flattenString(request, self.element)
+        htmlContent = yield flattenString(request, self.elementClass())
 
         response = Response()
         response.stream = MemoryStream(htmlContent)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/c9243dfb/attachment.html>