<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12618] CalendarServer/trunk/calendarserver</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12618">12618</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-02-07 18:41:32 -0800 (Fri, 07 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add admin home page</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertaputilpy">CalendarServer/trunk/calendarserver/tap/util.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverwebadminresourcepy">CalendarServer/trunk/calendarserver/webadmin/resource.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverwebadminlandingpy">CalendarServer/trunk/calendarserver/webadmin/landing.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverwebadminlandingxhtml">CalendarServer/trunk/calendarserver/webadmin/landing.xhtml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertaputilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/util.py (12617 => 12618)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/util.py 2014-02-08 01:53:16 UTC (rev 12617)
+++ CalendarServer/trunk/calendarserver/tap/util.py 2014-02-08 02:41:32 UTC (rev 12618)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> from calendarserver.accesslog import DirectoryLogWrapperResource
</span><span class="cx"> from calendarserver.provision.root import RootResource
</span><span class="cx"> from calendarserver.tools.util import checkDirectory
</span><del>-from calendarserver.webadmin.resource import WebAdminResource
</del><ins>+from calendarserver.webadmin.landing import WebAdminLandingResource
</ins><span class="cx"> from calendarserver.webcal.resource import WebCalendarResource
</span><span class="cx">
</span><span class="cx"> from txdav.common.datastore.podding.resource import ConduitResource
</span><span class="lines">@@ -403,7 +403,7 @@
</span><span class="cx"> timezoneServiceResourceClass = TimezoneServiceResource
</span><span class="cx"> timezoneStdServiceResourceClass = TimezoneStdServiceResource
</span><span class="cx"> webCalendarResourceClass = WebCalendarResource
</span><del>- webAdminResourceClass = WebAdminResource
</del><ins>+ webAdminResourceClass = WebAdminLandingResource
</ins><span class="cx"> addressBookResourceClass = DirectoryAddressBookHomeProvisioningResource
</span><span class="cx"> directoryBackedAddressBookResourceClass = DirectoryBackedAddressBookResource
</span><span class="cx"> apnSubscriptionResourceClass = APNSubscriptionResource
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminlandingpy"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/calendarserver/webadmin/landing.py (0 => 12618)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/landing.py (rev 0)
+++ CalendarServer/trunk/calendarserver/webadmin/landing.py 2014-02-08 02:41:32 UTC (rev 12618)
</span><span class="lines">@@ -0,0 +1,85 @@
</span><ins>+# -*- test-case-name: calendarserver.webadmin.test.test_landing -*-
+##
+# Copyright (c) 2009-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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+"""
+Calendar Server Web Admin UI.
+"""
+
+__all__ = [
+ "WebAdminLandingResource",
+]
+
+from twisted.python.modules import getModule
+from twisted.web.template import Element, renderer, XMLFile, tags
+
+from .resource import TemplateResource
+
+
+
+class WebAdminLandingPageElement(Element):
+ """
+ Web administration langing page element.
+ """
+
+ loader = XMLFile(
+ getModule(__name__).filePath.sibling("landing.xhtml")
+ )
+
+ pageSlots = {
+ u"title": u"Calendar & Contacts Server Administration",
+ }
+
+
+ def __init__(self):
+ Element.__init__(self)
+
+
+ @renderer
+ def main(self, request, tag):
+ """
+ Main renderer, which fills page-global slots like 'title'.
+ """
+ tag.fillSlots(**self.pageSlots)
+ return tag
+
+
+ @renderer
+ def stylesheet(self, request, tag):
+ return tags.link(
+ rel="stylesheet",
+ media="screen",
+ href="style.css",
+ type="text/css",
+ )
+
+
+
+class WebAdminLandingResource(TemplateResource):
+ """
+ Web administration landing page resource.
+ """
+
+ addSlash = True
+
+ def __init__(self, path, root, directory, store, principalCollections=()):
+ TemplateResource.__init__(self, WebAdminLandingPageElement())
+
+ self._path = path
+ self._root = root
+ self.directory = directory
+ self.store = store
+ self._principalCollections = principalCollections
</ins></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminlandingxhtml"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/calendarserver/webadmin/landing.xhtml (0 => 12618)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/landing.xhtml (rev 0)
+++ CalendarServer/trunk/calendarserver/webadmin/landing.xhtml 2014-02-08 02:41:32 UTC (rev 12618)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<!DOCTYPE html>
+<html xmlns:t="http://twistedmatrix.com/ns/twisted.web.template/0.1" t:render="main">
+
+ <head>
+ <title><t:slot name="title" /></title>
+ <link t:render="stylesheet" />
+ </head>
+
+ <body>
+
+ <h1><t:slot name="title" /></h1>
+
+ <ul>
+ </ul>
+
+ </body>
+
+</html>
</ins></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/resource.py (12617 => 12618)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/resource.py 2014-02-08 01:53:16 UTC (rev 12617)
+++ CalendarServer/trunk/calendarserver/webadmin/resource.py 2014-02-08 02:41:32 UTC (rev 12618)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx"> __all__ = [
</span><span class="cx"> "WebAdminResource",
</span><span class="cx"> "WebAdminPage",
</span><ins>+ "TemplateResource",
</ins><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> import operator
</span><span class="lines">@@ -730,18 +731,39 @@
</span><span class="cx"> Resource that renders a template.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- def __init__(self):
</del><ins>+ # @staticmethod
+ # def queryValue(request, argument):
+ # for value in request.args.get(argument, []):
+ # return value
+
+ # return u""
+
+
+ # @staticmethod
+ # def queryValues(request, arguments):
+ # return request.args.get(arguments, [])
+
+
+ def __init__(self, element):
</ins><span class="cx"> Resource.__init__(self)
</span><span class="cx">
</span><ins>+ self.element = element
</ins><span class="cx">
</span><ins>+
+ # def handleQueryArguments(self, request):
+ # return succeed(None)
+
+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def render(self, request):
</span><span class="cx"> """
</span><span class="cx"> Create a L{WebAdminPage} to render HTML content for this request, and
</span><span class="cx"> return a response.
</span><span class="cx"> """
</span><del>- htmlContent = yield flattenString(request, WebAdminPage(self))
</del><ins>+ # yield self.handleQueryArguments(request)
</ins><span class="cx">
</span><ins>+ htmlContent = yield flattenString(request, self.element)
+
</ins><span class="cx"> response = Response()
</span><span class="cx"> response.stream = MemoryStream(htmlContent)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>