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

[source_changes at macosforge.org]

Revision: 12872
          http://trac.calendarserver.org//changeset/12872
Author:   wsanchez at apple.com
Date:     2014-03-10 16:35:42 -0700 (Mon, 10 Mar 2014)
Log Message:
-----------
Add headers for tables.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/webadmin/config.py
    CalendarServer/trunk/calendarserver/webadmin/config.xhtml

Modified: CalendarServer/trunk/calendarserver/webadmin/config.py
===================================================================
--- 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)
@@ -106,6 +106,17 @@
 
 
     @renderer
+    def settings_header(self, request, tag):
+        return tag(
+            html.tr(
+                html.th(u"Option"),
+                html.th(u"Value"),
+                html.th(u"Note"),
+            ),
+        )
+
+
+    @renderer
     def log_level_row(self, request, tag):
         def rowsForNamespaces(namespaces):
             for namespace in namespaces:

Modified: CalendarServer/trunk/calendarserver/webadmin/config.xhtml
===================================================================
--- 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)
@@ -34,6 +34,7 @@
         This may or may not be the same address that the server listens to itself.
         This may, for example, be the address for a load balancer which forwards requests to the server.
       </caption>
+      <thead t:render="settings_header" />
       <tbody>
         <tr>
           <th class="config_key">Host Name</th>
@@ -65,6 +66,7 @@
         These settings determine the actual network address that the server binds to.
         By default, this is the same as the public network address information provided above.
       </caption>
+      <thead t:render="settings_header" />
       <tbody>
         <tr>
           <th class="config_key">IP Addresses</th>
@@ -93,6 +95,7 @@
         This may or may not be the same address that the server listens to itself.
         This may, for example, be the address for a load balancer which forwards requests to the server.
       </caption>
+      <thead t:render="settings_header" />
       <tbody>
         <tr>
           <th class="config_key">Enable HTTPS (TLS)</th>
@@ -141,6 +144,7 @@
 
     <table>
       <caption />
+      <thead t:render="settings_header" />
       <tbody>
         <tr>
           <th class="config_key">Enable CalDAV</th>
@@ -160,6 +164,7 @@
 
     <table>
       <caption />
+      <thead t:render="settings_header" />
       <tbody>
         <tr>
           <th class="config_key">Server Root</th>
@@ -201,24 +206,11 @@
     </table>
 
 
-    <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>
-
-
     <h2>Process Management</h2>
 
     <table>
       <caption />
+      <thead t:render="settings_header" />
       <tbody>
         <tr>
           <th class="config_key">User Name</th>
@@ -256,6 +248,25 @@
     </table>
 
 
+    <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>
+
+
   </body>
 
 </html>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140310/5311a0e4/attachment-0001.html>