wui: improved columns in welcome page server list

[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 72a2be169e3b81023011b16a9c771eb0d51d95f5..de2bceb14fc0d84c30a2a486402ff8b0242c8241 100644 (file)
--- a/src/allmydata/web/welcome.xhtml
+++ b/src/allmydata/web/welcome.xhtml
@@ -1,4 +1,5 @@
-<!DOCTYPE html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
+      Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
  <html lang="en" xmlns:n="http://nevow.com/ns/nevow/0.1">
    <head>
      <meta charset="utf-8"/>
@@ -167,29 +168,28 @@
            <table class="table table-striped table-bordered peer-status" n:render="sequence" n:data="services">
              <thead>
                <tr n:pattern="header">
+                <td><h3>Status</h3></td>
                  <td><h3>Nickname</h3></td>
                  <td><h3>Address</h3></td>
-                <td><h3>Service</h3></td>
-                <td><h3>Since</h3></td>
-                <td><h3>Announced</h3></td>
+                <td><h3>Last RX</h3></td>
                  <td><h3>Version</h3></td>
                  <td><h3>Available</h3></td>
                </tr>
              </thead>
              <tr n:pattern="item" n:render="service_row">
+              <td class="service-connection-status">
+              <div><n:attr name="class">status-indicator service-<n:slot name="service_connection_status"/></n:attr></div>
+<div class="status-description"><n:slot name="service_connection_status"/><br/><a class="timestamp"><n:attr name="title"><n:slot name="service_connection_status_abs_time"/></n:attr><n:slot name="service_connection_status_rel_time"/></a></div></td>
                <td class="nickname-and-peerid">
-              <div><n:attr name="class">status-indicator connected-<n:slot name="connected"/></n:attr></div>
                  <div class="nickname"><n:slot name="nickname"/></div>
                  <div class="nodeid"><n:slot name="peerid"/></div>
                </td>
                <td class="address"><n:slot name="address"/></td>
-            <td class="service-service-name"><n:slot name="service_name"/></td>
-              <td class="service-since timestamp"><n:slot name="since"/></td>
-              <td class="service-announced timestamp"><n:slot name="announced"/></td>
+              <td class="service-last-received-data"><a class="timestamp"><n:attr name="title"><n:slot name="last_received_data_abs_time"/></n:attr><n:slot name="last_received_data_rel_time"/></a></td>
                <td class="service-version"><n:slot name="version"/></td>
                <td class="service-available-space"><n:slot name="available_space"/></td>
              </tr>
-            <tr n:pattern="empty"><td>You are not presently connected to any peers</td></tr>
+            <tr n:pattern="empty"><td colspan="6">You are not presently connected to any peers</td></tr>
            </table>
          </div><!--/span-->
        </div><!--/row-->