From f842656ec2c15550a98f9ecd77ae4a2f411f8f45 Mon Sep 17 00:00:00 2001
From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Tue, 29 Apr 2008 15:10:14 -0700
Subject: [PATCH] wui: reorganize the welcome.xhtml page Jake Edge tried Tahoe
 out and didn't notice the /status page.  Hopefully with this new organization
 people like he will see that link more easily.  This also addresses drewp's
 suggestion that the controls appear above the list of servers instead of
 below.  (I think that was his suggestion.)  I also reordered the controls.

---
 src/allmydata/web/welcome.xhtml | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/allmydata/web/welcome.xhtml b/src/allmydata/web/welcome.xhtml
index be608bee..c930c206 100644
--- a/src/allmydata/web/welcome.xhtml
+++ b/src/allmydata/web/welcome.xhtml
@@ -10,19 +10,26 @@
 
 <h1>Welcome To AllMyData "Tahoe"!</h1>
 
-<div>Please visit the <a href="http://allmydata.org">Tahoe home page</a> for
-code updates and bug reporting. The <a href="provisioning">provisioning
-tool</a> may also be useful. <a href="status/">Current Uploads and
-Downloads</a></div>
-
-<h2>Grid Status</h2>
+<h2>Status of this Client</h2>
 
 <div>My nodeid: <span n:render="string" n:data="my_nodeid" /></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>
 
-<br />
+<div><a href="status/">Uploads and Downloads</a></div>
+
+<h2>The Controls</h2>
+
+<div>There are also controls for each directory on that directory's page.</div>
+
+<div n:render="mkdir_form" />
+<div n:render="view_form" />
+<div n:render="upload_form" />
+<div n:render="download_form" />
+
+
+<h2>Status of the Storage Grid</h2>
 
 <div>Introducer: <span n:render="string" n:data="introducer_furl" /></div>
 <div>Connected to introducer?: <span n:render="string" n:data="connected_to_introducer" /></div>
@@ -57,12 +64,14 @@ Downloads</a></div>
 </table>
 </div>
 
-<br />
+<h2>Other Resources</h2>
+
+<div>Please visit the <a href="http://allmydata.org">Tahoe home page</a> for
+  code updates and bug reporting.</div>
+
+<div>The <a href="provisioning">provisioning
+    tool</a> may also be useful.</div>
 
-<div n:render="download_form" />
-<div n:render="view_form" />
-<div n:render="upload_form" />
-<div n:render="mkdir_form" />
 
   </body>
 </html>
-- 
2.45.2