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

Wed Mar 12 11:24:15 PDT 2014

Revision: 12702
          http://trac.calendarserver.org//changeset/12702
Author:   wsanchez at apple.com
Date:     2014-02-14 10:13:01 -0800 (Fri, 14 Feb 2014)
Log Message:
-----------
Shorter titles

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/webadmin/landing.py
    CalendarServer/trunk/calendarserver/webadmin/landing.xhtml
    CalendarServer/trunk/calendarserver/webadmin/logs.py
    CalendarServer/trunk/calendarserver/webadmin/principals.py
    CalendarServer/trunk/calendarserver/webadmin/principals.xhtml

Modified: CalendarServer/trunk/calendarserver/webadmin/landing.py
===================================================================

--- CalendarServer/trunk/calendarserver/webadmin/landing.py	2014-02-14 18:12:42 UTC (rev 12701)
+++ CalendarServer/trunk/calendarserver/webadmin/landing.py	2014-02-14 18:13:01 UTC (rev 12702)
@@ -29,6 +29,7 @@
 from .resource import WebAdminResource
 from .logs import LogsResource
 from .principals import PrincipalsResource
+from .work import WorkMonitorResource
 
 
 
@@ -43,7 +44,7 @@
 
     def pageSlots(self):
         return {
-            u"title": u"Calendar & Contacts Server Administration",
+            u"title": u"Server Administration",
         }
 
 
@@ -66,6 +67,7 @@
 
         self.putChild(u"logs", LogsResource())
         self.putChild(u"principals", PrincipalsResource(directory))
+        self.putChild(u"work", WorkMonitorResource(store))
 
         self.putChild(
             u"old",

Modified: CalendarServer/trunk/calendarserver/webadmin/landing.xhtml
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/landing.xhtml	2014-02-14 18:12:42 UTC (rev 12701)
+++ CalendarServer/trunk/calendarserver/webadmin/landing.xhtml	2014-02-14 18:13:01 UTC (rev 12702)
@@ -13,6 +13,7 @@
     <ul>
       <li><a href="logs">Server Logs</a></li>
       <li><a href="principals">Principal Management</a></li>
+      <li><a href="work">Workload Monitor</a></li>
     </ul>
 
   </body>

Modified: CalendarServer/trunk/calendarserver/webadmin/logs.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/logs.py	2014-02-14 18:12:42 UTC (rev 12701)
+++ CalendarServer/trunk/calendarserver/webadmin/logs.py	2014-02-14 18:13:01 UTC (rev 12702)
@@ -55,7 +55,7 @@
 
     def pageSlots(self):
         return {
-            u"title": u"Calendar & Contacts Server Logs",
+            u"title": u"Server Logs",
         }
 
 

Modified: CalendarServer/trunk/calendarserver/webadmin/principals.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/principals.py	2014-02-14 18:12:42 UTC (rev 12701)
+++ CalendarServer/trunk/calendarserver/webadmin/principals.py	2014-02-14 18:13:01 UTC (rev 12702)
@@ -45,7 +45,7 @@
 
     def pageSlots(self):
         return {
-            u"title": u"Calendar & Contacts Server Principal Search",
+            u"title": u"Principal Search",
         }
 
 

Modified: CalendarServer/trunk/calendarserver/webadmin/principals.xhtml
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/principals.xhtml	2014-02-14 18:12:42 UTC (rev 12701)
+++ CalendarServer/trunk/calendarserver/webadmin/principals.xhtml	2014-02-14 18:13:01 UTC (rev 12702)
@@ -3,12 +3,10 @@
 
   <head>
     <title><t:slot name="title" /></title>
-
     <link t:render="stylesheet" />
     <style>
       tr.record:hover { background-color: #FFFF00; }
     </style>
-
   </head>
 
   <body>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/ad31522f/attachment.html>
