make the anchor text in the WUI be descriptive of the target -- not "Click Here!"!

diff --git a/src/allmydata/test/test_web.py b/src/allmydata/test/test_web.py
index 1a5c9e880b11613a8574535ca73e2e8a89da3517..8ca91460ee2ae42daab9270992e2e7ff697382a4 100644 (file)
--- a/src/allmydata/test/test_web.py
+++ b/src/allmydata/test/test_web.py
@@ -389,7 +389,7 @@ class Web(WebMixin, unittest.TestCase):
         def _check(res):
             self.failUnless('Welcome To AllMyData' in res)
             self.failUnless('Tahoe' in res)
-            self.failUnless('To view the global shared filestore' in res)
+            self.failUnless('View <a href="vdrive/global">the global shared filestore' in res, res)
             self.failUnless('personal vdrive not available.' in res)
 
             self.s.basedir = 'web/test_welcome'

diff --git a/src/allmydata/web/start.html b/src/allmydata/web/start.html
index d3e998f5e2a9d388c5f003908fa3e6ba9f24ac55..c3364fe162dfd501b6e43731b60feafaaf80ecdc 100644 (file)
--- a/src/allmydata/web/start.html
+++ b/src/allmydata/web/start.html
@@ -10,17 +10,11 @@
 
 <h1>Welcome To Your AllMyData "Tahoe" Node!</h1>
 
-<div>To view the global shared filestore,
-  <a href="%(base_url)s/vdrive/global">Click Here!</a>
-</div>
+<div>View <a href="%(base_url)s/vdrive/global">the global shared filestore</a>.</div>
 
-<div>To view your personal private non-shared filestore,
-  <a href="%(base_url)s/uri/%(private_uri)s">Click Here!</a>
-</div>
+<div>View <a href="%(base_url)s/uri/%(private_uri)s">your personal private non-shared filestore</a>.</div>
 
-<div>To view this node's status page,
-  <a href="%(base_url)s/">click here</a>.
-</div>
+<div>View <a href="%(base_url)s/">this node's status page</a>.</div>
 
 
 <div>Please visit the <a href="http://allmydata.org">Tahoe home page</a> for

diff --git a/src/allmydata/webish.py b/src/allmydata/webish.py
index 5b966ca390c8dea9993969b81c325f711792d54d..9248a51dde91cae39c64ce1cb3a7846afbaeeb94 100644 (file)
--- a/src/allmydata/webish.py
+++ b/src/allmydata/webish.py
@@ -1152,8 +1152,9 @@ class Root(rend.Page):
 
     def render_global_vdrive(self, ctx, data):
         if IClient(ctx).getServiceNamed("vdrive").have_public_root():
-            return T.p["To view the global shared filestore, ",
-                       T.a(href="vdrive/global")["Click Here!"],
+            return T.p["View ",
+                       T.a(href="vdrive/global")["the global shared filestore"],
+                       "."
                        ]
         return T.p["vdrive.furl not specified (or vdrive server not "
                    "responding), no vdrive available."]