From: David-Sarah Hopwood Date: Sat, 29 Dec 2012 23:54:54 +0000 (+0000) Subject: Make WUI headings and titles more consistent and accurate: X-Git-Tag: allmydata-tahoe-1.10a1~24 X-Git-Url: https://git.rkrishnan.org/junkers?a=commitdiff_plain;h=456955e4f04ee79bf56a4ebfe4a199ccf52987ad;p=tahoe-lafs%2Ftahoe-lafs.git Make WUI headings and titles more consistent and accurate: 'Recent and Active Operations' and 'Operational Statistics'. fixes #1457 Signed-off-by: David-Sarah Hopwood --- diff --git a/src/allmydata/test/test_system.py b/src/allmydata/test/test_system.py index b2461ac6..ebd7fa6d 100644 --- a/src/allmydata/test/test_system.py +++ b/src/allmydata/test/test_system.py @@ -1273,7 +1273,7 @@ class SystemTest(SystemTestMixin, RunBinTahoeMixin, unittest.TestCase): # itself) doesn't explode when you ask for its status d.addCallback(lambda res: getPage(self.helper_webish_url + "status/")) def _got_non_helper_status(res): - self.failUnless("Upload and Download Status" in res) + self.failUnlessIn("Recent and Active Operations", res) d.addCallback(_got_non_helper_status) # or for helper status with t=json @@ -1287,8 +1287,8 @@ class SystemTest(SystemTestMixin, RunBinTahoeMixin, unittest.TestCase): # see if the statistics page exists d.addCallback(lambda res: self.GET("statistics")) def _got_stats(res): - self.failUnless("Node Statistics" in res) - self.failUnless(" 'downloader.files_downloaded': 5," in res, res) + self.failUnlessIn("Operational Statistics", res) + self.failUnlessIn(" 'downloader.files_downloaded': 5,", res) d.addCallback(_got_stats) d.addCallback(lambda res: self.GET("statistics?t=json")) def _got_stats_json(res): diff --git a/src/allmydata/test/test_web.py b/src/allmydata/test/test_web.py index 300c19a5..bb3d458b 100644 --- a/src/allmydata/test/test_web.py +++ b/src/allmydata/test/test_web.py @@ -603,6 +603,8 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi self.failUnlessIn('Welcome to Tahoe-LAFS', res) self.failUnlessIn(FAVICON_MARKUP, res) self.failUnlessIn('href="https://tahoe-lafs.org/"', res) + self.failUnlessIn('Recent and Active Operations', res) + self.failUnlessIn('Operational Statistics', res) res_u = res.decode('utf-8') self.failUnlessIn(u'My nickname: fake_nickname \u263A', res_u) self.failUnlessIn(u'

other_nickname \u263B

', res_u) @@ -663,7 +665,7 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi ret_num = h.list_all_retrieve_statuses()[0].get_counter() d = self.GET("/status", followRedirect=True) def _check(res): - self.failUnlessIn('Upload and Download Status', res) + self.failUnlessIn('Recent and Active Operations', res) self.failUnlessIn('"down-%d"' % dl_num, res) self.failUnlessIn('"up-%d"' % ul_num, res) self.failUnlessIn('"mapupdate-%d"' % mu_num, res) diff --git a/src/allmydata/web/statistics.xhtml b/src/allmydata/web/statistics.xhtml index fb5603b7..1e173273 100644 --- a/src/allmydata/web/statistics.xhtml +++ b/src/allmydata/web/statistics.xhtml @@ -1,13 +1,13 @@ - Tahoe-LAFS - Stats + Tahoe-LAFS - Operational Statistics -

Node Statistics

Operational Statistics

General

diff --git a/src/allmydata/web/status.xhtml b/src/allmydata/web/status.xhtml index b325c704..d827002f 100644 --- a/src/allmydata/web/status.xhtml +++ b/src/allmydata/web/status.xhtml @@ -1,13 +1,13 @@ - Tahoe-LAFS - Current Uploads/Downloads + Tahoe-LAFS - Recent and Active Operations -

Upload and Download Status

Recent and Active Operations

Active Operations:

diff --git a/src/allmydata/web/welcome.xhtml b/src/allmydata/web/welcome.xhtml index f88c02ca..794b4230 100644 --- a/src/allmydata/web/welcome.xhtml +++ b/src/allmydata/web/welcome.xhtml @@ -11,7 +11,7 @@

This Client

- Recent Uploads and Downloads, + Recent and Active Operations, Operational Statistics