webish: condense display of nickname a little bit

This commit is contained in:
Brian Warner 2008-02-05 18:29:28 -07:00
parent 96e6c78c7a
commit eb9023ab0e
2 changed files with 3 additions and 5 deletions

View File

@ -31,8 +31,7 @@ tool</a> may also be useful.</div>
<div>
<table n:render="sequence" n:data="services" border="1">
<tr n:pattern="header">
<td>PeerID</td>
<td>Nickname</td>
<td>PeerID / Nickname</td>
<td>Connected?</td>
<td>Since</td>
<td>Announced</td>
@ -41,7 +40,6 @@ tool</a> may also be useful.</div>
</tr>
<tr n:pattern="item" n:render="service_row">
<td><tt><n:slot name="peerid"/></tt></td>
<td><tt><n:slot name="nickname"/></tt></td>
<td><tt><n:slot name="connected"/></tt></td>
<td><tt><n:slot name="since"/></tt></td>
<td><tt><n:slot name="announced"/></tt></td>

View File

@ -1359,7 +1359,8 @@ class Root(rend.Page):
def render_service_row(self, ctx, data):
(service_name, nodeid, rsc) = data
ctx.fillSlots("peerid", idlib.nodeid_b2a(nodeid))
ctx.fillSlots("peerid", "%s %s" % (idlib.nodeid_b2a(nodeid),
rsc.nickname))
if rsc.rref:
rhost = rsc.remote_host
if nodeid == IClient(ctx).nodeid:
@ -1381,7 +1382,6 @@ class Root(rend.Page):
time.localtime(rsc.announcement_time)))
ctx.fillSlots("version", rsc.version)
ctx.fillSlots("service_name", rsc.service_name)
ctx.fillSlots("nickname", rsc.nickname)
return ctx.tag