From eb9023ab0ebf753938f60d05d668a19c8525bb24 Mon Sep 17 00:00:00 2001 From: Brian Warner <warner@allmydata.com> Date: Tue, 5 Feb 2008 18:29:28 -0700 Subject: [PATCH] webish: condense display of nickname a little bit --- src/allmydata/web/welcome.xhtml | 4 +--- src/allmydata/webish.py | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/allmydata/web/welcome.xhtml b/src/allmydata/web/welcome.xhtml index ea3048cf..48dbf9aa 100644 --- a/src/allmydata/web/welcome.xhtml +++ b/src/allmydata/web/welcome.xhtml @@ -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> diff --git a/src/allmydata/webish.py b/src/allmydata/webish.py index bcbf6f6d..31ef7b47 100644 --- a/src/allmydata/webish.py +++ b/src/allmydata/webish.py @@ -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 -- 2.45.2