]> git.rkrishnan.org Git - tahoe-lafs/tahoe-lafs.git/commitdiff
projects / tahoe-lafs / tahoe-lafs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 062ae99)
Make WUI headings and titles more consistent and accurate:
authorDavid-Sarah Hopwood <david-sarah@jacaranda.org>
Sat, 29 Dec 2012 23:54:54 +0000 (23:54 +0000)
committerDavid-Sarah Hopwood <david-sarah@jacaranda.org>
Sat, 29 Dec 2012 23:54:54 +0000 (23:54 +0000)
'Recent and Active Operations' and 'Operational Statistics'. fixes #1457

Signed-off-by: David-Sarah Hopwood <davidsarah@jacaranda.org>
src/allmydata/test/test_system.py patch | blob | history
src/allmydata/test/test_web.py patch | blob | history
src/allmydata/web/statistics.xhtml patch | blob | history
src/allmydata/web/status.xhtml patch | blob | history
src/allmydata/web/welcome.xhtml patch | blob | history

diff --git a/src/allmydata/test/test_system.py b/src/allmydata/test/test_system.py
index b2461ac6e9900e6c22ff36de5f58bd33a28f4342..ebd7fa6dbb1bddb17ae4247ed035b397ed434609 100644 (file)
--- 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 300c19a56f55bd3f688bcc6a6be9cfb1190ea042..bb3d458b31a7f49ffeff9e8a366c4fc8500284eb 100644 (file)
--- 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('<a href="status/">Recent and Active Operations</a>', res)
+            self.failUnlessIn('<a href="statistics">Operational Statistics</a>', res)
             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'<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()
         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 fb5603b7f7932ee605f7e7550955f6f1adfe3187..1e173273ed77c1a0d4a8bfb0da3770bbe893ea04 100644 (file)
--- a/src/allmydata/web/statistics.xhtml
+++ b/src/allmydata/web/statistics.xhtml
@@ -1,13 +1,13 @@
 <html xmlns:n="http://nevow.com/ns/nevow/0.1">
   <head>
-    <title>Tahoe-LAFS - Stats</title>
+    <title>Tahoe-LAFS - Operational Statistics</title>
     <link href="/tahoe.css" rel="stylesheet" type="text/css"/>
     <link href="/icon.png" rel="shortcut icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   </head>
   <body n:data="get_stats">
 
-<h1>Node Statistics</h1>
+<h1>Operational Statistics</h1>
 
 <h2>General</h2>
 
diff --git a/src/allmydata/web/status.xhtml b/src/allmydata/web/status.xhtml
index b325c704940cc11f50618f7257e844b4940659c5..d827002f41ff73d18cf8e5a4a5f59e6f1bef2de7 100644 (file)
--- a/src/allmydata/web/status.xhtml
+++ b/src/allmydata/web/status.xhtml
@@ -1,13 +1,13 @@
 <html xmlns:n="http://nevow.com/ns/nevow/0.1">
   <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="/icon.png" rel="shortcut icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   </head>
   <body>
 
-<h1>Upload and Download Status</h1>
+<h1>Recent and Active Operations</h1>
 
 
 <h2>Active Operations:</h2>
diff --git a/src/allmydata/web/welcome.xhtml b/src/allmydata/web/welcome.xhtml
index f88c02ca2309e4a5a902c74945af1a9243f09188..794b42309c4cec53cfd77243b055a2da844aa5cf 100644 (file)
--- a/src/allmydata/web/welcome.xhtml
+++ b/src/allmydata/web/welcome.xhtml
@@ -11,7 +11,7 @@
   <h2>This Client</h2>
 
   <p>
-    <a href="status/">Recent Uploads and Downloads</a>,
+    <a href="status/">Recent and Active Operations</a>,
     <a href="statistics">Operational Statistics</a>
   </p>
 
Unnamed repository; edit this file 'description' to name the repository.