From: Brian Warner <warner@allmydata.com>
Date: Tue, 3 Jun 2008 22:02:10 +0000 (-0700)
Subject: web: make nickname more visible in the welcome page, closes #361
X-Git-Tag: allmydata-tahoe-1.1.0~51
X-Git-Url: https://git.rkrishnan.org/listings/pb2server.py?a=commitdiff_plain;h=9f5075e83d34ac1edd5dc5c49bb5f3ed8a219cd8;p=tahoe-lafs%2Ftahoe-lafs.git

web: make nickname more visible in the welcome page, closes #361
---

diff --git a/src/allmydata/test/test_web.py b/src/allmydata/test/test_web.py
index 35379ed5..5ae18a51 100644
--- a/src/allmydata/test/test_web.py
+++ b/src/allmydata/test/test_web.py
@@ -27,6 +27,7 @@ class FakeIntroducerClient:
 
 class FakeClient(service.MultiService):
     nodeid = "fake_nodeid"
+    nickname = "fake_nickname"
     basedir = "fake_basedir"
     def get_versions(self):
         return {'allmydata': "fake",
diff --git a/src/allmydata/web/root.py b/src/allmydata/web/root.py
index 561bb988..f2aafd24 100644
--- a/src/allmydata/web/root.py
+++ b/src/allmydata/web/root.py
@@ -128,6 +128,8 @@ class Root(rend.Page):
         return str(allmydata)
     def data_my_nodeid(self, ctx, data):
         return idlib.nodeid_b2a(IClient(ctx).nodeid)
+    def data_my_nickname(self, ctx, data):
+        return IClient(ctx).nickname
 
     def render_services(self, ctx, data):
         ul = T.ul()
@@ -198,8 +200,8 @@ class Root(rend.Page):
 
     def render_service_row(self, ctx, data):
         (service_name, nodeid, rsc) = data
-        ctx.fillSlots("peerid", "%s %s" % (idlib.nodeid_b2a(nodeid),
-                                           rsc.nickname))
+        ctx.fillSlots("peerid", idlib.nodeid_b2a(nodeid))
+        ctx.fillSlots("nickname", rsc.nickname)
         if rsc.rref:
             rhost = rsc.remote_host
             if nodeid == IClient(ctx).nodeid:
diff --git a/src/allmydata/web/welcome.xhtml b/src/allmydata/web/welcome.xhtml
index c930c206..d82498a8 100644
--- a/src/allmydata/web/welcome.xhtml
+++ b/src/allmydata/web/welcome.xhtml
@@ -13,6 +13,7 @@
 <h2>Status of this Client</h2>
 
 <div>My nodeid: <span n:render="string" n:data="my_nodeid" /></div>
+<div>My nickname: <span n:render="string" n:data="my_nickname" /></div>
 <div>My versions: <span n:render="string" n:data="version" /></div>
 <div>Tahoe code imported from: <span n:render="string" n:data="import_path" /></div>
 <div n:render="services">Services Running:</div>
@@ -45,7 +46,8 @@
 <div>
 <table n:render="sequence" n:data="services" border="1">
   <tr n:pattern="header">
-    <td>PeerID / Nickname</td>
+    <td>PeerID</td>
+    <td>Nickname</td>
     <td>Connected?</td>
     <td>Since</td>
     <td>Announced</td>
@@ -54,6 +56,7 @@
   </tr>
   <tr n:pattern="item" n:render="service_row">
     <td><tt><n:slot name="peerid"/></tt></td>
+    <td><b><n:slot name="nickname"/></b></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>