Thu Mar 8 23:17:58 GMT 2012 david-sarah@jacaranda.org

  * Make the link on the Welcome page to 'https://tahoe-lafs.org/', not 'http:'. Includes a test. fixes #1682

diff --git a/src/allmydata/test/test_web.py b/src/allmydata/test/test_web.py
index 0f0cd10422cff75822a592e12e4bb7815cd32544..1357f3ae29c3a59d4e94340b6e26a996de174d70 100644 (file)
--- a/src/allmydata/test/test_web.py
+++ b/src/allmydata/test/test_web.py
@@ -522,6 +522,7 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi
         def _check(res):
             self.failUnlessIn('Welcome to Tahoe-LAFS', res)
             self.failUnlessIn(FAVICON_MARKUP, res)
+            self.failUnlessIn('href="https://tahoe-lafs.org/"', res)
 
             self.s.basedir = 'web/test_welcome'
             fileutil.make_dirs("web/test_welcome")

diff --git a/src/allmydata/web/welcome.xhtml b/src/allmydata/web/welcome.xhtml
index 8a5b9aa1edcf1f45cb70a80f94fc44fb8b214820..5c86cfc247c3fa9497d6d0270b0be22d4758abcc 100644 (file)
--- a/src/allmydata/web/welcome.xhtml
+++ b/src/allmydata/web/welcome.xhtml
@@ -88,7 +88,7 @@
 <div class="section" id="other-resources">
   <h2>Other Resources</h2>
 
-  <div>Please visit the <a target="_blank" href="http://tahoe-lafs.org">Tahoe-LAFS 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