<!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>[12872] 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/12872">12872</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-03-10 16:35:42 -0700 (Mon, 10 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add headers for tables.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverwebadminconfigpy">CalendarServer/trunk/calendarserver/webadmin/config.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverwebadminconfigxhtml">CalendarServer/trunk/calendarserver/webadmin/config.xhtml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarserverwebadminconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/config.py (12871 => 12872)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/config.py 2014-03-10 23:26:03 UTC (rev 12871)
+++ CalendarServer/trunk/calendarserver/webadmin/config.py 2014-03-10 23:35:42 UTC (rev 12872)
</span><span class="lines">@@ -106,6 +106,17 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @renderer
</span><ins>+ def settings_header(self, request, tag):
+ return tag(
+ html.tr(
+ html.th(u"Option"),
+ html.th(u"Value"),
+ html.th(u"Note"),
+ ),
+ )
+
+
+ @renderer
</ins><span class="cx"> def log_level_row(self, request, tag):
</span><span class="cx"> def rowsForNamespaces(namespaces):
</span><span class="cx"> for namespace in namespaces:
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverwebadminconfigxhtml"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/webadmin/config.xhtml (12871 => 12872)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/webadmin/config.xhtml 2014-03-10 23:26:03 UTC (rev 12871)
+++ CalendarServer/trunk/calendarserver/webadmin/config.xhtml 2014-03-10 23:35:42 UTC (rev 12872)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> This may or may not be the same address that the server listens to itself.
</span><span class="cx"> This may, for example, be the address for a load balancer which forwards requests to the server.
</span><span class="cx"> </caption>
</span><ins>+ <thead t:render="settings_header" />
</ins><span class="cx"> <tbody>
</span><span class="cx"> <tr>
</span><span class="cx"> <th class="config_key">Host Name</th>
</span><span class="lines">@@ -65,6 +66,7 @@
</span><span class="cx"> These settings determine the actual network address that the server binds to.
</span><span class="cx"> By default, this is the same as the public network address information provided above.
</span><span class="cx"> </caption>
</span><ins>+ <thead t:render="settings_header" />
</ins><span class="cx"> <tbody>
</span><span class="cx"> <tr>
</span><span class="cx"> <th class="config_key">IP Addresses</th>
</span><span class="lines">@@ -93,6 +95,7 @@
</span><span class="cx"> This may or may not be the same address that the server listens to itself.
</span><span class="cx"> This may, for example, be the address for a load balancer which forwards requests to the server.
</span><span class="cx"> </caption>
</span><ins>+ <thead t:render="settings_header" />
</ins><span class="cx"> <tbody>
</span><span class="cx"> <tr>
</span><span class="cx"> <th class="config_key">Enable HTTPS (TLS)</th>
</span><span class="lines">@@ -141,6 +144,7 @@
</span><span class="cx">
</span><span class="cx"> <table>
</span><span class="cx"> <caption />
</span><ins>+ <thead t:render="settings_header" />
</ins><span class="cx"> <tbody>
</span><span class="cx"> <tr>
</span><span class="cx"> <th class="config_key">Enable CalDAV</th>
</span><span class="lines">@@ -160,6 +164,7 @@
</span><span class="cx">
</span><span class="cx"> <table>
</span><span class="cx"> <caption />
</span><ins>+ <thead t:render="settings_header" />
</ins><span class="cx"> <tbody>
</span><span class="cx"> <tr>
</span><span class="cx"> <th class="config_key">Server Root</th>
</span><span class="lines">@@ -201,24 +206,11 @@
</span><span class="cx"> </table>
</span><span class="cx">
</span><span class="cx">
</span><del>- <h2>Log Levels</h2>
-
- <table>
- <caption />
- <tbody>
- <tr t:render="log_level_row">
- <th class="config_key"><t:slot name="log_level_name" /></th>
- <td class="config_value"><t:slot name="log_level_value" /></td>
- <td class="comment" />
- </tr>
- </tbody>
- </table>
-
-
</del><span class="cx"> <h2>Process Management</h2>
</span><span class="cx">
</span><span class="cx"> <table>
</span><span class="cx"> <caption />
</span><ins>+ <thead t:render="settings_header" />
</ins><span class="cx"> <tbody>
</span><span class="cx"> <tr>
</span><span class="cx"> <th class="config_key">User Name</th>
</span><span class="lines">@@ -256,6 +248,25 @@
</span><span class="cx"> </table>
</span><span class="cx">
</span><span class="cx">
</span><ins>+ <h2>Log Levels</h2>
+
+ <table>
+ <caption />
+ <thead>
+ <tr>
+ <th>Namespace</th>
+ <th>Log Level</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr t:render="log_level_row">
+ <th><t:slot name="log_level_name" /></th>
+ <td><t:slot name="log_level_value" /></td>
+ </tr>
+ </tbody>
+ </table>
+
+
</ins><span class="cx"> </body>
</span><span class="cx">
</span><span class="cx"> </html>
</span></span></pre>
</div>
</div>
</body>
</html>