[CalendarServer-changes] [7928] CalendarServer/branches/users/glyph/imip-and-admin-html/ calendarserver/webadmin
source_changes at macosforge.org
source_changes at macosforge.org
Thu Aug 11 21:45:23 PDT 2011
Revision: 7928
http://trac.macosforge.org/projects/calendarserver/changeset/7928
Author: glyph at apple.com
Date: 2011-08-11 21:45:23 -0700 (Thu, 11 Aug 2011)
Log Message:
-----------
stop filling unnecessary slots
Modified Paths:
--------------
CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py
CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/template.html
Modified: CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py
===================================================================
--- CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py 2011-08-12 04:45:11 UTC (rev 7927)
+++ CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py 2011-08-12 04:45:23 UTC (rev 7928)
@@ -71,14 +71,7 @@
Main renderer, which fills page-global slots like 'title'.
"""
searchTerm = request.args.get('resourceSearch', [''])[0]
- return tag.fillSlots(
- resourceSearch=searchTerm,
- resourceTitle="Placeholder Resource Title",
- resourceId="Placeholder Resource ID",
- davPropertyName="placeholder DAV property name",
- name="Placeholder Name",
- value="Placeholder Value",
- )
+ return tag.fillSlots(resourceSearch=searchTerm)
@renderer
Modified: CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/template.html
===================================================================
--- CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/template.html 2011-08-12 04:45:11 UTC (rev 7927)
+++ CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/template.html 2011-08-12 04:45:23 UTC (rev 7928)
@@ -59,13 +59,11 @@
/></t:attr></input>
<input type="submit" value="Search" />
</form>
- <div t:render="noSearchResults"
- style="margin-top:4px">No matches found for resource <b><t:slot
- name="resourceSearch" /></b>.
+ <div t:render="noSearchResults" style="margin-top:4px"
+ >No matches found for resource <b><t:slot name="resourceSearch" /></b>.
</div>
- <table t:render="hasSearchResults"
- cellspacing="0" cellpadding="3" border="1"
- style="margin-top: 2px">
+ <table t:render="hasSearchResults" cellspacing="0" cellpadding="3"
+ border="1" style="margin-top: 2px">
<tr class="odd">
<th>ID</th>
<th>Full Name</th>
@@ -89,93 +87,94 @@
border-bottom:1px #ffffff dotted"></div>
<div style="background-color: #777; padding-top:2px;
border-bottom:1px #ffffff dotted"></div>
+
+ <t:transparent t:render="resourceDetails">
<h3>Resource Details: <t:slot name="resourceTitle" /></h3>
<!-- propertyHTML -->
<div style="margin-top:15px; border-bottom:1px #444444 dotted"></div>
<form id="frm_davProperty" name="davPropertyForm" action="/admin/"
- style="margin-top:15px; margin-bottom:0; padding-bottom:0">
+ style="margin-top:15px; margin-bottom:0; padding-bottom:0">
Show a DAV property value:
<input type="hidden" id="hdn_resourceId" name="resourceId"><t:attr
- name="value"><t:slot name="resourceId" /></t:attr></input>
+ name="value"><t:slot name="resourceId" /></t:attr></input>
<input type="text" id="txt_davPropertyName" name="davPropertyName"
- size="40"><t:attr name="value"><t:slot name="davPropertyName"
- /></t:attr></input>
- <input type="submit" value="Get Value" />
+ size="40"><t:attr name="value"><t:slot name="davPropertyName"
+ /></t:attr></input>
+ <input type="submit" value="Get Value" />
</form>
- <div t:render="propertyParseError">Unable to parse property to read:
- <b><t:slot name="davPropertyName"
- /></b></div>
+ <div t:render="propertyParseError">Unable to parse property to read:
+ <b><t:slot name="davPropertyName" /></b></div>
- <div style="margin-top: 7px">Value of property <b><t:slot
- name="name" /></b>:</div>
- <pre style="margin-top:5px; padding-top:0"><t:slot name="value" /></pre >
- </div>
+ <div t:render="davProperty" style="margin-top: 7px">Value of property
+ <b><t:slot name="name" /></b>:</div>
+ <pre style="margin-top:5px; padding-top:0"><t:slot name="value" /></pre>
- <!-- autoScheduleHtml -->
+ <!-- autoScheduleHtml -->
- <div style="margin-top:15px; border-bottom:1px #444444 dotted"></div>
- <form id="frm_autoSchedule" name="autoScheduleForm" action="/admin/"
- style="margin-top:15px">
- <input type="hidden" id="hdn_resourceId" name="resourceId"
- ><t:attr name="value"><t:slot name="resourceId" /></t:attr></input>
- <div style="margin-top:7px">
- Auto-Schedule
- <select id="sel_autoSchedule" name="autoSchedule">
- <option t:render="trueOption" value="true">Yes</option>
- <option t:render="falseOption" value="false">No</option>
- </select>
- <input type="submit" value="Change" />
- </div>
- </form>
+ <div style="margin-top:15px; border-bottom:1px #444444 dotted"></div>
+ <form id="frm_autoSchedule" name="autoScheduleForm" action="/admin/"
+ style="margin-top:15px">
+ <input type="hidden" id="hdn_resourceId" name="resourceId"
+ ><t:attr name="value"><t:slot name="resourceId" /></t:attr></input>
+ <div style="margin-top:7px">
+ Auto-Schedule
+ <select id="sel_autoSchedule" name="autoSchedule">
+ <option t:render="trueOption" value="true">Yes</option>
+ <option t:render="falseOption" value="false">No</option>
+ </select>
+ <input type="submit" value="Change" />
+ </div>
+ </form>
- <!-- currentProxiesHtml -->
+ <!-- currentProxiesHtml -->
+ <div style="margin-top:15px; border-bottom:1px #444444 dotted"></div>
+ <form id="frm_proxies" name="proxiesForm" action="/admin/"
+ style="margin-top:15px">
+ <input type="hidden" id="hdn_resourceId" name="resourceId"
+ ><t:attr name="value"><t:slot name="resourceId" /></t:attr></input>
- <div style="margin-top:15px; border-bottom:1px #444444 dotted"></div>
- <form id="frm_proxies" name="proxiesForm" action="/admin/"
- style="margin-top:15px">
- <input type="hidden" id="hdn_resourceId" name="resourceId"
- ><t:attr name="value"><t:slot name="resourceId" /></t:attr></input>
+ <table cellspacing="0" cellpadding="3" border="1">
+ <tr class="odd">
+ <th colspan="2">Read-Only Proxies</th>
+ <th colspan="2">Read-Write Proxies</th>
+ </tr>
+ <tr t:render="proxyRow">
+ <t:attr name="class"><t:slot name="rowClass" /> </t:attr>
+ <t:transparent t:render="readOnlyProxies">
+ <td><t:slot name="proxy" /></td>
+ <td>
+ <input type="submit" value="Make Read-Write"><t:attr
+ name="name">mkWriteProxy|<t:slot name="type" />:<t:slot
+ name="shortName"/></t:attr></input>
+ <input type="submit" value="Remove Proxy"><t:attr
+ name="name">rmProxy|<t:slot name="type" />:<t:slot
+ name="shortName"/></t:attr></input>
+ </td>
+ </t:transparent>
- <table cellspacing="0" cellpadding="3" border="1">
- <tr class="odd">
- <th colspan="2">Read-Only Proxies</th>
- <th colspan="2">Read-Write Proxies</th>
- </tr>
- <tr t:render="proxyRow">
- <t:attr name="class"><t:slot name="rowClass" /> </t:attr>
- <t:transparent t:render="readOnlyProxies">
- <td><t:slot name="proxy" /></td>
- <td>
- <input type="submit" value="Make Read-Write"><t:attr
- name="name">mkWriteProxy|<t:slot name="type" />:<t:slot
- name="shortName"/></t:attr></input>
- <input type="submit" value="Remove Proxy"><t:attr
- name="name">rmProxy|<t:slot name="type" />:<t:slot
- name="shortName"/></t:attr></input>
- </td>
- </t:transparent>
-
- <t:transparent t:render="noReadOnlyProxies">
- <td colspan="2"></td>
- </t:transparent>
- <t:transparent t:render="readWriteProxies">
- <td><t:slot name="proxy" /></td>
- <td>
- <input type="submit" value="Make Read-Only"><t:attr
- name="name">mkReadProxy|<t:slot name="type" />:<t:slot
- name="shortName"/></t:attr></input>
- <input type="submit" value="Remove Proxy"><t:attr
- name="name">rmProxy|<t:slot name="type" />:<t:slot
- name="shortName"/></t:attr></input>
- </td>
- </t:transparent>
- <t:transparent t:render="noReadWriteProxies">
- <td colspan="2"></td>
- </t:transparent>
- </tr>
- </table>
- </form>
-</body>
+ <t:transparent t:render="noReadOnlyProxies">
+ <td colspan="2"></td>
+ </t:transparent>
+ <t:transparent t:render="readWriteProxies">
+ <td><t:slot name="proxy" /></td>
+ <td>
+ <input type="submit" value="Make Read-Only"><t:attr
+ name="name">mkReadProxy|<t:slot name="type" />:<t:slot
+ name="shortName"/></t:attr></input>
+ <input type="submit" value="Remove Proxy"><t:attr
+ name="name">rmProxy|<t:slot name="type" />:<t:slot
+ name="shortName"/></t:attr></input>
+ </td>
+ </t:transparent>
+ <t:transparent t:render="noReadWriteProxies">
+ <td colspan="2"></td>
+ </t:transparent>
+ </tr>
+ </table>
+ </form>
+ </t:transparent>
+ </div>
+ </body>
</html>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110811/80bb6383/attachment-0001.html>
More information about the calendarserver-changes
mailing list