ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-19 04:57:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make WUI headings and titles more consistent and accurate:

Browse Source 
'Recent and Active Operations' and 'Operational Statistics'. fixes #1457

Signed-off-by: David-Sarah Hopwood <davidsarah@jacaranda.org>
This commit is contained in:
David-Sarah Hopwood 2012-12-29 23:54:54 +00:00
parent 062ae99372
commit 456955e4f0
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/allmydata/test/test_system.py
View File

@ -1273,7 +1273,7 @@ class SystemTest(SystemTestMixin, RunBinTahoeMixin, unittest.TestCase):
# itself) doesn't explode when you ask for its status # itself) doesn't explode when you ask for its status
d.addCallback(lambda res: getPage(self.helper_webish_url + "status/")) d.addCallback(lambda res: getPage(self.helper_webish_url + "status/"))
def _got_non_helper_status(res): 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) d.addCallback(_got_non_helper_status)
# or for helper status with t=json # or for helper status with t=json
@ -1287,8 +1287,8 @@ class SystemTest(SystemTestMixin, RunBinTahoeMixin, unittest.TestCase):
# see if the statistics page exists # see if the statistics page exists
d.addCallback(lambda res: self.GET("statistics")) d.addCallback(lambda res: self.GET("statistics"))
def _got_stats(res): def _got_stats(res):
self.failUnless("Node Statistics" in res) self.failUnlessIn("Operational Statistics", res)
self.failUnless(" 'downloader.files_downloaded': 5," in res, res) self.failUnlessIn(" 'downloader.files_downloaded': 5,", res)
d.addCallback(_got_stats) d.addCallback(_got_stats)
d.addCallback(lambda res: self.GET("statistics?t=json")) d.addCallback(lambda res: self.GET("statistics?t=json"))
def _got_stats_json(res): def _got_stats_json(res):

4
src/allmydata/test/test_web.py
View File

@ -603,6 +603,8 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi
self.failUnlessIn('Welcome to Tahoe-LAFS', res) self.failUnlessIn('Welcome to Tahoe-LAFS', res)
self.failUnlessIn(FAVICON_MARKUP, res) self.failUnlessIn(FAVICON_MARKUP, res)
self.failUnlessIn('href="https://tahoe-lafs.org/"', res) self.failUnlessIn('href="https://tahoe-lafs.org/"', res)
self.failUnlessIn('<a href="status/">Recent and Active Operations</a>', res)
self.failUnlessIn('<a href="statistics">Operational Statistics</a>', res)
res_u = res.decode('utf-8') res_u = res.decode('utf-8')
self.failUnlessIn(u'<th>My nickname:</th> <td class="nickname mine">fake_nickname \u263A</td></tr>', res_u) self.failUnlessIn(u'<th>My nickname:</th> <td class="nickname mine">fake_nickname \u263A</td></tr>', res_u)
self.failUnlessIn(u'<div class="nickname">other_nickname \u263B</div>', res_u) self.failUnlessIn(u'<div class="nickname">other_nickname \u263B</div>', res_u)
@ -663,7 +665,7 @@ class Web(WebMixin, WebErrorMixin, testutil.StallMixin, testutil.ReallyEqualMixi
ret_num = h.list_all_retrieve_statuses()[0].get_counter() ret_num = h.list_all_retrieve_statuses()[0].get_counter()
d = self.GET("/status", followRedirect=True) d = self.GET("/status", followRedirect=True)
def _check(res): 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('"down-%d"' % dl_num, res)
self.failUnlessIn('"up-%d"' % ul_num, res) self.failUnlessIn('"up-%d"' % ul_num, res)
self.failUnlessIn('"mapupdate-%d"' % mu_num, res) self.failUnlessIn('"mapupdate-%d"' % mu_num, res)

4
src/allmydata/web/statistics.xhtml
View File

@ -1,13 +1,13 @@
<html xmlns:n="http://nevow.com/ns/nevow/0.1"> <html xmlns:n="http://nevow.com/ns/nevow/0.1">
<head> <head>
<title>Tahoe-LAFS - Stats</title> <title>Tahoe-LAFS - Operational Statistics</title>
<link href="/tahoe.css" rel="stylesheet" type="text/css"/> <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
<link href="/icon.png" rel="shortcut icon" /> <link href="/icon.png" rel="shortcut icon" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
</head> </head>
<body n:data="get_stats"> <body n:data="get_stats">
<h1>Node Statistics</h1> <h1>Operational Statistics</h1>
<h2>General</h2> <h2>General</h2>

4
src/allmydata/web/status.xhtml
View File

@ -1,13 +1,13 @@
<html xmlns:n="http://nevow.com/ns/nevow/0.1"> <html xmlns:n="http://nevow.com/ns/nevow/0.1">
<head> <head>
<title>Tahoe-LAFS - Current Uploads/Downloads</title> <title>Tahoe-LAFS - Recent and Active Operations</title>
<link href="/tahoe.css" rel="stylesheet" type="text/css"/> <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
<link href="/icon.png" rel="shortcut icon" /> <link href="/icon.png" rel="shortcut icon" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
</head> </head>
<body> <body>
<h1>Upload and Download Status</h1> <h1>Recent and Active Operations</h1>
<h2>Active Operations:</h2> <h2>Active Operations:</h2>

2
src/allmydata/web/welcome.xhtml
View File

@ -11,7 +11,7 @@
<h2>This Client</h2> <h2>This Client</h2>
<p> <p>
<a href="status/">Recent Uploads and Downloads</a>, <a href="status/">Recent and Active Operations</a>,
<a href="statistics">Operational Statistics</a> <a href="statistics">Operational Statistics</a>
</p> </p>