<!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>[12682] CalendarServer/trunk/calendarserver/webadmin</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/12682">12682</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-02-12 13:24:47 -0800 (Wed, 12 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add principal edit page</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverwebadminprincipalspy">CalendarServer/trunk/calendarserver/webadmin/principals.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverwebadminprincipals_editxhtml">CalendarServer/trunk/calendarserver/webadmin/principals_edit.xhtml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarserverwebadminprincipalspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/principals.py (12681 => 12682)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/principals.py 2014-02-12 21:18:21 UTC (rev 12681)
+++ CalendarServer/trunk/calendarserver/webadmin/principals.py 2014-02-12 21:24:47 UTC (rev 12682)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> Principal management page resource.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- addSlash = False
</del><ins>+ addSlash = True
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def __init__(self, directory):
</span><span class="lines">@@ -94,8 +94,55 @@
</span><span class="cx"> self, lambda: PrincipalsPageElement(directory)
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+ self._directory = directory
</ins><span class="cx">
</span><span class="cx">
</span><ins>+ def getChild(self, name):
+ if name == "":
+ return self
+
+ record = self._directory.recordWithUID(name)
+
+ if record:
+ return PrincipalEditResource(record)
+ else:
+ return None
+
+
+
+class PrincipalEditPageElement(PageElement):
+ """
+ Principal editing page element.
+ """
+
+ def __init__(self, record):
+ PageElement.__init__(self, u"principals_edit")
+
+ self._record = record
+
+
+ def pageSlots(self):
+ return {
+ u"title": u"Calendar & Contacts Server Principal Edit",
+ }
+
+
+
+class PrincipalEditResource(TemplateResource):
+ """
+ Principal editing resource.
+ """
+
+ addSlash = False
+
+
+ def __init__(self, record):
+ TemplateResource.__init__(
+ self, lambda: PrincipalEditPageElement(record)
+ )
+
+
+
</ins><span class="cx"> def searchTerms(request):
</span><span class="cx"> if request.args:
</span><span class="cx"> terms = set()
</span><span class="lines">@@ -163,6 +210,10 @@
</span><span class="cx"> multiValue(record.emailAddresses), **attrs_email
</span><span class="cx"> ),
</span><span class="cx"> i1,
</span><ins>+ onclick=(
+ 'window.open("./{0}");'
+ .format(record.uid)
+ ),
</ins><span class="cx"> **attrs_record
</span><span class="cx"> ),
</span><span class="cx"> )
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminprincipals_editxhtml"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/calendarserver/webadmin/principals_edit.xhtml (0 => 12682)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/principals_edit.xhtml (rev 0)
+++ CalendarServer/trunk/calendarserver/webadmin/principals_edit.xhtml 2014-02-12 21:24:47 UTC (rev 12682)
</span><span class="lines">@@ -0,0 +1,16 @@
</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>
+
+
+ </body>
+
+</html>
</ins></span></pre>
</div>
</div>
</body>
</html>