Allow welcome and storage status pages to display a non-ASCII node nickname. fixes...

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

index db521de146565a4ba5e8d073c56e817d80996d17..b493ee79d30308af2b5a72c54588e98a44bac89f 100644 (file)
--- a/src/allmydata/web/welcome.xhtml
+++ b/src/allmydata/web/welcome.xhtml
@@ -1,11 +1,11 @@
  <html xmlns:n="http://nevow.com/ns/nevow/0.1"><head>
-  <title>AllMyData - Tahoe - Welcome</title>
-  <link href="/webform_css" rel="stylesheet" type="text/css"/>
-  <link href="/tahoe_css" rel="stylesheet" type="text/css"/>
+  <title>Tahoe-LAFS - Welcome</title>
+  <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
+  <link href="/icon.png" rel="shortcut icon" />
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
  </head><body>
  
-<h1>Welcome To AllMyData "Tahoe"!</h1>
+<h1>Welcome to Tahoe-LAFS!</h1>
  
  <div class="section" id="this-client">
    <h2>This Client</h2>
@@ -16,17 +16,15 @@
    </p>
  
    <table class="node-info table-headings-left">
-    <tr><th>My nickname:</th> <td class="nickname mine" n:render="string" n:data="my_nickname" /></tr>
+    <tr><th>My nickname:</th> <td class="nickname mine" n:render="data" n:data="my_nickname" /></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 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>
      <tr><th>Services running:</th> <td n:render="services" /></tr>
    </table>
-  
-
  </div>
  
-<div class="section" id="controls">
+<div id="controls">
  <h2>Controls</h2>
  
    <p>There are also controls for each directory on that directory's page.</p>
@@ -63,7 +61,7 @@
              <div class="service-nickname">Nickname</div>
              <div class="nodeid data-chars">PeerID</div></th>
          <th>Connected?</th>
-        <th>since</th>
+        <th>Since</th>
          <th>First Announced</th>
          <th>Version</th>
        </tr>
@@ -88,12 +86,9 @@
  <div class="section" id="other-resources">
    <h2>Other Resources</h2>
  
-  <div>Please visit the <a href="http://allmydata.org">Tahoe home page</a> for
+  <div>Please visit the <a target="_blank" href="https://tahoe-lafs.org/">Tahoe-LAFS home page</a> for
    code updates and bug reporting.</div>
  
-  <div>The <a href="provisioning">provisioning tool</a> and <a
-  href="reliability">reliability calculator</a> may also be useful.</div>
-
    <div n:render="incident_button" />
  </div>