introweb: fix connection hints for server announcements

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / web / introducer.xhtml
diff --git a/src/allmydata/web/introducer.xhtml b/src/allmydata/web/introducer.xhtml

index 501f78da0e05c6de087ca60fbfe7c60e22ad58f6..f64f7e09236089d9150fb9b0ecaf2d019f693979 100644 (file)
--- a/src/allmydata/web/introducer.xhtml
+++ b/src/allmydata/web/introducer.xhtml
@@ -5,15 +5,15 @@
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
  </head><body>
  
-<h1>Welcome To The Tahoe-LAFS Introducer</h1>
+<h1>Welcome to the Tahoe-LAFS Introducer</h1>
  
  <div class="section" id="this-client">
    <h2>This Introducer</h2>
  
    <table class="node-info table-headings-left">
-    <tr><th>My nodeid:</th> <td class="nideid mine data-chars" n:render="string" n:data="my_nodeid" /></tr>
+    <tr><th>My nodeid:</th> <td class="nodeid mine data-chars" n:render="string" n:data="my_nodeid" /></tr>
      <tr><th>My versions:</th> <td n:render="string" n:data="version" /></tr>
-    <tr><th>Tahoe-LAFS code imported from:</th> <td n:render="string" n:data="import_path" /></tr>
+    <tr><th>Tahoe-LAFS code imported from:</th> <td n:render="data" n:data="import_path" /></tr>
    </table>
  </div>
  
@@ -29,8 +29,7 @@
    <tr n:pattern="header">
      <th class="nickname-and-peerid">
        <div class="service-nickname">Nickname</div>
-      <div class="nodeid data-chars">PeerID</div></th>
-    <th>Advertised IPs</th>
+      <div class="nodeid data-chars">ServerID</div></th>
      <th>Announced</th>
      <th>Version</th>
      <th>Service Name</th>
@@ -38,9 +37,8 @@
    <tr n:pattern="item" n:render="service_row">
      <td class="nickname-and-peerid">
        <div class="nickname"><n:slot name="nickname"/></div>
-      <div class="nodeid data-chars"><n:slot name="peerid"/></div></td>
-    <td><n:slot name="advertised"/></td>
-    <td class="service-announced"><n:slot name="announced"/></td>
+      <div class="nodeid data-chars"><n:slot name="serverid"/></div></td>
+    <td class="service-announced"><n:attr name="title"><n:slot name="connection-hints"/></n:attr><n:slot name="announced"/></td>
      <td class="service-version"><n:slot name="version"/></td>
      <td class="service-service-name"><n:slot name="service_name"/></td>
    </tr>
@@ -55,8 +53,7 @@
    <tr n:pattern="header">
      <th class="nickname-and-peerid">
        <div class="service-nickname">Nickname</div>
-      <div class="nodeid data-chars">PeerID</div></th>
-    <th>Advertised IPs</th>
+      <div class="nodeid data-chars">Tub ID</div></th>
      <th>Connected From</th>
      <th>Since</th>
      <th>Version</th>
@@ -65,16 +62,17 @@
    <tr n:pattern="item" n:render="subscriber_row">
      <td class="nickname-and-peerid">
        <div class="nickname"><n:slot name="nickname"/></div>
-      <div class="nodeid data-chars"><n:slot name="peerid"/></div></td>
-    <td><n:slot name="advertised"/></td>
+      <div class="nodeid data-chars"><n:slot name="tubid"/></div></td>
      <td><n:slot name="connected"/></td>
      <td class="service-since"><n:slot name="since"/></td>
      <td class="service-version"><n:slot name="version"/></td>
      <td class="service-service-name"><n:slot name="service_name"/></td>
    </tr>
-  <tr n:pattern="empty"><td>no peers!</td></tr>
+  <tr n:pattern="empty"><td>no subscribers!</td></tr>
  </table>
  </div>
  
+<p class="minutia">Page rendered at <span n:render="data" n:data="rendered_at" /></p>
+
    </body>
  </html>