<!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>[12684] 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/12684">12684</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-02-12 14:43:45 -0800 (Wed, 12 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add record details</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverwebadminprincipalspy">CalendarServer/trunk/calendarserver/webadmin/principals.py</a></li>
<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 (12683 => 12684)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/principals.py 2014-02-12 21:28:22 UTC (rev 12683)
+++ CalendarServer/trunk/calendarserver/webadmin/principals.py 2014-02-12 22:43:45 UTC (rev 12684)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> def pageSlots(self):
</span><span class="cx"> return {
</span><del>- u"title": u"Calendar & Contacts Server Principal Management",
</del><ins>+ u"title": u"Calendar & Contacts Server Principal Search",
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -122,8 +122,42 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def pageSlots(self):
</span><ins>+ record = self._record
+
+ def one(value):
+ if value is None:
+ return u"(no value)"
+ else:
+ return unicode(value)
+
+ def many(values):
+ noValues = True
+
+ for value in values:
+ if not noValues:
+ yield tags.br()
+
+ yield one(value)
+
+ noValues = False
+
+ if noValues:
+ yield u"(no values)"
+
</ins><span class="cx"> return {
</span><del>- u"title": u"Calendar & Contacts Server Principal Edit",
</del><ins>+ u"title": u"Calendar & Contacts Server Principal Information",
+ u"service": (
+ u"{service.__class__.__name__}: {service.realmName}"
+ .format(service=record.service)
+ ),
+ u"uid": one(record.uid),
+ u"guid": one(record.guid),
+ u"record_type": one(record.recordType),
+ u"short_names": many(record.shortNames),
+ u"full_names": one(record.fullName),
+ u"email_addresses": many(record.emailAddresses),
+ u"calendar_user_addresses": many(record.calendarUserAddresses),
+ u"server_id": one(record.serverID),
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminprincipals_editxhtml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/principals_edit.xhtml (12683 => 12684)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/principals_edit.xhtml 2014-02-12 21:28:22 UTC (rev 12683)
+++ CalendarServer/trunk/calendarserver/webadmin/principals_edit.xhtml 2014-02-12 22:43:45 UTC (rev 12684)
</span><span class="lines">@@ -3,13 +3,70 @@
</span><span class="cx">
</span><span class="cx"> <head>
</span><span class="cx"> <title><t:slot name="title" /></title>
</span><ins>+
</ins><span class="cx"> <link t:render="stylesheet" />
</span><ins>+ <style>
+
+ table.record {
+ margin-left: auto;
+ margin-right: auto;
+ width: auto;
+ }
+
+ </style>
</ins><span class="cx"> </head>
</span><span class="cx">
</span><span class="cx"> <body>
</span><span class="cx">
</span><span class="cx"> <h1><t:slot name="title" /></h1>
</span><span class="cx">
</span><ins>+ <table class="record">
+ <caption>Record Information</caption>
+ <thead>
+ <tr>
+ <th>Field Name</th>
+ <th>Field Value</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>Directory Service</td>
+ <td><t:slot name="service" /></td>
+ </tr>
+ <tr>
+ <td>UID</td>
+ <td><t:slot name="uid" /></td>
+ </tr>
+ <tr>
+ <td>GUID</td>
+ <td><t:slot name="guid" /></td>
+ </tr>
+ <tr>
+ <td>Record Type</td>
+ <td><t:slot name="record_type" /></td>
+ </tr>
+ <tr>
+ <td>Short Names</td>
+ <td><t:slot name="short_names" /></td>
+ </tr>
+ <tr>
+ <td>Full Names</td>
+ <td><t:slot name="full_names" /></td>
+ </tr>
+ <tr>
+ <td>Email Addresses</td>
+ <td><t:slot name="email_addresses" /></td>
+ </tr>
+ <tr>
+ <td>Calendar User Addresses</td>
+ <td><t:slot name="calendar_user_addresses" /></td>
+ </tr>
+ <tr>
+ <td>Server ID</td>
+ <td><t:slot name="server_id" /></td>
+ </tr>
+ </tbody>
+ </table>
</ins><span class="cx">
</span><span class="cx"> </body>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>