Changeset 9f5075e in trunk

Timestamp:

2008-06-03T22:02:10Z (17 years ago)

Author:

Brian Warner <warner@…>

Branches:

master

Children:

0aa6d24

Parents:

9f59eca

Message:

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

Location:

src/allmydata

Files:

• test/test_web.py (modified) (1 diff)
• web/root.py (modified) (2 diffs)
• web/welcome.xhtml (modified) (3 diffs)

src/allmydata/test/test_web.py ¶

@@ -28 +28 @@
 class FakeClient(service.MultiService):
     nodeid = "fake_nodeid"
+    nickname = "fake_nickname"
     basedir = "fake_basedir"
     def get_versions(self):

src/allmydata/web/root.py ¶

@@ -129 +129 @@
     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):
@@ -199 +201 @@
     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

src/allmydata/web/welcome.xhtml ¶

@@ -14 +14 @@
 
 <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>
@@ -46 +47 @@
 <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>
@@ -55 +57 @@
   <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>